diff --git a/.gitignore b/.gitignore
index 3cda3e54..f8326c12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,12 +8,14 @@ ortc/internal/ortc.stats.events_win_etw.h
 ortc/internal/ortc.stats.events_win.h
 ortc/internal/ortc.stats.events.h
 ortc/internal/ortc.stats.events.jman
+ortc/internal/ortc.stats.events.jman.h
 ortc/internal/ortc.stats.events_win_etw.wprp
 ortc/internal/ortc.stats.events_win_etw.man
 ortc/internal/ortc.events_win_etw.h
 ortc/internal/ortc.events_win.h
 ortc/internal/ortc.events.h
 ortc/internal/ortc.events.jman
+ortc/internal/ortc.events.jman.h
 ortc/internal/ortc.events_win_etw.wprp
 ortc/internal/ortc.events_win_etw.man
 *.db
@@ -21,3 +23,5 @@ ortc/internal/ortc.events_win_etw.man
 .vs/
 ipch/
 *.user
+ortc/idl/wrapper/generated/
+ortc/idl/wrapper/cx
diff --git a/BUILD.gn b/BUILD.gn
new file mode 100644
index 00000000..ba6c9c3b
--- /dev/null
+++ b/BUILD.gn
@@ -0,0 +1,1331 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//ortc/zsLib-eventing/zslib_eventing_tool.gni")
+import("//ortc/ortclib/ortc/idl/sources.gni")
+
+config("ortclib_config") {
+    if  (is_win) {
+      cflags_cc = [ 
+          "/WX-",
+          "/wd4068",
+          "/GR",
+      ]
+      
+      if (current_os != "winuwp")
+      {
+        cflags_cc += ["/EHsc"]
+      }
+    } else {
+        cflags_cc = [ "-g" ]
+        cflags_cc += [
+            "-Wall",
+            "-std=c++11",
+        ]
+     }
+
+    include_dirs = [ 
+        ".",
+        "..",
+        "../zsLib",
+        "../zsLib/zsLib/extras",
+        "../zsLib-eventing",
+        "../ortclib-services",
+        "../../third_party",
+        "../../third_party/boringssl/include",
+        "../../third_party/usrsctp/usrsctplib",
+        "../../third_party/libsrtp/srtp/include",
+        "../../third_party/libsrtp/srtp/crypto/include",
+        "../../third_party/libsrtp/config",
+        "../../third_party/usrsctp/usrsctplib/usrsctplib",
+        "../../third_party/boringssl/include/openssl", 
+        "../../third_party/boringssl/include",
+        "../../third_party/libsrtp/include",
+        "../../third_party/libsrtp/crypto/include", 
+        "../../third_party/boringssl/src/include",        
+        "../..",
+        "../../ortc",
+        "../ortclib",
+        "../ortclib/ortc",
+        "../ortclib/ortc/idl",
+        "../ortclib/ortc/idl/wrapper",
+    ]
+    
+  if (current_os == "winuwp")
+  {
+    include_dirs += [ "../ortclib/ortc/idl/wrapper/cx", ]
+  }
+}
+
+ortclib_sources = [
+  "ortc/ICapabilities.h",
+  "ortc/ICertificate.h",
+  "ortc/IConstraints.h",
+  "ortc/IDataChannel.h",
+  "ortc/IDataChannelTypes.h",
+  "ortc/IDataTransport.h",
+  "ortc/IDTLSTransport.h",
+  "ortc/IDTMFSender.h",
+  "ortc/IHelper.h",
+  "ortc/IICEGatherer.h",
+  "ortc/IICETransport.h",
+  "ortc/IICETransportController.h",
+  "ortc/IICETypes.h",
+  "ortc/IIdentity.h",
+  "ortc/IMediaDevices.h",
+  "ortc/IMediaElement.h",
+  "ortc/IMediaStreamTrack.h",
+  "ortc/IMediaStreamTrackSelector.h",
+  "ortc/IORTC.h",
+  "ortc/IRTPListener.h",
+  "ortc/IRTPReceiver.h",
+  "ortc/IRTPSender.h",
+  "ortc/IRTPTypes.h",
+  "ortc/ISCTPTransport.h",
+  "ortc/ISRTPSDESTransport.h",
+  "ortc/IStatsProvider.h",
+  "ortc/IStatsReport.h",
+  "ortc/ortc.h",
+  "ortc/RTCPPacket.h",
+  "ortc/RTPPacket.h",
+  "ortc/types.h",
+  "ortc/adapter/adapter.h",
+  "ortc/adapter/IHelper.h",
+  "ortc/adapter/IMediaStream.h",
+  "ortc/adapter/IPeerConnection.h",
+  "ortc/adapter/ISessionDescription.h",
+  "ortc/adapter/types.h",
+  "ortc/adapter/cpp/ortc_adapter_adapter.cpp",
+  "ortc/adapter/cpp/ortc_adapter_Helper.cpp",
+  "ortc/adapter/cpp/ortc_adapter_MediaStream.cpp",
+  "ortc/adapter/cpp/ortc_adapter_PeerConnection.cpp",
+  "ortc/adapter/cpp/ortc_adapter_SDPParser.cpp",
+  "ortc/adapter/cpp/ortc_adapter_SDPParser_DescriptionToSDP.cpp",
+  "ortc/adapter/cpp/ortc_adapter_SDPParser_GenerateSDP.cpp",
+  "ortc/adapter/cpp/ortc_adapter_SDPParser_ParseSDP.cpp",
+  "ortc/adapter/cpp/ortc_adapter_SDPParser_SDPToDescription.cpp",
+  "ortc/adapter/cpp/ortc_adapter_SessionDescription.cpp",
+  "ortc/adapter/internal/ortc_adapter_adapter.h",
+  "ortc/adapter/internal/ortc_adapter_Helper.h",
+  "ortc/adapter/internal/ortc_adapter_MediaStream.h",
+  "ortc/adapter/internal/ortc_adapter_PeerConnection.h",
+  "ortc/adapter/internal/ortc_adapter_SDPParser.h",
+  "ortc/adapter/internal/ortc_adapter_SessionDescription.h",
+  "ortc/adapter/internal/types.h",
+  "ortc/cpp/ifaddrs-android.cc",
+  "ortc/cpp/ortc.cpp",
+  "ortc/cpp/ortc_Capabilities.cpp",
+  "ortc/cpp/ortc_Certificate.cpp",
+  "ortc/cpp/ortc_Constraints.cpp",
+  "ortc/cpp/ortc_DataChannel.cpp",
+  "ortc/cpp/ortc_DTLSTransport.cpp",
+  "ortc/cpp/ortc_DTMFSender.cpp",
+  "ortc/cpp/ortc_Helper.cpp",
+  "ortc/cpp/ortc_ICEGatherer.cpp",
+  "ortc/cpp/ortc_ICEGathererRouter.cpp",
+  "ortc/cpp/ortc_ICETransport.cpp",
+  "ortc/cpp/ortc_ICETransportController.cpp",
+  "ortc/cpp/ortc_ICETypes.cpp",
+  "ortc/cpp/ortc_Identity.cpp",
+  "ortc/cpp/ortc_ISecureTransport.cpp",
+  "ortc/cpp/ortc_MediaChannelTraceHelper.cpp",
+  "ortc/cpp/ortc_MediaDevice.cpp",
+  "ortc/cpp/ortc_MediaDeviceCapture.cpp",
+  "ortc/cpp/ortc_MediaDeviceCaptureAudio.cpp",
+  "ortc/cpp/ortc_MediaDeviceCaptureVideo.cpp",
+  "ortc/cpp/ortc_MediaDeviceRenderAudio.cpp",
+  "ortc/cpp/ortc_MediaDevices.cpp",
+  "ortc/cpp/ortc_MediaEngine.cpp",
+  "ortc/cpp/ortc_MediaStreamTrack.cpp",
+  "ortc/cpp/ortc_ORTC.cpp",
+  "ortc/cpp/ortc_RTP.cpp",
+  "ortc/cpp/ortc_RTCPPacket.cpp",
+  "ortc/cpp/ortc_RTPDecoderAudio.cpp",
+  "ortc/cpp/ortc_RTPDecoderVideo.cpp",
+  "ortc/cpp/ortc_RTPEncoderAudio.cpp",
+  "ortc/cpp/ortc_RTPEncoderVideo.cpp",
+  "ortc/cpp/ortc_RTPListener.cpp",
+  "ortc/cpp/ortc_RTPPacket.cpp",
+  "ortc/cpp/ortc_RTPReceiver.cpp",
+  "ortc/cpp/ortc_RTPReceiverChannel.cpp",
+  "ortc/cpp/ortc_RTPSender.cpp",
+  "ortc/cpp/ortc_RTPSenderChannel.cpp",
+  "ortc/cpp/ortc_RTPTypes.cpp",
+  "ortc/cpp/ortc_RTPUtils.cpp",
+  "ortc/cpp/ortc_SCTPTransport.cpp",
+  "ortc/cpp/ortc_SCTPTransportListener.cpp",
+  "ortc/cpp/ortc_SRTPSDESTransport.cpp",
+  "ortc/cpp/ortc_SRTPTransport.cpp",
+  "ortc/cpp/ortc_StatsReport.cpp",
+  "ortc/cpp/ortc_webrtc.cpp",
+  "ortc/internal/ifaddrs-android.h",
+  "ortc/internal/ortc.events.h",
+  "ortc/internal/ortc.events_win.h",
+  "ortc/internal/ortc.events_win_etw.h",
+  "ortc/internal/ortc.h",
+  "ortc/internal/ortc.stats.events.h",
+  "ortc/internal/ortc.stats.events_win.h",
+  "ortc/internal/ortc.stats.events_win_etw.h",
+  "ortc/internal/ortc_Certificate.h",
+  "ortc/internal/ortc_DataChannel.h",
+  "ortc/internal/ortc_DTLSTransport.h",
+  "ortc/internal/ortc_DTMFSender.h",
+  "ortc/internal/ortc_Helper.h",
+  "ortc/internal/ortc_ICEGatherer.h",
+  "ortc/internal/ortc_ICEGathererRouter.h",
+  "ortc/internal/ortc_ICETransport.h",
+  "ortc/internal/ortc_ICETransportController.h",
+  "ortc/internal/ortc_Identity.h",
+  "ortc/internal/ortc_IMediaDevice.h",
+  "ortc/internal/ortc_IMediaDeviceCapture.h",
+  "ortc/internal/ortc_IMediaDeviceRender.h",
+  "ortc/internal/ortc_IMediaStreamTrack.h",
+  "ortc/internal/ortc_IMediaStreamTrackChannel.h",
+  "ortc/internal/ortc_IMediaStreamTrackMonitor.h",
+  "ortc/internal/ortc_IMediaStreamTrackSubscriber.h",
+  "ortc/internal/ortc_IRTP.h",
+  "ortc/internal/ortc_IRTPDecoder.h",
+  "ortc/internal/ortc_IRTPEncoder.h",
+  "ortc/internal/ortc_ISecureTransport.h",
+  "ortc/internal/ortc_ISRTPTransport.h",
+  "ortc/internal/ortc_MediaChannelTraceHelper.h",
+  "ortc/internal/ortc_MediaDeviceCaptureAudio.h",
+  "ortc/internal/ortc_MediaDeviceCaptureVideo.h",
+  "ortc/internal/ortc_MediaDeviceRenderAudio.h",
+  "ortc/internal/ortc_MediaDevices.h",
+  "ortc/internal/ortc_MediaEngine.h",
+  "ortc/internal/ortc_MediaStreamTrack.h",
+  "ortc/internal/ortc_MediaStreamTrackChannel.h",
+  "ortc/internal/ortc_MediaStreamTrackSubscriberMedia.h",
+  "ortc/internal/ortc_MediaStreamTrackSubscriberRTP.h",
+  "ortc/internal/ortc_ORTC.h",
+  "ortc/internal/ortc_RTPDecoderAudio.h",
+  "ortc/internal/ortc_RTPDecoderVideo.h",
+  "ortc/internal/ortc_RTPEncoderAudio.h",
+  "ortc/internal/ortc_RTPEncoderVideo.h",
+  "ortc/internal/ortc_RTPListener.h",
+  "ortc/internal/ortc_RTPReceiver.h",
+  "ortc/internal/ortc_RTPReceiverChannel.h",
+  "ortc/internal/ortc_RTPSender.h",
+  "ortc/internal/ortc_RTPSenderChannel.h",
+  "ortc/internal/ortc_RTPTypes.h",
+  "ortc/internal/ortc_RTPUtils.h",
+  "ortc/internal/ortc_SCTPTransport.h",
+  "ortc/internal/ortc_SCTPTransportListener.h",
+  "ortc/internal/ortc_SRTPSDESTransport.h",
+  "ortc/internal/ortc_SRTPTransport.h",
+  "ortc/internal/ortc_StatsReport.h",
+  "ortc/internal/ortcEvents.h",
+  "ortc/internal/platform.h",
+  "ortc/internal/types.h",
+]
+
+if (is_android) {
+    ortclib_sources -= [
+      "ortc/cpp/ifaddrs-android.cc",
+    ]
+}
+
+ortc_sources_cxx_generated = [
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpRedCodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceTransportStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDtmfToneChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpCodecCapability.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceGathererCandidate.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpEncodingParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceTransportOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceGathererIceErrorEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_ConstrainBooleanParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDataChannel.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSrtpSdesCryptoParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpCapabilities.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDtmfSender.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCPeerConnectionIceEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDtlsFingerprint.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaTrackSupportedConstraints.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCCapabilityOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpUnhandledEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpSender.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaStreamTrack.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionMediaLine.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceTransportStateChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSctpCapabilities.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaStreamConstraints.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSrtpSdesTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpContributingSource.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescription.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIdentityAssertion.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpH264CodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpVp8CodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_Error.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpOpusCodecCapabilityOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_MediaStream.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MessageQueue.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionConnectionData.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaSource.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceGathererStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_ConstrainDoubleRange.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionRtpSender.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_OrtcLib.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDataTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDataChannelEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpH264CodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDataChannelStateChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceGathererStateChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCAnswerOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIdentity.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaDevices.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCCertificate.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceTransportController.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCMediaStreamStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_OverconstrainedError.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSsrcConflictEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceCandidate.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_ConstrainDouble.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCStatsProvider.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCMessageEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpCodecCapabilityOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_ErrorEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaDeviceInfo.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceGatherInterfacePolicy.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCTrackEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSctpTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaTrackConstraintSet.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_StringOrStringList.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpFlexFecCodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionDescription.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpFecParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDtlsCertificateBinary.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpStreamStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpRtxCodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIdentityError.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCOutboundRtpStreamStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCConfiguration.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceCandidateAttributes.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpVp8CodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_Settings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSctpTransportStateChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCCodec.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpHeaderExtensionParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCStatsReport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCPeerConnection.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpRtxCodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaTrackCapabilities.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDtlsTransportStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_ConstrainBoolean.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_LongRange.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_ConstrainString.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceGathererCandidateCompleteEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCOfferOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpOpusCodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSctpTransportListenerEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSrtpTransportStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_OverconstrainedErrorEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpCodecParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpCodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCMediaStreamTrackConfiguration.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceServer.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_DoubleRange.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceGathererCandidateEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceCandidatePairStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceCandidateComplete.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_Json.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSrtpSdesKeyParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpReceiver.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIdentityResult.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSctpTransportListener.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceGatherOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_ConstrainLong.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionTransportParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSctpTransportStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCIceCandidate.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCCertificateStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaTrackSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtcpFeedback.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDataChannelParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceGatherer.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCInboundRtpStreamStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtcpParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpHeaderExtension.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCStatsTypeSet.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCOfferAnswerOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_ConstrainStringParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_ConstrainLongRange.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/output.json",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpCodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCSrtpSdesParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceCandidatePair.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDtlsParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaControl.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDataChannelStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_Logger.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtcpTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpRtxParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_MediaTrackConstraints.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDtlsTransportStateChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/types.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCIceCandidatePairChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCMediaStreamTrackStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpListener.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCRtpOpusCodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/org_ortc_RTCDtlsTransport.h",
+]
+
+ortc_sources = []
+
+if(current_os != "winuwp"){
+ortc_sources = [
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpTransportStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpRtxCodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceTransportStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIdentityResult.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCStatsReport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpUnhandledEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIdentity.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSsrcConflictEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidateComplete.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ErrorEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpSdesCryptoParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpCapabilities.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpEncodingParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainDouble.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidateAttributes.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_Error.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidatePairChangeEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtmfToneChangeEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCodecCapability.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpH264CodecParameterSettings.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpTransportStateChangeEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpH264CodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGatherOptions.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_Settings.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpCapabilities.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCPeerConnection.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtcpTransport.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaDevices.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidatePair.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainBooleanParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_OverconstrainedError.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCMediaStreamTrackStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidatePair.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpVp8CodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_Error.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCodecCapabilityOptions.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCMediaStreamStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtmfSender.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataChannel.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceTransportStateChangeEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIdentityAssertion.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsTransportStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCStatsProvider.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainDouble.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCStatsProvider.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaControl.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_MediaStream.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSsrcConflictEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererCandidate.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCInboundRtpStreamStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererStateChangeEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceServer.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererStateChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtmfToneChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidatePairChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainStringParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_Logger.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGatherInterfacePolicy.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaStreamConstraints.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_Logger.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCIceCandidate.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCIceCandidate.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataChannelEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainDoubleRange.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererIceErrorEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtcpFeedback.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsTransport.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCCertificate.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpTransportListenerEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_Settings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainString.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_DoubleRange.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpSdesParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCPeerConnection.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidateComplete.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpRtxParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_helpers.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCapabilities.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCOutboundRtpStreamStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaTrackCapabilities.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpOpusCodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIdentityError.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCCapabilityOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtmfSender.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsFingerprint.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpTransportStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpSdesCryptoParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainStringParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_OrtcLib.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererCandidate.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaTrackSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpStreamStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpTransportListener.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCInboundRtpStreamStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpReceiver.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererIceErrorEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_OverconstrainedErrorEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainLongRange.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescription.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaTrackSupportedConstraints.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCCodec.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainBoolean.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCPeerConnectionIceEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsTransportStateChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpSender.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCOfferOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpContributingSource.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MessageQueue.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpSender.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceTransport.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainLong.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererCandidateEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpSdesTransport.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIdentityAssertion.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpTransportStateChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataChannelParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_Json.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGatherer.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidate.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCMediaStreamStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsCertificateBinary.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpHeaderExtensionParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaTrackCapabilities.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataChannelParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ErrorEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceServer.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCodecCapabilityOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_OrtcLib.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidate.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidateAttributes.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCAnswerOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainBooleanParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_DoubleRange.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaTrackConstraints.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaSource.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCOfferOptions.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsFingerprint.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaControl.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpTransportListenerEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainDoubleRange.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataChannelStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_StringOrStringList.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtcpParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCodecParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpContributingSource.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpHeaderExtension.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataChannelStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCConfiguration.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaTrackSupportedConstraints.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaTrackConstraints.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_Json.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaDevices.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaTrackConstraintSet.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpTransport.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_OverconstrainedErrorEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCMessageEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCOutboundRtpStreamStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainLongRange.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCodecParameterSettings.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_LongRange.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpTransportStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpListener.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCCertificateStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsCertificateBinary.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCCertificate.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpRtxParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCConfiguration.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCStatsTypeSet.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpHeaderExtension.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaSource.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCodecCapabilityParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceTransportController.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_LongRange.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGatherOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDtlsTransportStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpH264CodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionDescription.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_MediaStream.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpFecParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCStatsReport.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataChannelStateChangeEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_OverconstrainedError.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIdentity.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceTransportController.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCTrackEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCAnswerOptions.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpTransport.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCodecParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpTransportListener.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataChannelStateChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaStreamTrack.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_StringOrStringList.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainBoolean.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCTrackEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCMediaStreamTrackStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIdentityResult.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidatePairStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCodecCapability.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpListener.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_helpers.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCMessageEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpReceiver.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpStreamStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescription.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCCodec.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpUnhandledEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpRedCodecParameterSettings.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceTransportStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataChannelEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGatherer.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataChannel.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpSdesTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIdentityError.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCOfferAnswerOptions.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCCertificateStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCOfferAnswerOptions.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpEncodingParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCCapabilityOptions.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaStreamConstraints.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpHeaderExtensionParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtcpFeedback.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtcpParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaDeviceInfo.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpCapabilities.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpSdesKeyParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtcpTransport.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGatherInterfacePolicy.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpSdesParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaStreamTrack.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSctpTransportStats.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererCandidateCompleteEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceTransportStateChangeEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceTransportOptions.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpFecParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaTrackConstraintSet.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpRedCodecParameterSettings.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCSrtpSdesKeyParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainString.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCDataTransport.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/types.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_ConstrainLong.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaTrackSettings.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceGathererCandidateEvent.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MessageQueue.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCStatsTypeSet.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceCandidatePairStats.h",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_MediaDeviceInfo.cpp",
+ "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/c/c_org_ortc_RTCIceTransportOptions.h",
+]
+}
+
+if(current_os == "winuwp"){
+ ortc_sources = [
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/cx_Helpers.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/cx_Helpers.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_MediaStream.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_MediaStream.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCAnswerOptions.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCAnswerOptions.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCCapabilityOptions.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCCapabilityOptions.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCConfiguration.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCConfiguration.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCIceCandidate.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCIceCandidate.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCMediaStreamTrackConfiguration.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCMediaStreamTrackConfiguration.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCOfferAnswerOptions.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCOfferAnswerOptions.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCOfferOptions.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCOfferOptions.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCPeerConnection.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCPeerConnection.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCPeerConnectionIceErrorEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCPeerConnectionIceErrorEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCPeerConnectionIceEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCPeerConnectionIceEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescription.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescription.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionConnectionData.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionConnectionData.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionConnectionDataDetails.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionConnectionDataDetails.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionDescription.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionDescription.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionDescriptionDetails.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionDescriptionDetails.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionMediaLine.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionMediaLine.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionMediaLineDetails.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionMediaLineDetails.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionRtpMediaLine.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionRtpMediaLine.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionRtpSender.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionRtpSender.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionRtpSenderDetails.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionRtpSenderDetails.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionSctpMediaLine.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionSctpMediaLine.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionTransport.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionTransport.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionTransportParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCSessionDescriptionTransportParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCTrackEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Adapter_RTCTrackEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainBoolean.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainBoolean.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainBooleanParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainBooleanParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainDouble.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainDouble.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainDoubleRange.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainDoubleRange.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainLong.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainLong.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainLongRange.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainLongRange.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainString.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainString.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainStringParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ConstrainStringParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Dispatcher.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Dispatcher.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_DoubleRange.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_DoubleRange.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Error.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Error.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ErrorEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_ErrorEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Json.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Json.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Logger.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Logger.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_LongRange.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_LongRange.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaControl.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaControl.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaDeviceInfo.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaDeviceInfo.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaDevices.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaDevices.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaSource.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaSource.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaStreamConstraints.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaStreamConstraints.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaStreamTrack.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaStreamTrack.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaTrackCapabilities.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaTrackCapabilities.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaTrackConstraints.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaTrackConstraints.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaTrackConstraintSet.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaTrackConstraintSet.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaTrackSettings.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaTrackSettings.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaTrackSupportedConstraints.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MediaTrackSupportedConstraints.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MessageQueue.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_MessageQueue.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_OrtcLib.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_OrtcLib.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_OrtcLibWithDispatcher.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_OrtcLibWithDispatcher.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_OverconstrainedError.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_OverconstrainedError.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_OverconstrainedErrorEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_OverconstrainedErrorEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCCertificate.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCCertificate.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCCertificateStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCCertificateStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCCodec.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCCodec.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataChannel.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataChannel.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataChannelEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataChannelEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataChannelParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataChannelParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataChannelStateChangeEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataChannelStateChangeEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataChannelStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataChannelStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataTransport.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDataTransport.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsCertificateBinary.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsCertificateBinary.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsFingerprint.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsFingerprint.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsTransport.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsTransport.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsTransportStateChangeEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsTransportStateChangeEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsTransportStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtlsTransportStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtmfSender.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtmfSender.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtmfToneChangeEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCDtmfToneChangeEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidate.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidate.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidateAttributes.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidateAttributes.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidateComplete.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidateComplete.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidatePair.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidatePair.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidatePairChangeEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidatePairChangeEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidatePairStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceCandidatePairStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGatherer.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGatherer.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererCandidate.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererCandidate.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererCandidateCompleteEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererCandidateCompleteEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererCandidateEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererCandidateEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererIceErrorEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererIceErrorEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererStateChangeEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererStateChangeEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGathererStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGatherInterfacePolicy.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGatherInterfacePolicy.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGatherOptions.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceGatherOptions.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceServer.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceServer.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceTransport.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceTransport.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceTransportController.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceTransportController.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceTransportOptions.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceTransportOptions.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceTransportStateChangeEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceTransportStateChangeEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceTransportStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIceTransportStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIdentity.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIdentity.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIdentityAssertion.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIdentityAssertion.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIdentityError.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIdentityError.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIdentityResult.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCIdentityResult.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCInboundRtpStreamStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCInboundRtpStreamStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCMediaStreamStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCMediaStreamStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCMediaStreamTrackStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCMediaStreamTrackStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCMessageEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCMessageEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCOutboundRtpStreamStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCOutboundRtpStreamStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtcpFeedback.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtcpFeedback.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtcpParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtcpParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtcpTransport.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtcpTransport.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCapabilities.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCapabilities.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCodecCapability.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCodecCapability.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCodecCapabilityOptions.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCodecCapabilityOptions.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCodecCapabilityParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCodecCapabilityParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCodecParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCodecParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCodecParameterSettings.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpCodecParameterSettings.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpContributingSource.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpContributingSource.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpEncodingParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpEncodingParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpFecParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpFecParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpFlexFecCodecCapabilityParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpFlexFecCodecParameterSettings.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpFlexFecCodecParameterSettings.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpH264CodecCapabilityParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpH264CodecCapabilityParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpH264CodecParameterSettings.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpH264CodecParameterSettings.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpHeaderExtension.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpHeaderExtension.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpHeaderExtensionParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpHeaderExtensionParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpListener.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpListener.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpOpusCodecCapabilityOptions.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpOpusCodecCapabilityOptions.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpOpusCodecCapabilityParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpOpusCodecCapabilityParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpOpusCodecParameterSettings.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpOpusCodecParameterSettings.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpReceiver.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpReceiver.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpRedCodecParameterSettings.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpRedCodecParameterSettings.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpRtxCodecCapabilityParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpRtxCodecCapabilityParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpRtxCodecParameterSettings.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpRtxCodecParameterSettings.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpRtxParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpRtxParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpSender.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpSender.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpStreamStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpStreamStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpTransport.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpTransport.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpUnhandledEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpUnhandledEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpVp8CodecCapabilityParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpVp8CodecCapabilityParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpVp8CodecParameterSettings.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCRtpVp8CodecParameterSettings.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpCapabilities.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpCapabilities.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpTransport.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpTransport.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpTransportListener.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpTransportListener.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpTransportListenerEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpTransportListenerEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpTransportStateChangeEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpTransportStateChangeEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpTransportStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSctpTransportStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpSdesCryptoParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpSdesCryptoParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpSdesKeyParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpSdesKeyParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpSdesParameters.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpSdesParameters.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpSdesTransport.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpSdesTransport.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpTransportStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSrtpTransportStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSsrcConflictEvent.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCSsrcConflictEvent.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCStats.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCStats.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCStatsProvider.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCStatsProvider.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCStatsReport.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCStatsReport.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCStatsTypeSet.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_RTCStatsTypeSet.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Settings.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_Settings.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_StringOrStringList.cpp",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/Org_Ortc_StringOrStringList.h",
+  "$target_gen_dir/../../../../../ortc/ortclib/ortc/idl/wrapper/generated/cx/types.h",
+ ]
+}
+
+#Exists just to keep non generated ortclib code, in case we need it some day
+static_library("ortclib_static") {
+  configs += [ ":ortclib_config" ]
+
+  configs -= [ "//build/config/compiler:no_rtti" ]
+  configs -= [ "//build/config/compiler:chromium_code" ]
+
+  if (!is_win) {
+    configs -= [ "//build/config/gcc:no_exceptions" ]
+  }
+
+  #To include sources generated from IDL set sources value to ortc_sources
+  sources = ortclib_sources
+
+  defines = [
+    "_LIB",
+    "USE_ETW",
+    "USE_OPENSSL=1",
+    "NOMINMAX",    
+    "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
+    "_CRT_SECURE_NO_WARNINGS",
+    "_UNICODE",
+    "UNICODE",
+  ]
+
+  if (is_linux || is_android) {
+    defines += [
+    "WEBRTC_POSIX",
+    "WEBRTC_BUILD_LIBEVENT",
+    ]
+  }
+
+  if (is_ios || is_mac) {
+    defines += [
+      "WEBRTC_POSIX",
+    ]
+  }
+
+  if (is_win) {
+    defines += [ "WEBRTC_WIN", ]
+  }
+  
+  if (is_linux) {
+    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+    configs -= [ "//build/config/clang:find_bad_constructs" ]
+  }
+
+  public_deps = [ 
+    ":ortclib_events",
+    ":ortclib_idl",
+  ]
+}
+
+
+shared_library("libOrtc") {
+
+  configs -= [ "//build/config/compiler:no_rtti" ]
+  configs -= [ "//build/config/compiler:chromium_code" ]
+
+  if (!is_win) {
+    configs -= [ "//build/config/gcc:no_exceptions", ]
+    if (is_ios || is_mac) {
+      cflags_cc = [
+        "-Wall",
+        "-std=c++11", 
+        "-g",
+      ]
+      ldflags = [
+        "-lz",
+        "-lresolv",
+      ]
+    }
+  } else {
+    cflags_cc = [ 
+      "/WX-",
+      "/wd4068",
+    ]
+    if (current_os != "winuwp") {
+      ldflags = [
+         "/FIXED:NO",
+       ]
+       cflags_cc += ["/EHsc"]
+    }
+  } 
+  include_dirs = [ 
+    ".",
+    "..",
+    "../zsLib",
+    "../zsLib/zsLib/extras",
+    "../zsLib-eventing",
+    "../ortclib-services",
+    "../../third_party",
+    "../../third_party/boringssl/include",
+    "../../third_party/usrsctp/usrsctplib",
+    "../../third_party/libsrtp/srtp/include",
+    "../../third_party/libsrtp/srtp/crypto/include",
+    "../../third_party/libsrtp/config",
+    "../../third_party/usrsctp/usrsctplib/usrsctplib",
+    "../../third_party/boringssl/include/openssl", 
+    "../../third_party/boringssl/include",
+    "../../third_party/libsrtp/include",
+    "../../third_party/libsrtp/crypto/include", 
+    "../../third_party/boringssl/src/include", 
+    "../../third_party/libyuv/include",    
+    "../..",
+    "../../ortc",
+    "../ortclib",
+    "../ortclib/ortc",
+    "../ortclib/ortc/idl",
+    "../ortclib/ortc/idl/wrapper",
+  ]
+  
+  sources = ortc_sources
+
+  if (current_os == "winuwp")
+  {
+    include_dirs += [ "../ortclib/ortc/idl/wrapper/cx", ]
+    
+  sources += [
+    "../ortclib/ortc/idl/wrapper/cx/cx_custom_Org_Ortc_Dispatcher.cpp",
+    "../ortclib/ortc/idl/wrapper/cx/cx_custom_Org_Ortc_MediaControl.cpp",
+    "../ortclib/ortc/idl/wrapper/cx/cx_custom_Org_Ortc_MediaSource.cpp",
+  ]
+  }
+  if (is_linux) {
+
+    if (target_cpu == "x64") {
+      lib_dirs = [
+        "/usr/lib",
+        "/usr/lib/x86_64-linux-gnu",
+      ]
+    } else if (target_cpu == "x86") {
+      lib_dirs = [
+        "/usr/lib",
+        "/usr/lib/i386-linux-gnu",
+        "/lib/i386-linux-gnu",
+      ]
+    }
+    
+    libs = [ "uuid", "curl", "ssl", "crypto" ]
+  }
+
+  if ((current_os == "winuwp") && (target_cpu == "x64") && is_debug) {
+    lib_dirs = [
+       "..\..\ortc\curl\x64-debug-static\lib",
+    ]
+    libs = [ "libcurl.lib" ]    
+  } else if ((current_os == "winuwp") && (target_cpu == "x64") && !is_debug) {
+    lib_dirs = [
+       "..\..\ortc\curl\x64-release-static\lib",
+    ]
+    libs = [ "libcurl.lib" ]
+  } else if ((current_os == "winuwp") && (target_cpu == "x86") && is_debug) {
+    lib_dirs = [
+       "..\..\ortc\curl\x86-debug-static\lib",
+    ]
+    libs = [ "libcurl.lib" ]  
+  } else if ((current_os == "winuwp") && (target_cpu == "x86") && !is_debug) {
+    lib_dirs = [
+       "..\..\ortc\curl\x86-release-static\lib",
+    ]
+    libs = [ "libcurl.lib" ]    
+  } else if (is_win && is_debug) {
+    lib_dirs = [
+       "..\..\ortc\curl\x86-debug-static\lib",
+    ]
+    libs = [ "libcurl.lib", "userenv.lib", "normaliz.lib" ]
+  } else if (is_win && !is_debug) {
+    lib_dirs = [
+       "..\..\ortc\curl\x86-release-static\lib",
+    ]
+    libs = [ "libcurl.lib", "userenv.lib", "normaliz.lib" ]  
+  } else if (is_mac || is_ios){
+    libs = [ "../../ortc/curl/curl/ios-appstore/lib/libcurl.a" ]  
+  } 
+
+  deps = [
+    "//ortc/zsLib:zslib",
+    "//ortc/zsLib-eventing:zslib-eventing",
+    "//third_party/cryptopp:cryptopp",
+    "//third_party/idnkit:idnkit",
+    "//third_party/udns:udns",
+    ":ortclib_generated_static",
+    "//ortc/ortclib-services",
+    "//third_party/boringssl:boringssl",
+    "//third_party/usrsctp:usrsctp",
+    "//third_party/libsrtp:libsrtp",
+    "//webrtc/modules/audio_device",
+    "//webrtc/system_wrappers:metrics_default",
+    "//webrtc/modules/video_capture:video_capture_module",
+    "//webrtc/modules/video_capture"
+  ]
+
+  defines = [
+    "SHARED",
+    "ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION",
+    "USE_ETW",
+    "USE_OPENSSL=1",
+    "NOMINMAX",    
+    "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
+    "_CRT_SECURE_NO_WARNINGS",
+    "_UNICODE",
+    "UNICODE",
+  ]
+
+  if (is_ios || is_mac) {
+    defines += [
+    "WEBRTC_POSIX",
+    ]
+  }
+
+  if (is_linux || is_android) {
+    defines += [
+    "WEBRTC_POSIX",
+    "WEBRTC_BUILD_LIBEVENT",
+    ]
+  }
+
+  if (is_linux) {
+    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+    configs -= [ "//build/config/clang:find_bad_constructs" ]
+  }
+
+}
+
+static_library("ortclib_generated_static") {
+
+  configs += [ ":ortclib_config" ]
+
+  configs -= [ "//build/config/compiler:no_rtti" ]
+  configs -= [ "//build/config/compiler:chromium_code" ]
+
+  if (!is_win) {
+    configs -= [ "//build/config/gcc:no_exceptions" ]
+  }
+
+  
+  #To include sources generated from IDL set sources value to ortc_sources
+  sources = ortc_sources_cxx_glue
+  sources += ortc_sources_cxx_generated
+
+  if (current_os != "winuwp")
+  {
+    sources -= [ 
+      "ortc/idl/wrapper/impl_org_ortc_Dispatcher.cpp",
+      "ortc/idl/wrapper/impl_org_ortc_OrtcLibWithDispatcher.cpp",
+    ]
+  }
+  
+  defines = [
+    "_LIB",
+    "USE_ETW",
+    "USE_OPENSSL=1",
+    "NOMINMAX",    
+    "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
+    "_CRT_SECURE_NO_WARNINGS",
+    "_UNICODE",
+    "UNICODE",
+  ]
+
+  if (is_linux) {
+    defines += [
+    "WEBRTC_POSIX",
+    "WEBRTC_BUILD_LIBEVENT",
+    ]
+  }
+
+  if (is_win) {
+    defines += [ "WEBRTC_WIN", ]
+  }
+  
+  public_deps = [ 
+    ":ortclib_static",
+  ]
+
+  if (is_linux) {
+    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+    configs -= [ "//build/config/clang:find_bad_constructs" ]
+  }
+}
+
+compile_event_macro("ortclib_events") {
+  
+  sources = [
+    "ortc/cpp/ortc.events.json",
+    "ortc/cpp/ortc.stats.events.json",
+  ]
+    
+}
+
+compile_idl_macro("ortclib_idl") {
+  
+  sources = [
+    "ortc/idl/config.json",
+  ]
+    
+ outputs = ortc_sources
+
+  sourcePathPrefix =  "ortc/idl/"
+}
diff --git a/ortc/ICertificate.h b/ortc/ICertificate.h
index 35aa2c93..688fab6f 100644
--- a/ortc/ICertificate.h
+++ b/ortc/ICertificate.h
@@ -45,7 +45,7 @@ namespace ortc
   //---------------------------------------------------------------------------
   //---------------------------------------------------------------------------
   #pragma mark
-  #pragma mark IDTLSTransportTypes
+  #pragma mark ICertificateTypes
   #pragma mark
   
   interaction ICertificateTypes
@@ -82,7 +82,7 @@ namespace ortc
   //---------------------------------------------------------------------------
   //---------------------------------------------------------------------------
   #pragma mark
-  #pragma mark IDTLSTransport
+  #pragma mark ICertificate
   #pragma mark
 
   interaction ICertificate : public ICertificateTypes,
diff --git a/ortc/IConstraints.h b/ortc/IConstraints.h
index ea634b69..ade9539c 100644
--- a/ortc/IConstraints.h
+++ b/ortc/IConstraints.h
@@ -48,22 +48,22 @@ namespace ortc
   
   interaction IConstraints
   {
-    ZS_DECLARE_STRUCT_PTR(ConstrainBoolean)
-    ZS_DECLARE_STRUCT_PTR(ConstrainBooleanParameters)
-    ZS_DECLARE_STRUCT_PTR(ConstrainLong)
-    ZS_DECLARE_STRUCT_PTR(ConstrainLongRange)
-    ZS_DECLARE_STRUCT_PTR(ConstrainDouble)
-    ZS_DECLARE_STRUCT_PTR(ConstrainDoubleRange)
-    ZS_DECLARE_STRUCT_PTR(ConstrainString)
-    ZS_DECLARE_STRUCT_PTR(ConstrainStringParameters)
-    ZS_DECLARE_STRUCT_PTR(StringOrStringList)
-
-    ZS_DECLARE_TYPEDEF_PTR(zsLib::LONG, Long)
-    ZS_DECLARE_TYPEDEF_PTR(bool, Bool)
-    ZS_DECLARE_TYPEDEF_PTR(double, Double)
-    ZS_DECLARE_TYPEDEF_PTR(String, String)
-
-    ZS_DECLARE_TYPEDEF_PTR(std::list<String>, StringList)
+    ZS_DECLARE_STRUCT_PTR(ConstrainBoolean);
+    ZS_DECLARE_STRUCT_PTR(ConstrainBooleanParameters);
+    ZS_DECLARE_STRUCT_PTR(ConstrainLong);
+    ZS_DECLARE_STRUCT_PTR(ConstrainLongRange);
+    ZS_DECLARE_STRUCT_PTR(ConstrainDouble);
+    ZS_DECLARE_STRUCT_PTR(ConstrainDoubleRange);
+    ZS_DECLARE_STRUCT_PTR(ConstrainString);
+    ZS_DECLARE_STRUCT_PTR(ConstrainStringParameters);
+    ZS_DECLARE_STRUCT_PTR(StringOrStringList);
+
+    ZS_DECLARE_TYPEDEF_PTR(zsLib::LONG, Long);
+    ZS_DECLARE_TYPEDEF_PTR(bool, Bool);
+    ZS_DECLARE_TYPEDEF_PTR(double, Double);
+    ZS_DECLARE_TYPEDEF_PTR(String, String);
+
+    ZS_DECLARE_TYPEDEF_PTR(std::list<String>, StringList);
 
     //-------------------------------------------------------------------------
     #pragma mark
@@ -252,6 +252,9 @@ namespace ortc
 
       ElementPtr toDebug() const;
       String hash() const;
+
+      void exact(StringList &values) const;
+      void ideal(StringList &values) const;
     };
 
   };
diff --git a/ortc/IICEGatherer.h b/ortc/IICEGatherer.h
index a9d3b24e..6bce161d 100644
--- a/ortc/IICEGatherer.h
+++ b/ortc/IICEGatherer.h
@@ -101,7 +101,7 @@ namespace ortc
       FilterPolicy_NoPrflx             = (FilterPolicy_NoIPv4Prflx | FilterPolicy_NoIPv6Prflx),
       FilterPolicy_NoRelay             = (FilterPolicy_NoIPv4Relay | FilterPolicy_NoIPv6Relay),
       FilterPolicy_NoPrivate           = (FilterPolicy_NoIPv4Private | FilterPolicy_NoIPv6Private),
-      FilterPolicy_RelayOnly           = (FilterPolicy_NoHost | FilterPolicy_NoSrflx | FilterPolicy_NoPrflx),
+      FilterPolicy_RelayOnly           = (FilterPolicy_NoHost | FilterPolicy_NoPrivate | FilterPolicy_NoSrflx | FilterPolicy_NoPrflx),
       FilterPolicy_NoCandidates        = (0x7FFFFFFF)
     };
 
diff --git a/ortc/IICETypes.h b/ortc/IICETypes.h
index bcc3c634..5ee6efd8 100644
--- a/ortc/IICETypes.h
+++ b/ortc/IICETypes.h
@@ -182,11 +182,12 @@ namespace ortc
 
       static CandidatePtr convert(GatherCandidatePtr candidate);
 
-      Candidate() {}
-      Candidate(const Candidate &op2) {(*this) = op2;}
+      Candidate();
+      Candidate(const Candidate &op2);
       Candidate(ElementPtr elem);
+      ~Candidate();
 
-      virtual ElementPtr createElement(const char *objectName = "candidate") const;
+      ElementPtr createElement(const char *objectName = "candidate") const override;
 
       ElementPtr toDebug() const;
       String hash(bool includePriorities = true) const;
@@ -213,7 +214,7 @@ namespace ortc
       CandidateComplete(const CandidateComplete &op2) {(*this) = op2;}
       CandidateComplete(ElementPtr elem);
 
-      virtual ElementPtr createElement(const char *objectName = "candidateComplete") const;
+      ElementPtr createElement(const char *objectName = "candidateComplete") const override;
 
       ElementPtr toDebug() const;
       String hash() const;
diff --git a/ortc/IIdentity.h b/ortc/IIdentity.h
index bc4e2ce2..7de54fb0 100644
--- a/ortc/IIdentity.h
+++ b/ortc/IIdentity.h
@@ -111,7 +111,7 @@ namespace ortc
 
     virtual PromiseWithResultPtr getIdentityAssertion(
                                                       const char *provider,
-                                                      const char *protoocl = "default",
+                                                      const char *protocol = "default",
                                                       const char *username = NULL
                                                       ) throw (InvalidStateError) = 0;
 
diff --git a/ortc/IMediaDevices.h b/ortc/IMediaDevices.h
index 84635d3d..5d3644f5 100644
--- a/ortc/IMediaDevices.h
+++ b/ortc/IMediaDevices.h
@@ -48,13 +48,23 @@ namespace ortc
   
   interaction IMediaDevicesTypes : public IMediaStreamTrackTypes
   {
-    ZS_DECLARE_STRUCT_PTR(SupportedConstraints)
-    ZS_DECLARE_STRUCT_PTR(Device)
-    ZS_DECLARE_STRUCT_PTR(DeviceList)
-    ZS_DECLARE_STRUCT_PTR(MediaStreamTrackList)
+    ZS_DECLARE_STRUCT_PTR(SupportedConstraints);
+    ZS_DECLARE_STRUCT_PTR(Device);
+    ZS_DECLARE_STRUCT_PTR(DeviceList);
+    ZS_DECLARE_STRUCT_PTR(MediaStreamTrackList);
 
-    ZS_DECLARE_TYPEDEF_PTR(PromiseWith<MediaStreamTrackListPtr>, PromiseWithMediaStreamTrackList)
-    ZS_DECLARE_TYPEDEF_PTR(PromiseWith<DeviceListPtr>, PromiseWithDeviceList)
+    ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Settings, Settings);
+
+    struct SettingsList : public std::list<Settings>,
+                          public Any
+    {
+    };
+
+    ZS_DECLARE_PTR(SettingsList);
+
+    ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWith<MediaStreamTrackList>, PromiseWithMediaStreamTrackList);
+    ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWith<DeviceList>, PromiseWithDeviceList);
+    ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWith<SettingsList>, PromiseWithSettingsList);
 
     enum DeviceKinds
     {
@@ -86,6 +96,7 @@ namespace ortc
       bool mSampleSize {false};
       bool mEchoCancellation {false};
       bool mLatency {false};
+      bool mChannelCount {false};
       bool mDeviceID {false};
       bool mGroupID {false};
 
@@ -104,8 +115,9 @@ namespace ortc
     #pragma mark IMediaDevices::Device
     #pragma mark
 
-    struct Device {
-      DeviceKinds mKind {DeviceKind_First};
+    struct Device
+    {
+       DeviceKinds mKind {DeviceKind_First};
 
       String mLabel;
       String mDeviceID;
@@ -173,6 +185,7 @@ namespace ortc
     static SupportedConstraintsPtr getSupportedConstraints();
 
     static PromiseWithDeviceListPtr enumerateDevices();
+    static PromiseWithSettingsListPtr enumerateDefaultModes(const char *deviceID);
 
     static PromiseWithMediaStreamTrackListPtr getUserMedia(const Constraints &constraints = Constraints());
 
diff --git a/ortc/IMediaElement.h b/ortc/IMediaElement.h
new file mode 100644
index 00000000..9ca479fd
--- /dev/null
+++ b/ortc/IMediaElement.h
@@ -0,0 +1,162 @@
+/*
+ 
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+ 
+ 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.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ 
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/types.h>
+#include <ortc/IMediaStreamTrack.h>
+
+namespace ortc
+{
+  ZS_DECLARE_INTERACTION_PTR(IWindowSink);
+  ZS_DECLARE_INTERACTION_PTR(IMediaElementTypes);
+
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IWindowSink
+  #pragma mark
+
+  interaction IWindowSink
+  {
+#ifdef _WIN32
+#ifdef __cplusplus_winrt
+    static IMediaElementPtr create();
+#else
+    static IMediaElementPtr create(HWND hwnd);
+#endif // __cplusplus_winrt
+#else
+    static IMediaElementPtr create(void *window);
+#endif // _WIN32
+
+    virtual PUID getID() const = 0;
+  };
+
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaElementTypes
+  #pragma mark
+  
+  interaction IMediaElementTypes
+  {
+    typedef std::list<IMediaStreamTrackPtr> MediaStreamTrackList;
+    typedef IMediaStreamTrackTypes::Kinds Kinds;
+    typedef IMediaStreamTrackTypes::States States;
+
+    struct MediaSink
+    {
+      String mAudioSinkID;
+      IWindowSinkPtr mVideoSinkWindow;
+    };
+
+    virtual ~IMediaElementTypes() {}
+  };
+
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaStreamTrack
+  #pragma mark
+  
+  interaction IMediaElement : public Any,
+                              public IMediaElementTypes
+  {
+    static ElementPtr toDebug(IMediaElementPtr object);
+
+    static IMediaElementPtr convert(AnyPtr any);
+
+    static IMediaElementPtr create(MediaSink sink);
+
+    virtual PUID getID() const = 0;
+
+    virtual IMediaStreamTrackSubscriptionPtr subscribe(IMediaElementDelegatePtr delegate) = 0;
+
+    virtual String sinkID() const = 0;  // unique audio device ID delivering audio output
+    virtual IWindowSinkPtr sinkWindow() const = 0;  // window where media is being delivered
+
+    virtual bool muted() const = 0;
+    virtual void muted(bool muted) = 0;
+    virtual bool paused() const = 0;
+    virtual void paused(bool paused) = 0;
+    virtual States readyState() const = 0;
+
+    virtual void stop() = 0;
+
+    virtual MediaStreamTrackList audioTracks() = 0;
+    virtual MediaStreamTrackList videoTracks() = 0;
+
+    virtual PromisePtr attach(IMediaStreamTrackPtr track) = 0;
+    virtual void detach(IMediaStreamTrackPtr track) = 0;
+  };
+
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaElementDelegate
+  #pragma mark
+
+  interaction IMediaElementDelegate
+  {
+    virtual ~IMediaElementDelegate() {}
+  };
+  
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaElementSubscription
+  #pragma mark
+  
+  interaction IMediaElementSubscription
+  {
+    virtual PUID getID() const = 0;
+    
+    virtual void cancel() = 0;
+
+    virtual void background() = 0;
+  };
+}
+
+ZS_DECLARE_PROXY_BEGIN(ortc::IMediaElementDelegate)
+ZS_DECLARE_PROXY_END()
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_BEGIN(ortc::IMediaElementDelegate, ortc::IMediaElementSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
diff --git a/ortc/IMediaStreamTrack.h b/ortc/IMediaStreamTrack.h
index 0e94f1d6..027064e2 100644
--- a/ortc/IMediaStreamTrack.h
+++ b/ortc/IMediaStreamTrack.h
@@ -34,23 +34,13 @@
 #include <ortc/types.h>
 #include <ortc/ICapabilities.h>
 #include <ortc/IConstraints.h>
+#include <ortc/IRTPTypes.h>
 #include <ortc/IStatsProvider.h>
 
+#include <queue>
+
 namespace ortc
 {
-  //---------------------------------------------------------------------------
-  //---------------------------------------------------------------------------
-  //---------------------------------------------------------------------------
-  //---------------------------------------------------------------------------
-  #pragma mark
-  #pragma mark IMediaStreamTrackCallback
-  #pragma mark
-
-  interaction IMediaStreamTrackRenderCallback
-  {
-    virtual ~IMediaStreamTrackRenderCallback() {}
-  };
-
   //---------------------------------------------------------------------------
   //---------------------------------------------------------------------------
   //---------------------------------------------------------------------------
@@ -62,14 +52,30 @@ namespace ortc
   interaction IMediaStreamTrackTypes : public ICapabilities,
                                        public IConstraints
   {
+    typedef PUID MediaChannelID;
+    typedef std::list<MediaChannelID> MediaChannelIDList;
+    typedef std::set<MediaChannelID> MediaChannelIDSet;
+    
     ZS_DECLARE_STRUCT_PTR(Capabilities);
     ZS_DECLARE_STRUCT_PTR(Settings);
+    ZS_DECLARE_TYPEDEF_PTR(Settings, ImmutableSettings);
     ZS_DECLARE_STRUCT_PTR(ConstraintSet);
     ZS_DECLARE_STRUCT_PTR(TrackConstraints);
     ZS_DECLARE_STRUCT_PTR(Constraints);
     ZS_DECLARE_STRUCT_PTR(OverconstrainedError);
 
+    ZS_DECLARE_STRUCT_PTR(MediaChannelTrace);
+    ZS_DECLARE_TYPEDEF_PTR(MediaChannelTrace, ImmutableMediaChannelTrace);
+    ZS_DECLARE_STRUCT_PTR(Frame);
+    ZS_DECLARE_STRUCT_PTR(AudioFrame);
+    ZS_DECLARE_STRUCT_PTR(VideoFrame);
+
+    ZS_DECLARE_PTR(MediaChannelIDList);
+    ZS_DECLARE_PTR(MediaChannelIDSet);
+
     ZS_DECLARE_TYPEDEF_PTR(std::list<ConstraintSetPtr>, ConstraintSetList);
+    ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+    ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::ImmutableParameters, ImmutableParameters);
 
     enum Kinds
     {
@@ -102,6 +108,27 @@ namespace ortc
     static const char *toString(States state);
     static States toState(const char *state);
 
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackTypes::MediaActivityStates
+    #pragma mark
+    
+    enum MediaActivityStates
+    {
+      MediaActivityState_First,
+
+      MediaActivityState_Muted = MediaActivityState_First,
+      MediaActivityState_Inactive,          // media source is not active
+      MediaActivityState_ActiveButUnknown,  // media source is active but the active speaker state is unknown
+      MediaActivityState_Background,        // the media is identified as being background (e.g. background noise, and no active speaker)
+      MediaActivityState_Active,            // the media is identified as containing activity (e.g. active speaker / active face detected)
+
+      MediaActivityState_Last = MediaActivityState_Active,
+    };
+
+    static const char *toString(MediaActivityStates state);
+    static MediaActivityStates toMediaActivityState(const char *state);
+
     //-------------------------------------------------------------------------
     #pragma mark
     #pragma mark IMediaStreamTrackTypes::Capabilities
@@ -124,6 +151,8 @@ namespace ortc
       String                      mDeviceID;
       String                      mGroupID;
 
+      Optional<CapabilityString>  mEncodingFormat;
+
       Capabilities() {}
       Capabilities(const Capabilities &op2) {(*this) = op2;}
       Capabilities(ElementPtr elem);
@@ -158,6 +187,7 @@ namespace ortc
       Optional<LONG>     mChannelCount;
       Optional<String>   mDeviceID;
       Optional<String>   mGroupID;
+      Optional<String>   mEncodingFormat;
 
       Settings() {}
       Settings(const Settings &op2) {(*this) = op2;}
@@ -193,6 +223,7 @@ namespace ortc
       ConstrainLong     mChannelCount;
       ConstrainString   mDeviceID;
       ConstrainString   mGroupID;
+      ConstrainString   mEncodingFormat;
 
       ConstraintSet() {}
       ConstraintSet(const ConstraintSet &op2) {(*this) = op2;}
@@ -250,6 +281,11 @@ namespace ortc
       String hash() const;
     };
 
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackTypes::OverconstrainedError
+    #pragma mark
+
     struct OverconstrainedError : public Any {
       String mName;
       String mConstraint;
@@ -259,6 +295,105 @@ namespace ortc
       OverconstrainedError(const OverconstrainedError &op2) { *this = (op2); }
     };
 
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackTypes::MediaChannelTrace
+    #pragma mark
+
+    struct MediaChannelTrace
+    {
+      MediaChannelTrace(MediaChannelID mediaChannelID)                          { mMediaChannelIDTracked.push_back(mediaChannelID); mMediaChannelIDs.insert(mediaChannelID); }
+      MediaChannelTrace(
+                        const ImmutableMediaChannelTrace &op2,
+                        MediaChannelID mediaChannelID = 0
+                        ) :                                             
+                                                                                 mMediaChannelIDTracked(op2.mMediaChannelIDTracked),
+                                                                                 mMediaChannelIDs(op2.mMediaChannelIDs),
+                                                                                 mKind(op2.mKind),
+                                                                                 mSettings(op2.mSettings),
+                                                                                 mParameters(op2.mParameters)
+                                                                                 { if (0 == mediaChannelID) return; mMediaChannelIDTracked.push_back(mediaChannelID); mMediaChannelIDs.insert(mediaChannelID); }
+
+      static MediaChannelTracePtr create(MediaChannelID mediaChannelID)          { return make_shared<MediaChannelTrace>(mediaChannelID); }
+      static MediaChannelTracePtr create(
+                                         const MediaChannelTrace &op2,
+                                         MediaChannelID mediaChannelID = 0
+                                         )                                       { return make_shared<MediaChannelTrace>(op2, mediaChannelID); }
+
+      bool hasChannel(MediaChannelID mediaChannelID) const                       { auto found = mMediaChannelIDs.find(mediaChannelID); return found != mMediaChannelIDs.end(); }
+
+      PUID id() const                                                            { return mID; }
+      Kinds kind() const                                                         { return mKind; }
+      ImmutableSettingsPtr settings() const                                      { return mSettings; }
+      ImmutableParametersPtr parameters() const                                  { return mParameters; }
+      MediaChannelID frontMediaChannelID() const                                 { return mMediaChannelIDTracked.front(); }
+      MediaChannelID endMediaChannelID() const                                   { return mMediaChannelIDTracked.back(); }
+      MediaChannelIDList::const_iterator begin() const                           { return mMediaChannelIDTracked.begin(); }
+      MediaChannelIDList::const_iterator end() const                             { return mMediaChannelIDTracked.end(); }
+
+    public:
+      zsLib::AutoPUID mID;
+      MediaChannelIDList mMediaChannelIDTracked;
+      MediaChannelIDSet mMediaChannelIDs;
+      Kinds mKind {Kind_First};
+      ImmutableSettingsPtr mSettings;
+      ImmutableParametersPtr mParameters;
+    };
+
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackTypes::Frame
+    #pragma mark
+
+    struct Frame : public Any
+    {
+      virtual Kinds getKind() const = 0;
+
+      virtual MediaActivityStates getMediaActivityState() const = 0;
+      virtual uint64_t getTimestamp() const = 0;    // get the timestamp relative to the clock/sample rate
+      virtual Milliseconds getNTPTime() const = 0;  // get the NTP time
+      virtual Time getTime() const = 0;             // get the absolute time
+
+      virtual const BYTE *getData() const = 0;      // get the pointer to the raw buffer
+      virtual size_t getDataSize() const = 0;       // get the number of bytes contained within the raw buffer
+    };
+
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackTypes::AudioFrame
+    #pragma mark
+
+    struct AudioFrame : public Frame
+    {
+      virtual Kinds getKind() const override { return Kind_Audio; }
+    };
+
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackTypes::VideoFrame
+    #pragma mark
+
+    struct VideoFrame : public Frame
+    {
+      enum DataFormats
+      {
+        DataFormat_NativeTexture,
+        DataFormat_Packed,
+
+        DataFormat_Y,
+        DataFormat_U,
+        DataFormat_V,
+      };
+
+      virtual Kinds getKind() const override { return Kind_Video; }
+
+      // returns true of available otherwise false
+      virtual bool getEncodedData(
+                                  DataFormats encodedDataFormat,
+                                  const void * &outData,     // set to NULL if not available
+                                  size_t &outDataSizeIfKnown // set to 0 if not available
+                                  ) = 0;      // get the pointer to the raw buffer
+    };
   };
 
   //---------------------------------------------------------------------------
@@ -273,11 +408,14 @@ namespace ortc
                                   public IMediaStreamTrackTypes,
                                   public IStatsProvider
   {
-    static ElementPtr toDebug(IMediaStreamTrackPtr object);
-
     static IMediaStreamTrackPtr convert(AnyPtr any);
 
-    virtual PUID getID() const = 0;
+    virtual MediaChannelID getID() const = 0;
+
+    virtual void trace(
+                       const char *func = NULL,
+                       const char *message = NULL
+                       ) const = 0;
 
     virtual IMediaStreamTrackSubscriptionPtr subscribe(IMediaStreamTrackDelegatePtr delegate) = 0;
 
@@ -302,9 +440,11 @@ namespace ortc
 
     virtual PromisePtr applyConstraints(const TrackConstraints &constraints) = 0;
 
-    virtual void setVideoRenderCallback(IMediaStreamTrackRenderCallbackPtr callback) = 0;
-    virtual void setH264Rendering(bool h264Rendering) = 0;
-    virtual bool isH264Rendering() = 0;
+    virtual IMediaStreamTrackMediaSubscriptionPtr subscribeMedia(IMediaStreamTrackSyncMediaDelegatePtr delegate) = 0;
+
+    // WARNING: extreme caution must be done not to cause a deadlock or delaying media by blocking. Gather information
+    // needed within a lock but do any operations outside a lock as fast as possible.
+    virtual IMediaStreamTrackMediaSubscriptionPtr subscribeMedia(IMediaStreamTrackAsyncMediaDelegatePtr delegate) = 0;
   };
 
   //-------------------------------------------------------------------------
@@ -347,6 +487,71 @@ namespace ortc
 
     virtual void background() = 0;
   };
+
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaStreamTrackSyncMediaDelegate
+  #pragma mark
+
+  interaction IMediaStreamTrackSyncMediaDelegate : public IMediaStreamTrackDelegate
+  {
+    ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+    ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+    ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+    virtual void notifyMediaStreamTrackMediaAudioFrame(
+                                                       ImmutableMediaChannelTracePtr trace,
+                                                       AudioFramePtr frame
+                                                       ) = 0;
+    virtual void notifyMediaStreamTrackMediaVideoFrame(
+                                                       ImmutableMediaChannelTracePtr trace,
+                                                       VideoFramePtr frame
+                                                       ) = 0;
+  };
+
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaStreamTrackAsyncMediaDelegate
+  #pragma mark
+
+  interaction IMediaStreamTrackAsyncMediaDelegate : public IMediaStreamTrackDelegate
+  {
+    ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+    ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+    ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+    virtual void onMediaStreamTrackMediaAudioFrame(
+                                                   ImmutableMediaChannelTracePtr trace,
+                                                   AudioFramePtr frame
+                                                   ) = 0;
+    virtual void onMediaStreamTrackMediaVideoFrame(
+                                                   ImmutableMediaChannelTracePtr trace,
+                                                   VideoFramePtr frame
+                                                   ) = 0;
+  };
+
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaStreamTrackMediaSubscription
+  #pragma mark
+  
+  interaction IMediaStreamTrackMediaSubscription
+  {
+    virtual PUID getID() const = 0;
+    
+    virtual void cancel() = 0;
+
+    virtual void background() = 0;
+  };
 }
 
 ZS_DECLARE_PROXY_BEGIN(ortc::IMediaStreamTrackDelegate)
@@ -364,3 +569,56 @@ ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrac
 ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_1(onMediaStreamTrackEnded, IMediaStreamTrackPtr)
 ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackOverConstrained, IMediaStreamTrackPtr, OverconstrainedErrorPtr)
 ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
+
+ZS_DECLARE_PROXY_BEGIN(ortc::IMediaStreamTrackAsyncMediaDelegate)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackPtr, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::OverconstrainedErrorPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::AudioFramePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::VideoFramePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrackPtr, bool)
+ZS_DECLARE_PROXY_METHOD_1(onMediaStreamTrackEnded, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackOverConstrained, IMediaStreamTrackPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackMediaAudioFrame, ImmutableMediaChannelTracePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackMediaVideoFrame, ImmutableMediaChannelTracePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_END()
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_BEGIN(ortc::IMediaStreamTrackAsyncMediaDelegate, ortc::IMediaStreamTrackMediaSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackPtr, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::OverconstrainedErrorPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::AudioFramePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::VideoFramePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrackPtr, bool)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_1(onMediaStreamTrackEnded, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackOverConstrained, IMediaStreamTrackPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackMediaAudioFrame, ImmutableMediaChannelTracePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackMediaVideoFrame, ImmutableMediaChannelTracePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
+
+ZS_DECLARE_PROXY_BEGIN(ortc::IMediaStreamTrackSyncMediaDelegate)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackPtr, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::OverconstrainedErrorPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::AudioFramePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::VideoFramePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrackPtr, bool)
+ZS_DECLARE_PROXY_METHOD_1(onMediaStreamTrackEnded, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackOverConstrained, IMediaStreamTrackPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_METHOD_SYNC_2(notifyMediaStreamTrackMediaAudioFrame, ImmutableMediaChannelTracePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_METHOD_SYNC_2(notifyMediaStreamTrackMediaVideoFrame, ImmutableMediaChannelTracePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_END()
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_BEGIN(ortc::IMediaStreamTrackSyncMediaDelegate, ortc::IMediaStreamTrackMediaSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackPtr, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::OverconstrainedErrorPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::AudioFramePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::VideoFramePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrackPtr, bool)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_1(onMediaStreamTrackEnded, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackOverConstrained, IMediaStreamTrackPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_SYNC_2(notifyMediaStreamTrackMediaAudioFrame, ImmutableMediaChannelTracePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_SYNC_2(notifyMediaStreamTrackMediaVideoFrame, ImmutableMediaChannelTracePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
+
diff --git a/ortc/IMediaStreamTrackSelector.h b/ortc/IMediaStreamTrackSelector.h
new file mode 100644
index 00000000..5b8c7a71
--- /dev/null
+++ b/ortc/IMediaStreamTrackSelector.h
@@ -0,0 +1,138 @@
+/*
+ 
+ Copyright (c) 2014, Hookflash Inc. / Hookflash Inc.
+ All rights reserved.
+ 
+ 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.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ 
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/types.h>
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace ortc
+{
+
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaStreamTrackSelectorTypes
+  #pragma mark
+  
+  interaction IMediaStreamTrackSelectorTypes
+  {
+    typedef IMediaStreamTrackTypes::MediaChannelID MediaChannelID;
+    typedef IMediaStreamTrackTypes::Kinds Kinds;
+    ZS_DECLARE_TYPEDEF_PTR(std::list<IMediaStreamTrackPtr>, MediaStreamTrackList);
+  };
+
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaStreamTrackSelector
+  #pragma mark
+  
+  interaction IMediaStreamTrackSelector : public Any,
+                                          public IMediaStreamTrackSelectorTypes,
+                                          public IStatsProvider
+  {
+    static IMediaStreamTrackSelectorPtr convert(AnyPtr any);
+
+    static IMediaStreamTrackSelectorPtr create(
+                                               Kinds kind,
+                                               size_t totalOutputMediaStreamTracks = 1,
+                                               IMediaStreamTrackSelectorDelegatePtr delegate = IMediaStreamTrackSelectorDelegatePtr()
+                                               );
+
+    virtual PUID getID() const = 0;
+
+    virtual IMediaStreamTrackSelectorSubscriptionPtr subscribe(IMediaStreamTrackSelectorDelegatePtr delegate) = 0;
+
+    virtual Kinds kind() const = 0;
+    virtual IMediaStreamTrackPtr getOutputTrack(size_t index) const = 0;
+    virtual MediaStreamTrackList getInputTracks() const = 0;
+
+    virtual PromisePtr attachInputTrack(
+                                        IMediaStreamTrackPtr inputTrack,
+                                        IMediaStreamTrackPtr useThisTrackToDetermineMediaActivityState  // use this track to detect media activity
+                                        ) throw (InvalidParameters);
+    virtual void detachInputTrack(IMediaStreamTrackPtr track);
+
+    virtual void stop() = 0;
+  };
+
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaStreamTrackSelectorDelegate
+  #pragma mark
+
+  interaction IMediaStreamTrackSelectorDelegate
+  {
+    virtual ~IMediaStreamTrackSelectorDelegate() {}
+  };
+  
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark IMediaStreamTrackSelectorSubscription
+  #pragma mark
+  
+  interaction IMediaStreamTrackSelectorSubscription
+  {
+    virtual PUID getID() const = 0;
+    
+    virtual void cancel() = 0;
+
+    virtual void background() = 0;
+  };
+}
+
+ZS_DECLARE_PROXY_BEGIN(ortc::IMediaStreamTrackSelectorDelegate)
+//ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackPtr, IMediaStreamTrackPtr)
+//ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::OverconstrainedErrorPtr, OverconstrainedErrorPtr)
+//ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrackPtr, bool)
+//ZS_DECLARE_PROXY_METHOD_1(onMediaStreamTrackEnded, IMediaStreamTrackPtr)
+//ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackOverConstrained, IMediaStreamTrackPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_END()
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_BEGIN(ortc::IMediaStreamTrackSelectorDelegate, ortc::IMediaStreamTrackSelectorSubscription)
+//ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackPtr, IMediaStreamTrackPtr)
+//ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::OverconstrainedErrorPtr, OverconstrainedErrorPtr)
+//ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrackPtr, bool)
+//ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_1(onMediaStreamTrackEnded, IMediaStreamTrackPtr)
+//ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackOverConstrained, IMediaStreamTrackPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
diff --git a/ortc/IORTC.h b/ortc/IORTC.h
index 18cd8556..48ce78aa 100644
--- a/ortc/IORTC.h
+++ b/ortc/IORTC.h
@@ -48,9 +48,9 @@ namespace ortc
     typedef zsLib::Log Log;
 
     static void setup(IMessageQueuePtr defaultDelegateMessageQueue);
-#ifdef WINRT
+#ifdef WINUWP
     static void setup(Windows::UI::Core::CoreDispatcher ^dispatcher);
-#endif //WINRT
+#endif //WINUWP
     
     static Milliseconds ntpServerTime();
     static void ntpServerTime(const Milliseconds &value);
diff --git a/ortc/IRTPTypes.h b/ortc/IRTPTypes.h
index 29779aae..63ea1ed6 100644
--- a/ortc/IRTPTypes.h
+++ b/ortc/IRTPTypes.h
@@ -48,45 +48,46 @@ namespace ortc
   
   interaction IRTPTypes
   {
-    ZS_DECLARE_STRUCT_PTR(Capabilities)
-    ZS_DECLARE_STRUCT_PTR(CodecCapability)
-    ZS_DECLARE_STRUCT_PTR(OpusCodecCapabilityOptions)
-    ZS_DECLARE_STRUCT_PTR(OpusCodecCapabilityParameters)
-    ZS_DECLARE_STRUCT_PTR(VP8CodecCapabilityParameters)
-    ZS_DECLARE_STRUCT_PTR(H264CodecCapabilityParameters)
-    ZS_DECLARE_STRUCT_PTR(RTXCodecCapabilityParameters)
-    ZS_DECLARE_STRUCT_PTR(FlexFECCodecCapabilityParameters)
-    ZS_DECLARE_STRUCT_PTR(HeaderExtension)
-    ZS_DECLARE_STRUCT_PTR(RTCPFeedback)
-    ZS_DECLARE_STRUCT_PTR(Parameters)
-    ZS_DECLARE_STRUCT_PTR(CodecParameters)
-    ZS_DECLARE_STRUCT_PTR(OpusCodecParameters)
-    ZS_DECLARE_TYPEDEF_PTR(VP8CodecCapabilityParameters, VP8CodecParameters)
-    ZS_DECLARE_TYPEDEF_PTR(H264CodecCapabilityParameters, H264CodecParameters)
-    ZS_DECLARE_TYPEDEF_PTR(RTXCodecCapabilityParameters, RTXCodecParameters)
-    ZS_DECLARE_TYPEDEF_PTR(FlexFECCodecCapabilityParameters, FlexFECCodecParameters)
-    ZS_DECLARE_STRUCT_PTR(REDCodecParameters)
-    ZS_DECLARE_STRUCT_PTR(HeaderExtensionParameters)
-    ZS_DECLARE_STRUCT_PTR(EncodingParameters)
-    ZS_DECLARE_STRUCT_PTR(RTCPParameters)
-    ZS_DECLARE_STRUCT_PTR(FECParameters)
-    ZS_DECLARE_STRUCT_PTR(RTXParameters)
-
-    ZS_DECLARE_TYPEDEF_PTR(std::list<CodecCapability>, CodecCapabilitiesList)
-    ZS_DECLARE_TYPEDEF_PTR(std::list<HeaderExtension>, HeaderExtensionsList)
-    ZS_DECLARE_TYPEDEF_PTR(std::list<RTCPFeedback>, RTCPFeedbackList)
-    ZS_DECLARE_TYPEDEF_PTR(std::list<CodecParameters>, CodecParametersList)
-    ZS_DECLARE_TYPEDEF_PTR(std::list<HeaderExtensionParameters>, HeaderExtensionParametersList)
-    ZS_DECLARE_TYPEDEF_PTR(std::list<EncodingParameters>, EncodingParametersList)
+    ZS_DECLARE_STRUCT_PTR(Capabilities);
+    ZS_DECLARE_STRUCT_PTR(CodecCapability);
+    ZS_DECLARE_STRUCT_PTR(OpusCodecCapabilityOptions);
+    ZS_DECLARE_STRUCT_PTR(OpusCodecCapabilityParameters);
+    ZS_DECLARE_STRUCT_PTR(VP8CodecCapabilityParameters);
+    ZS_DECLARE_STRUCT_PTR(H264CodecCapabilityParameters);
+    ZS_DECLARE_STRUCT_PTR(RTXCodecCapabilityParameters);
+    ZS_DECLARE_STRUCT_PTR(FlexFECCodecCapabilityParameters);
+    ZS_DECLARE_STRUCT_PTR(HeaderExtension);
+    ZS_DECLARE_STRUCT_PTR(RTCPFeedback);
+    ZS_DECLARE_STRUCT_PTR(Parameters);
+    ZS_DECLARE_TYPEDEF_PTR(Parameters, ImmutableParameters);
+    ZS_DECLARE_STRUCT_PTR(CodecParameters);
+    ZS_DECLARE_STRUCT_PTR(OpusCodecParameters);
+    ZS_DECLARE_TYPEDEF_PTR(VP8CodecCapabilityParameters, VP8CodecParameters);
+    ZS_DECLARE_TYPEDEF_PTR(H264CodecCapabilityParameters, H264CodecParameters);
+    ZS_DECLARE_TYPEDEF_PTR(RTXCodecCapabilityParameters, RTXCodecParameters);
+    ZS_DECLARE_TYPEDEF_PTR(FlexFECCodecCapabilityParameters, FlexFECCodecParameters);
+    ZS_DECLARE_STRUCT_PTR(REDCodecParameters);
+    ZS_DECLARE_STRUCT_PTR(HeaderExtensionParameters);
+    ZS_DECLARE_STRUCT_PTR(EncodingParameters);
+    ZS_DECLARE_STRUCT_PTR(RTCPParameters);
+    ZS_DECLARE_STRUCT_PTR(FECParameters);
+    ZS_DECLARE_STRUCT_PTR(RTXParameters);
+
+    ZS_DECLARE_TYPEDEF_PTR(std::list<CodecCapability>, CodecCapabilitiesList);
+    ZS_DECLARE_TYPEDEF_PTR(std::list<HeaderExtension>, HeaderExtensionsList);
+    ZS_DECLARE_TYPEDEF_PTR(std::list<RTCPFeedback>, RTCPFeedbackList);
+    ZS_DECLARE_TYPEDEF_PTR(std::list<CodecParameters>, CodecParametersList);
+    ZS_DECLARE_TYPEDEF_PTR(std::list<HeaderExtensionParameters>, HeaderExtensionParametersList);
+    ZS_DECLARE_TYPEDEF_PTR(std::list<EncodingParameters>, EncodingParametersList);
 
     typedef String FECMechanism;
-    ZS_DECLARE_TYPEDEF_PTR(std::list<FECMechanism>, FECMechanismList)
+    ZS_DECLARE_TYPEDEF_PTR(std::list<FECMechanism>, FECMechanismList);
 
     typedef BYTE PayloadType;
     typedef DWORD SSRCType;
-    ZS_DECLARE_TYPEDEF_PTR(std::list<PayloadType>, PayloadTypeList)
+    ZS_DECLARE_TYPEDEF_PTR(std::list<PayloadType>, PayloadTypeList);
     typedef String EncodingID;
-    ZS_DECLARE_TYPEDEF_PTR(std::list<EncodingID>, EncodingIDList)
+    ZS_DECLARE_TYPEDEF_PTR(std::list<EncodingID>, EncodingIDList);
 
     //-------------------------------------------------------------------------
     #pragma mark
@@ -150,13 +151,15 @@ namespace ortc
       CodecCapability() {};
       CodecCapability(const CodecCapability &source);
       CodecCapability(ElementPtr elem);
-
-      CodecCapability &operator=(const CodecCapability &op2) = delete;
+      CodecCapability &operator=(const CodecCapability &op2);
 
       ElementPtr createElement(const char *objectName = "codecCapability") const;
 
       ElementPtr toDebug() const;
       String hash() const;
+
+    protected:
+      void copyAny(const CodecCapability &source);
     };
 
     //-------------------------------------------------------------------------
@@ -483,12 +486,15 @@ namespace ortc
       CodecParameters(const CodecParameters &source);
       CodecParameters(ElementPtr elem);
 
-      CodecParameters &operator=(const CodecParameters &op2) = delete;
-
+      CodecParameters &operator=(const CodecParameters &op2);
+      
       ElementPtr createElement(const char *objectName) const;
 
       ElementPtr toDebug() const;
       String hash() const;
+
+    protected:
+      void copyAny(const CodecParameters &op2);
     };
 
     //-------------------------------------------------------------------------
@@ -640,9 +646,7 @@ namespace ortc
     enum PriorityTypes {
       PriorityType_First,
 
-      PriorityType_Unknown =        PriorityType_First,
-
-      PriorityType_VeryLow,
+      PriorityType_VeryLow =        PriorityType_First,
       PriorityType_Low,
       PriorityType_Medium,
       PriorityType_High,
@@ -663,7 +667,7 @@ namespace ortc
       Optional<PayloadType>   mCodecPayloadType;
       Optional<FECParameters> mFEC;
       Optional<RTXParameters> mRTX;
-      PriorityTypes           mPriority {PriorityType_Unknown};
+      Optional<PriorityTypes> mPriority;
       Optional<ULONGLONG>     mMaxBitrate {};
       Optional<double>        mMinQuality {0};
       Optional<double>        mResolutionScale {};
diff --git a/ortc/ISRTPSDESTransport.h b/ortc/ISRTPSDESTransport.h
index 58dcc72a..0bc494ed 100644
--- a/ortc/ISRTPSDESTransport.h
+++ b/ortc/ISRTPSDESTransport.h
@@ -179,7 +179,7 @@ namespace ortc
 
     virtual void onSRTPSDESTransportError(
                                           ISRTPSDESTransportPtr transport,
-                                          ErrorAnyPtr errorCode
+                                          ErrorAnyPtr error
                                           ) = 0;
   };
 
diff --git a/ortc/IStatsReport.h b/ortc/IStatsReport.h
index bb1401c0..808039d1 100644
--- a/ortc/IStatsReport.h
+++ b/ortc/IStatsReport.h
@@ -153,6 +153,7 @@ namespace ortc
 
       String statsType() const { if (mStatsType.hasValue()) return IStatsReportTypes::toString(mStatsType); return mStatsTypeOther; }
 
+      static StatsPtr create(const Stats &source);
       static StatsPtr create(ElementPtr rootEl);
 
       static StatsPtr convert(AnyPtr any);
@@ -197,6 +198,7 @@ namespace ortc
       RTPStreamStats(ElementPtr rootEl);
 
       static RTPStreamStatsPtr create(ElementPtr rootEl);
+      static RTPStreamStatsPtr create(const RTPStreamStats &op2) { return std::dynamic_pointer_cast<RTPStreamStats>(Stats::create(op2)); }
 
       static RTPStreamStatsPtr convert(AnyPtr any);
 
@@ -232,6 +234,7 @@ namespace ortc
       Codec(ElementPtr rootEl);
 
       static CodecPtr create(ElementPtr rootEl);
+      static CodecPtr create(const Codec &op2) { return std::make_shared<Codec>(op2); }
 
       static CodecPtr convert(AnyPtr any);
 
@@ -268,6 +271,7 @@ namespace ortc
       InboundRTPStreamStats(ElementPtr rootEl);
 
       static InboundRTPStreamStatsPtr create(ElementPtr rootEl);
+      static InboundRTPStreamStatsPtr create(const InboundRTPStreamStats &op2) { return std::make_shared<InboundRTPStreamStats>(op2); }
 
       static InboundRTPStreamStatsPtr convert(AnyPtr any);
 
@@ -302,6 +306,7 @@ namespace ortc
       OutboundRTPStreamStats(ElementPtr rootEl);
 
       static OutboundRTPStreamStatsPtr create(ElementPtr rootEl);
+      static OutboundRTPStreamStatsPtr create(const OutboundRTPStreamStats &op2) { return std::make_shared<OutboundRTPStreamStats>(op2); }
 
       static OutboundRTPStreamStatsPtr convert(AnyPtr any);
 
@@ -334,6 +339,7 @@ namespace ortc
       SCTPTransportStats(ElementPtr rootEl);
 
       static SCTPTransportStatsPtr create(ElementPtr rootEl);
+      static SCTPTransportStatsPtr create(const SCTPTransportStats &op2) { return std::make_shared<SCTPTransportStats>(op2); }
 
       static SCTPTransportStatsPtr convert(AnyPtr any);
 
@@ -366,6 +372,7 @@ namespace ortc
       MediaStreamStats(ElementPtr rootEl);
 
       static MediaStreamStatsPtr create(ElementPtr rootEl);
+      static MediaStreamStatsPtr create(const MediaStreamStats &op2) { return std::make_shared<MediaStreamStats>(op2); }
 
       static MediaStreamStatsPtr convert(AnyPtr any);
 
@@ -410,6 +417,7 @@ namespace ortc
       MediaStreamTrackStats(ElementPtr rootEl);
 
       static MediaStreamTrackStatsPtr create(ElementPtr rootEl);
+      static MediaStreamTrackStatsPtr create(const MediaStreamTrackStats &op2) { return std::make_shared<MediaStreamTrackStats>(op2); }
 
       static MediaStreamTrackStatsPtr convert(AnyPtr any);
 
@@ -448,6 +456,7 @@ namespace ortc
       DataChannelStats(ElementPtr rootEl);
 
       static DataChannelStatsPtr create(ElementPtr rootEl);
+      static DataChannelStatsPtr create(const DataChannelStats &op2) { return std::make_shared<DataChannelStats>(op2); }
 
       static DataChannelStatsPtr convert(AnyPtr any);
 
@@ -481,6 +490,7 @@ namespace ortc
       ICEGathererStats(ElementPtr rootEl);
 
       static ICEGathererStatsPtr create(ElementPtr rootEl);
+      static ICEGathererStatsPtr create(const ICEGathererStats &op2) { return std::make_shared<ICEGathererStats>(op2); }
 
       static ICEGathererStatsPtr convert(AnyPtr any);
 
@@ -517,6 +527,7 @@ namespace ortc
       ICETransportStats(ElementPtr rootEl);
 
       static ICETransportStatsPtr create(ElementPtr rootEl);
+      static ICETransportStatsPtr create(const ICETransportStats &op2) { return std::make_shared<ICETransportStats>(op2); }
 
       static ICETransportStatsPtr convert(AnyPtr any);
 
@@ -549,6 +560,7 @@ namespace ortc
       DTLSTransportStats(ElementPtr rootEl);
 
       static DTLSTransportStatsPtr create(ElementPtr rootEl);
+      static DTLSTransportStatsPtr create(const DTLSTransportStats &op2) { return std::make_shared<DTLSTransportStats>(op2); }
 
       static DTLSTransportStatsPtr convert(AnyPtr any);
 
@@ -578,6 +590,7 @@ namespace ortc
       SRTPTransportStats(ElementPtr rootEl);
 
       static SRTPTransportStatsPtr create(ElementPtr rootEl);
+      static SRTPTransportStatsPtr create(const SRTPTransportStats &op2) { return std::make_shared<SRTPTransportStats>(op2); }
 
       static SRTPTransportStatsPtr convert(AnyPtr any);
 
@@ -615,6 +628,7 @@ namespace ortc
       ICECandidateAttributes(ElementPtr rootEl);
 
       static ICECandidateAttributesPtr create(ElementPtr rootEl);
+      static ICECandidateAttributesPtr create(const ICECandidateAttributes &op2) { return std::make_shared<ICECandidateAttributes>(op2); }
 
       static ICECandidateAttributesPtr convert(AnyPtr any);
 
@@ -658,6 +672,7 @@ namespace ortc
       ICECandidatePairStats(ElementPtr rootEl);
 
       static ICECandidatePairStatsPtr create(ElementPtr rootEl);
+      static ICECandidatePairStatsPtr create(const ICECandidatePairStats &op2) { return std::make_shared<ICECandidatePairStats>(op2); }
 
       static ICECandidatePairStatsPtr convert(AnyPtr any);
 
@@ -692,6 +707,7 @@ namespace ortc
       CertificateStats(ElementPtr rootEl);
 
       static CertificateStatsPtr create(ElementPtr rootEl);
+      static CertificateStatsPtr create(const CertificateStats &op2) { return std::make_shared<CertificateStats>(op2); }
 
       static CertificateStatsPtr convert(AnyPtr any);
 
diff --git a/ortc/RTCPPacket.h b/ortc/RTCPPacket.h
new file mode 100644
index 00000000..f9d2d476
--- /dev/null
+++ b/ortc/RTCPPacket.h
@@ -0,0 +1,1611 @@
+/*
+
+ Copyright (c) 2014, Hookflash Inc. / Hookflash Inc.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/types.h>
+#include <ortc/IMediaStreamTrack.h>
+#include <ortc/IICETypes.h>
+
+namespace ortc
+{
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket
+  #pragma mark
+
+  class RTCPPacket
+  {
+  protected:
+    struct make_private {};
+
+  public:
+    typedef IMediaStreamTrackTypes::MediaChannelID MediaChannelID;
+
+  public:
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::Report
+    #pragma mark
+
+    struct Report
+    {
+      Report *next() const            {return mNext;}
+
+      const BYTE *ptr() const         {return mPtr;}
+      size_t size() const             {return mSize;}
+
+      BYTE version() const            {return mVersion;}
+      size_t padding() const          {return static_cast<size_t>(mPadding);}
+      BYTE reportSpecific() const     {return mReportSpecific;}
+
+      BYTE pt() const                 {return mPT;}
+      static const char *ptToString(BYTE pt);
+      const char *ptToString() const  {return ptToString(mPT);}
+
+    public:
+      Report *mNext {};
+
+      const BYTE *mPtr {};
+      size_t mSize {};
+
+      BYTE mVersion {};
+      BYTE mPadding {};
+      BYTE mReportSpecific {};
+
+      BYTE mPT {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::SenderReceiverCommonReport
+    #pragma mark
+
+    struct SenderReceiverCommonReport : public Report
+    {
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::SenderReceiverCommonReport::ReportBlock
+      #pragma mark
+
+      struct ReportBlock
+      {
+        ReportBlock *next() const                           {return mNext;}
+
+        DWORD ssrc() const                                  {return mSSRC;}
+        BYTE fractionLost() const                           {return mFractionLost;}
+        DWORD cumulativeNumberOfPacketsLost() const         {return mCumulativeNumberOfPacketsLost;}
+        DWORD extendedHighestSequenceNumberReceived() const {return mExtendedHighestSequenceNumberReceived;}
+        DWORD interarrivalJitter() const                    {return mInterarrivalJitter;}
+        DWORD lsr() const                                   {return mLSR;}
+        DWORD dlsr() const                                  {return mDLSR;}
+
+      public:
+        ReportBlock *mNext {};
+
+        DWORD mSSRC {};
+        BYTE mFractionLost {};
+        DWORD mCumulativeNumberOfPacketsLost {};
+        DWORD mExtendedHighestSequenceNumberReceived {};
+        DWORD mInterarrivalJitter {};
+        DWORD mLSR {};  // last SR timestamp
+        DWORD mDLSR {}; // delay since last SR
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::SenderReceiverCommonReport (public)
+      #pragma mark
+
+      size_t rc() const                       {return static_cast<size_t>(mReportSpecific);}
+      DWORD ssrcOfSender() const              {return mSSRCOfSender;}
+
+      ReportBlock *firstReportBlock() const   {return mFirstReportBlock;}
+
+      const BYTE *extension() const           {return mExtension;}
+      size_t extensionSize() const            {return mExtensionSize;}
+
+    public:
+      DWORD mSSRCOfSender {};
+
+      const BYTE *mExtension {};
+      size_t mExtensionSize {};
+
+      ReportBlock *mFirstReportBlock {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::SenderReport
+    #pragma mark
+
+    struct SenderReport : public SenderReceiverCommonReport
+    {
+      // https://tools.ietf.org/html/rfc3550#section-6.4.1
+
+      static const BYTE kPayloadType {200};
+
+      SenderReport *nextSenderReport() const  {return mNextSenderReport;}
+
+      DWORD ntpTimestampMS() const            {return mNTPTimestampMS;}
+      DWORD ntpTimestampLS() const            {return mNTPTimestampLS;}
+      Time ntpTimestamp() const;
+      DWORD rtpTimestamp() const              {return mRTPTimestamp;}
+      DWORD senderPacketCount() const         {return mSenderPacketCount;}
+      DWORD senderOctetCount() const          {return mSenderOctetCount;}
+
+    public:
+      SenderReport *mNextSenderReport {};
+
+      DWORD mNTPTimestampMS {};
+      DWORD mNTPTimestampLS {};
+      DWORD mRTPTimestamp {};
+      DWORD mSenderPacketCount {};
+      DWORD mSenderOctetCount {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::ReceiverReport
+    #pragma mark
+
+    struct ReceiverReport : public SenderReceiverCommonReport
+    {
+      // https://tools.ietf.org/html/rfc3550#section-6.4.2
+
+      static const BYTE kPayloadType {201};
+
+      ReceiverReport *nextReceiverReport() const  {return mNextReceiverReport;}
+
+      DWORD ssrcOfPacketSender() const            {return mSSRCOfSender;}
+
+    public:
+      ReceiverReport *mNextReceiverReport {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::SDES
+    #pragma mark
+
+    struct SDES : public Report
+    {
+      // https://tools.ietf.org/html/rfc3550#section-6.5
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::SDES::Chunk
+      #pragma mark
+
+      struct Chunk
+      {
+        static const BYTE kEndOfItemsType = 0;
+
+        struct StringItem
+        {
+          BYTE type() const                 {return mType;}
+          size_t length() const             {return mLength;}
+          const char *value() const         {return mValue;}
+
+          static const char *typeToString(BYTE type);
+          const char *typeToString() const  {return typeToString(mType);}
+
+        public:
+          StringItem *mNext {};
+
+          BYTE mType {};
+          size_t mLength {};
+          const char *mValue {};
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::CName
+        #pragma mark
+
+        struct CName : public StringItem
+        {
+          // https://tools.ietf.org/html/rfc3550#section-6.5.1
+
+          static const BYTE kItemType = 1;
+
+          CName *next() const                               {return static_cast<CName *>(mNext);}
+
+          const char *userAndDomainName() const             {return value();}
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::Name
+        #pragma mark
+
+        struct Name : public StringItem
+        {
+          // https://tools.ietf.org/html/rfc3550#section-6.5.2
+
+          static const BYTE kItemType = 2;
+
+          Name *next() const                                {return static_cast<Name *>(mNext);}
+
+          const char *commonName() const                    {return value();}
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::Email
+        #pragma mark
+
+        struct Email : public StringItem
+        {
+          // https://tools.ietf.org/html/rfc3550#section-6.5.3
+
+          static const BYTE kItemType = 3;
+
+          Email *next() const                               {return static_cast<Email *>(mNext);}
+
+          const char *emailAddress() const                  {return value();}
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::Phone
+        #pragma mark
+
+        struct Phone : public StringItem
+        {
+          // https://tools.ietf.org/html/rfc3550#section-6.5.4
+
+          static const BYTE kItemType = 4;
+
+          Phone *next() const                               {return static_cast<Phone *>(mNext);}
+
+          const char *phoneNumber() const                   {return value();}
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::Loc
+        #pragma mark
+
+        struct Loc : public StringItem
+        {
+          // https://tools.ietf.org/html/rfc3550#section-6.5.5
+
+          static const BYTE kItemType = 5;
+
+          Loc *next() const                                 {return static_cast<Loc *>(mNext);}
+
+          const char *geographicLocation() const            {return value();}
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::Tool
+        #pragma mark
+
+        struct Tool : public StringItem
+        {
+          // https://tools.ietf.org/html/rfc3550#section-6.5.6
+
+          static const BYTE kItemType = 6;
+
+          Tool *next() const                                {return static_cast<Tool *>(mNext);}
+
+          const char *nameVersion() const                   {return value();}
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::Note
+        #pragma mark
+
+        struct Note : public StringItem
+        {
+          // https://tools.ietf.org/html/rfc3550#section-6.5.7
+
+          static const BYTE kItemType = 7;
+
+          Note *next() const                                {return static_cast<Note *>(mNext);}
+
+          const char *note() const                          {return value();}
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::Priv
+        #pragma mark
+
+        struct Priv : public StringItem
+        {
+          // https://tools.ietf.org/html/rfc3550#section-6.5.8
+
+          static const BYTE kItemType = 8;
+
+          Priv *next() const                                {return static_cast<Priv *>(mNext);}
+
+          size_t prefixLength() const                       {return mPrefixLength;}
+          const char *prefix() const                        {return mPrefix;}
+
+        public:
+          size_t mPrefixLength {};
+          const char *mPrefix {};
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::Unknown
+        #pragma mark
+
+        struct Unknown : public StringItem
+        {
+          Unknown *next() const                             {return static_cast<Unknown *>(mNext);}
+
+          const BYTE *ptr() const                           {return reinterpret_cast<const BYTE *>(value());}
+          size_t size() const                               {return length();}
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::Mid
+        #pragma mark
+
+        struct Mid : public StringItem
+        {
+          // https://tools.ietf.org/html/draft-ietf-mmusic-sdp-bundle-negotiation-23#section-14.2
+          static const BYTE kItemType = 12;  // TBD
+
+          Mid *next() const                                {return static_cast<Mid *>(mNext);}
+
+          const char *mid() const                          {return value();}
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk::Rid
+        #pragma mark
+
+        struct Rid : public StringItem
+        {
+          // https://tools.ietf.org/html/draft-roach-avtext-rid-02#section-4.1
+          static const BYTE kItemType = 13;  // TBD
+
+          Rid *next() const                                {return static_cast<Rid *>(mNext);}
+
+          const char *rid() const                          {return value();}
+        };
+
+        //-------------------------------------------------------------------
+        #pragma mark
+        #pragma mark RTCPPacket::SDES::Chunk
+        #pragma mark
+
+        Chunk *next() const                                 {return mNext;}
+
+        DWORD ssrc() const                                  {return mSSRC;}
+
+        size_t count() const                                {return mCount;}
+
+        CName *firstCName() const                           {return mFirstCName;}
+        Name *firstName() const                             {return mFirstName;}
+        Email *firstEmail() const                           {return mFirstEmail;}
+        Phone *firstPhone() const                           {return mFirstPhone;}
+        Loc *firstLoc() const                               {return mFirstLoc;}
+        Tool *firstTool() const                             {return mFirstTool;}
+        Note *firstNote() const                             {return mFirstNote;}
+        Priv *firstPriv() const                             {return mFirstPriv;}
+        Mid *firstMid() const                               {return mFirstMid;}
+        Rid *firstRid() const                               {return mFirstRid;}
+        Unknown *firstUnknown() const                       {return mFirstUnknown;}
+
+        size_t cNameCount() const                           {return mCNameCount;}
+        size_t nameCount() const                            {return mNameCount;}
+        size_t emailCount() const                           {return mEmailCount;}
+        size_t phoneCount() const                           {return mPhoneCount;}
+        size_t locCount() const                             {return mLocCount;}
+        size_t toolCount() const                            {return mToolCount;}
+        size_t noteCount() const                            {return mNoteCount;}
+        size_t privCount() const                            {return mPrivCount;}
+        size_t midCount() const                             {return mMidCount;}
+        size_t ridCount() const                             {return mRidCount;}
+        size_t unknownCount() const                         {return mUnknownCount;}
+
+        CName *cNameAtIndex(size_t index) const;
+        Name *nameAtIndex(size_t index) const;
+        Email *emailAtIndex(size_t index) const;
+        Phone *phoneAtIndex(size_t index) const;
+        Loc *locAtIndex(size_t index) const;
+        Tool *toolAtIndex(size_t index) const;
+        Note *noteAtIndex(size_t index) const;
+        Priv *privAtIndex(size_t index) const;
+        Mid *midAtIndex(size_t index) const;
+        Rid *ridAtIndex(size_t index) const;
+        Unknown *unknownAtIndex(size_t index) const;
+
+      public:
+        Chunk *mNext {};
+
+        DWORD mSSRC {};
+
+        size_t mCount {};
+
+        size_t mCNameCount {};
+        size_t mNameCount {};
+        size_t mEmailCount {};
+        size_t mPhoneCount {};
+        size_t mLocCount {};
+        size_t mToolCount {};
+        size_t mNoteCount {};
+        size_t mPrivCount {};
+        size_t mMidCount {};
+        size_t mRidCount {};
+        size_t mUnknownCount {};
+
+        CName *mFirstCName {};
+        Name *mFirstName {};
+        Email *mFirstEmail {};
+        Phone *mFirstPhone {};
+        Loc *mFirstLoc {};
+        Tool *mFirstTool {};
+        Note *mFirstNote {};
+        Priv *mFirstPriv {};
+        Mid *mFirstMid {};
+        Rid *mFirstRid {};
+        Unknown *mFirstUnknown {};
+      };
+
+      static const BYTE kPayloadType {202};
+
+      SDES *nextSDES() const                  {return mNextSDES;}
+
+      size_t sc() const                       {return static_cast<size_t>(mReportSpecific);}
+
+      Chunk *firstChunk() const               {return mFirstChunk;}
+
+    public:
+      SDES *mNextSDES {};
+
+      Chunk *mFirstChunk {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::Bye
+    #pragma mark
+
+    struct Bye : public Report
+    {
+      // https://tools.ietf.org/html/rfc3550#section-6.6
+
+      static const BYTE kPayloadType {203};
+
+      Bye *nextBye() const                    {return mNextBye;}
+
+      size_t sc() const                       {return static_cast<size_t>(mReportSpecific);}
+
+      DWORD ssrc(size_t index) const;
+
+      const char *reasonForLeaving() const    {return mReasonForLeaving;}
+
+    public:
+      Bye *mNextBye {};
+
+      const char *mReasonForLeaving {};
+
+      DWORD *mSSRCs {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::App
+    #pragma mark
+
+    struct App : public Report
+    {
+      // https://tools.ietf.org/html/rfc3550#section-6.7
+
+      static const BYTE kPayloadType {204};
+
+      App *nextApp() const                    {return mNextApp;}
+
+      BYTE subtype() const                    {return mReportSpecific;}
+
+      DWORD ssrc() const                      {return mSSRC;}
+      const char *name() const                {return &(mName[0]);}
+
+      const BYTE *data() const                {return mData;}
+      size_t dataSize() const                 {return mDataSize;}
+
+    public:
+      App *mNextApp {};
+
+      DWORD mSSRC {};
+      char mName[sizeof(DWORD)+1] {};
+
+      const BYTE *mData {};
+      size_t mDataSize {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::FeedbackMessage
+    #pragma mark
+
+    struct FeedbackMessage : public Report
+    {
+      // https://tools.ietf.org/html/rfc4585#section-6.1
+
+      BYTE fmt() const                                        {return mReportSpecific;}
+
+      DWORD ssrcOfPacketSender() const                        {return mSSRCOfPacketSender;}
+      DWORD ssrcOfMediaSource() const                         {return mSSRCOfMediaSource;}
+
+      const BYTE *fci() const                                 {return mFCI;}
+      size_t fciSize() const                                  {return mFCISize;}
+
+      static const char *fmtToString(BYTE pt, BYTE fmt, DWORD subFmt = 0);
+      const char *fmtToString() const;
+
+    public:
+      DWORD mSSRCOfPacketSender {};
+      DWORD mSSRCOfMediaSource {};
+
+      const BYTE *mFCI {};
+      size_t mFCISize {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::TransportLayerFeedbackMessage
+    #pragma mark
+
+    struct TransportLayerFeedbackMessage : public FeedbackMessage
+    {
+      // https://tools.ietf.org/html/rfc4585#section-6.2
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::TransportLayerFeedbackMessage::GenericNACK
+      #pragma mark
+
+      struct GenericNACK
+      {
+        // https://tools.ietf.org/html/rfc4585#section-6.2.1
+
+        static const BYTE kFmt {1};
+
+        WORD pid() const                                      {return mPID;}
+        WORD blp() const                                      {return mBLP;}
+
+      public:
+        WORD mPID {};
+        WORD mBLP {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::TransportLayerFeedbackMessage::TMMBRCommon
+      #pragma mark
+
+      struct TMMBRCommon
+      {
+        DWORD ssrc() const                                    {return mSSRC;}
+
+        BYTE mxTBRExp() const                                 {return mMxTBRExp;}
+        DWORD mxTBRMantissa() const                           {return mMxTBRMantissa;}
+        WORD measuredOverhead() const                         {return mMeasuredOverhead;}
+
+      public:
+        DWORD mSSRC {};
+
+        BYTE mMxTBRExp {};
+        DWORD mMxTBRMantissa {};
+        WORD mMeasuredOverhead {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::TransportLayerFeedbackMessage::TMMBR
+      #pragma mark
+
+      struct TMMBR : public TMMBRCommon
+      {
+        // http://tools.ietf.org/html/rfc5104#section-4.2.1.1
+
+        static const BYTE kFmt {3};
+
+      public:
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::TransportLayerFeedbackMessage::TMMBN
+      #pragma mark
+
+      struct TMMBN : public TMMBRCommon
+      {
+        // http://tools.ietf.org/html/rfc5104#section-4.2.2.1
+
+        static const BYTE kFmt {4};
+
+      public:
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::TransportLayerFeedbackMessage (public)
+      #pragma mark
+
+      static const BYTE kPayloadType {205};
+
+      TransportLayerFeedbackMessage *nextTransportLayerFeedbackMessage() const  {return mNextTransportLayerFeedbackMessage;}
+
+      size_t genericNACKCount() const                         {return mGenericNACKCount;}
+      GenericNACK *genericNACKAtIndex(size_t index) const;
+
+      size_t tmmbrCount() const                               {return mTMMBRCount;}
+      TMMBR *tmmbrAtIndex(size_t index) const;
+
+      size_t tmmbnCount() const                               {return mTMMBNCount;}
+      TMMBN *tmmbnAtIndex(size_t index) const;
+
+      TransportLayerFeedbackMessage *unknown() const          {return mUnknown;}
+
+    public:
+      TransportLayerFeedbackMessage *mNextTransportLayerFeedbackMessage {};
+
+      size_t mGenericNACKCount {};
+      GenericNACK *mFirstGenericNACK {};
+
+      size_t mTMMBRCount {};
+      TMMBR *mFirstTMMBR {};
+
+      size_t mTMMBNCount {};
+      TMMBN *mFirstTMMBN {};
+
+      TransportLayerFeedbackMessage *mUnknown {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage
+    #pragma mark
+
+    struct PayloadSpecificFeedbackMessage : public FeedbackMessage
+    {
+      // https://tools.ietf.org/html/rfc4585#section-6.3
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::PLI
+      #pragma mark
+
+      struct PLI
+      {
+        // https://tools.ietf.org/html/rfc4585#section-6.3.1
+
+        static const BYTE kFmt {1};
+      public:
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::SLI
+      #pragma mark
+
+      struct SLI
+      {
+        // https://tools.ietf.org/html/rfc4585#section-6.3.2
+
+        static const BYTE kFmt {2};
+
+        WORD first() const                        {return mFirst;}
+        WORD number() const                       {return mNumber;}
+        BYTE pictureID() const                    {return mPictureID;}
+
+      public:
+        WORD mFirst {};
+        WORD mNumber {};
+        BYTE mPictureID {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::RPSI
+      #pragma mark
+
+      struct RPSI
+      {
+        // https://tools.ietf.org/html/rfc4585#section-6.3.3
+
+        static const BYTE kFmt {3};
+
+        BYTE zeroBit() const                          {return mZeroBit;}
+        BYTE payloadType() const                      {return mPayloadType;}
+
+        const BYTE *nativeRPSIBitString() const       {return mNativeRPSIBitString;}
+        size_t nativeRPSIBitStringSizeInBits() const  {return mNativeRPSIBitStringSizeInBits;}
+
+      public:
+        BYTE mZeroBit {};
+        BYTE mPayloadType {};
+
+        const BYTE *mNativeRPSIBitString {};
+        size_t mNativeRPSIBitStringSizeInBits {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::FIR
+      #pragma mark
+
+      struct CodecControlCommon
+      {
+        DWORD ssrc() const                        {return mSSRC;}
+        BYTE seqNr() const                        {return mSeqNr;}
+        DWORD reserved() const                    {return mReserved;}
+
+      public:
+        DWORD mSSRC {};
+        BYTE mSeqNr {};
+        DWORD mReserved {};
+        DWORD mControlSpecific {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::FIR
+      #pragma mark
+
+      struct FIR : public CodecControlCommon
+      {
+        // http://tools.ietf.org/html/rfc5104#section-4.3.1.1
+
+        static const BYTE kFmt {4};
+
+      public:
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::TSTR
+      #pragma mark
+
+      struct TSTR : public CodecControlCommon
+      {
+        // http://tools.ietf.org/html/rfc5104#section-4.3.2.1
+
+        static const BYTE kFmt {5};
+
+        BYTE index() const                        {return static_cast<BYTE>(mControlSpecific);}
+
+      public:
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::TSTN
+      #pragma mark
+
+      struct TSTN : public CodecControlCommon
+      {
+        // http://tools.ietf.org/html/rfc5104#section-4.3.3.1
+
+        static const BYTE kFmt {6};
+
+        BYTE index() const                        {return static_cast<BYTE>(mControlSpecific);}
+
+      public:
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::VBCM
+      #pragma mark
+
+      struct VBCM : public CodecControlCommon
+      {
+        // http://tools.ietf.org/html/rfc5104#section-4.3.4.1
+
+        static const BYTE kFmt {7};
+
+        BYTE zeroBit() const;
+        BYTE payloadType() const;
+
+        const BYTE *vbcmOctetString() const     {return mVBCMOctetString;}
+        size_t vbcmOctetStringSize() const;
+
+      public:
+        const BYTE *mVBCMOctetString {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::AFB
+      #pragma mark
+
+      struct AFB
+      {
+        // https://tools.ietf.org/html/rfc4585#section-6.4
+
+        static const BYTE kFmt {15};
+
+        const BYTE *data() const                  {return mData;}
+        size_t dataSize() const                   {return mDataSize;}
+
+      public:
+        const BYTE *mData {};
+        size_t mDataSize {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::REMB
+      #pragma mark
+
+      struct REMB
+      {
+        // https://tools.ietf.org/html/draft-alvestrand-rmcat-remb-03#section-2.2
+
+        static const BYTE kFmt {15};
+
+        size_t numSSRC() const                    {return static_cast<size_t>(mNumSSRC);}
+        BYTE brExp() const                        {return mBRExp;}
+        DWORD brMantissa() const                  {return mBRMantissa;}
+
+        DWORD ssrcAtIndex(size_t index) const;
+
+      public:
+        BYTE mNumSSRC {};
+        BYTE mBRExp {};
+        DWORD mBRMantissa {};
+        DWORD *mSSRCs {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage (public)
+      #pragma mark
+
+      static const BYTE kPayloadType {206};
+
+      PayloadSpecificFeedbackMessage *nextPayloadSpecificFeedbackMessage() const  {return mNextPayloadSpecificFeedbackMessage;}
+
+      size_t sliCount() const                         {return mSLICount;}
+      size_t firCount() const                         {return mFIRCount;}
+      size_t tstrCount() const                        {return mTSTRCount;}
+      size_t tstnCount() const                        {return mTSTNCount;}
+      size_t vbcmCount() const                        {return mVBCMCount;}
+
+      PLI *pli() const;
+      SLI *sliAtIndex(size_t index) const;
+      RPSI *rpsi() const;
+      FIR *firAtIndex(size_t index) const;
+      TSTR *tstrAtIndex(size_t index) const;
+      TSTN *tstnAtIndex(size_t index) const;
+      VBCM *vbcmAtIndex(size_t index) const;
+      AFB *afb() const;
+      REMB *remb() const;
+      PayloadSpecificFeedbackMessage *unknown() const {return mUnknown;}
+
+    public:
+      PayloadSpecificFeedbackMessage *mNextPayloadSpecificFeedbackMessage {};
+
+      PLI mPLI {};
+      size_t mSLICount {};
+      SLI *mFirstSLI {};
+      RPSI mRPSI {};
+      size_t mFIRCount {};
+      FIR *mFirstFIR {};
+      size_t mTSTRCount {};
+      TSTR *mFirstTSTR {};
+      size_t mTSTNCount {};
+      TSTN *mFirstTSTN {};
+      size_t mVBCMCount {};
+      VBCM *mFirstVBCM {};
+      AFB mAFB {};
+      bool mHasREMB {false};
+      REMB mREMB {};
+
+      PayloadSpecificFeedbackMessage *mUnknown {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::XR
+    #pragma mark
+
+    struct XR : public Report
+    {
+      // https://tools.ietf.org/html/rfc3611#section-2
+      // https://tools.ietf.org/html/rfc3611#section-3
+
+      typedef WORD RLEChunk;
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::ReportBlock
+      #pragma mark
+
+      struct ReportBlock
+      {
+        ReportBlock *next() const                           {return mNext;}
+
+        BYTE blockType() const                              {return mBlockType;}
+        BYTE typeSpecific() const                           {return mTypeSpecific;}
+
+        const BYTE *typeSpecificContents() const            {return mTypeSpecificContents;}
+        size_t typeSpecificContentSize() const              {return mTypeSpecificContentSize;}
+
+        static const char *blockTypeToString(BYTE blockType);
+        const char *blockTypeToString() const               {return blockTypeToString(mBlockType);}
+
+      public:
+        ReportBlock *mNext {};
+
+        BYTE mBlockType {};
+        BYTE mTypeSpecific {};
+
+        const BYTE *mTypeSpecificContents {};
+        size_t mTypeSpecificContentSize {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::ReportBlockRange
+      #pragma mark
+
+      struct ReportBlockRange : public ReportBlock
+      {
+        BYTE reserved() const;
+        BYTE thinning() const;
+
+        DWORD ssrcOfSource() const                          {return mSSRCOfSource;}
+        WORD beginSeq() const                               {return mBeginSeq;}
+        WORD endSeq() const                                 {return mEndSeq;}
+
+      public:
+        DWORD mSSRCOfSource {};
+        WORD mBeginSeq {};
+        WORD mEndSeq {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::RLEReportBlock
+      #pragma mark
+
+      struct RLEReportBlock : public ReportBlockRange
+      {
+        size_t chunkCount() const                           {return mChunkCount;}
+        RLEChunk chunkAtIndex(size_t index) const;
+
+      public:
+        size_t mChunkCount {};
+        RLEChunk *mChunks {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::LossRLEReportBlock
+      #pragma mark
+
+      struct LossRLEReportBlock : public RLEReportBlock
+      {
+        // https://tools.ietf.org/html/rfc3611#section-4.1
+
+        static const BYTE kBlockType {1};
+
+        LossRLEReportBlock *nextLossRLE() const             {return mNextLossRLE;}
+
+      public:
+        LossRLEReportBlock *mNextLossRLE {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::DuplicateRLEReportBlock
+      #pragma mark
+
+      struct DuplicateRLEReportBlock : public RLEReportBlock
+      {
+        // https://tools.ietf.org/html/rfc3611#section-4.2
+
+        static const BYTE kBlockType {2};
+
+        DuplicateRLEReportBlock *nextDuplicateRLE() const {return mNextDuplicateRLE;}
+
+      public:
+        DuplicateRLEReportBlock *mNextDuplicateRLE {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::PacketReceiptTimesReportBlock
+      #pragma mark
+
+      struct PacketReceiptTimesReportBlock : public ReportBlockRange
+      {
+        // https://tools.ietf.org/html/rfc3611#section-4.3
+
+        static const BYTE kBlockType {3};
+
+        PacketReceiptTimesReportBlock *nextPacketReceiptTimesReportBlock() const  {return mNextPacketReceiptTimesReportBlock;}
+
+        size_t receiptTimeCount() const                                           {return mReceiptTimeCount;}
+        DWORD receiptTimeAtIndex(size_t index) const;
+
+      public:
+        PacketReceiptTimesReportBlock *mNextPacketReceiptTimesReportBlock {};
+
+        size_t mReceiptTimeCount {};
+        DWORD *mReceiptTimes {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::ReceiverReferenceTimeReportBlock
+      #pragma mark
+
+      struct ReceiverReferenceTimeReportBlock : public ReportBlock
+      {
+        // https://tools.ietf.org/html/rfc3611#section-4.4
+
+        static const BYTE kBlockType {4};
+
+        ReceiverReferenceTimeReportBlock *nextReceiverReferenceTimeReportBlock() const  {return mNextReceiverReferenceTimeReportBlock;}
+
+        DWORD ntpTimestampMS() const          {return mNTPTimestampMS;}
+        DWORD ntpTimestampLS() const          {return mNTPTimestampLS;}
+        Time ntpTimestamp() const;
+
+      public:
+        ReceiverReferenceTimeReportBlock *mNextReceiverReferenceTimeReportBlock {};
+
+        DWORD mNTPTimestampMS {};
+        DWORD mNTPTimestampLS {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::DLRRReportBlock
+      #pragma mark
+
+      struct DLRRReportBlock : public ReportBlock
+      {
+        // https://tools.ietf.org/html/rfc3611#section-4.5
+
+        static const BYTE kBlockType {5};
+
+        struct SubBlock
+        {
+          DWORD ssrc() const  {return mSSRC;}
+          DWORD lrr() const   {return mLRR;}
+          DWORD dlrr() const  {return mDLRR;}
+
+          DWORD mSSRC {};
+          DWORD mLRR {};
+          DWORD mDLRR {};
+        };
+
+        DLRRReportBlock *nextDLRRReportBlock() const {return mNextDLRRReportBlock;}
+
+        size_t subBlockCount() const {return mSubBlockCount;}
+        SubBlock *subBlockAtIndex(size_t index) const;
+
+      public:
+        DLRRReportBlock *mNextDLRRReportBlock {};
+
+        size_t mSubBlockCount {};
+        SubBlock *mSubBlocks {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::StatisticsSummaryReportBlock
+      #pragma mark
+
+      struct StatisticsSummaryReportBlock : public ReportBlockRange
+      {
+        // https://tools.ietf.org/html/rfc3611#section-4.6
+
+        static const BYTE kBlockType {6};
+
+        StatisticsSummaryReportBlock *nextStatisticsSummaryReportBlock() const {return mNextStatisticsSummaryReportBlock;}
+
+        bool lossReportFlag() const;
+        bool duplicateReportFlag() const;
+        bool jitterFlag() const;
+        bool ttlFlag() const;
+        bool hopLimitFlag() const;
+
+        DWORD lostPackets() const             {return mLostPackets;}
+        DWORD dupPackets() const              {return mDupPackets;}
+
+        DWORD minJitter() const               {return mMinJitter;}
+        DWORD maxJitter() const               {return mMaxJitter;}
+        DWORD meanJitter() const              {return mMeanJitter;}
+        DWORD devJitter() const               {return mDevJitter;}
+
+        BYTE minTTL() const                   {return mMinTTLOrHL;}
+        BYTE maxTTL() const                   {return mMaxTTLOrHL;}
+        BYTE meanTTL() const                  {return mMeanTTLOrHL;}
+        BYTE devTTL() const                   {return mDevTTLOrHL;}
+
+        BYTE minHopLimit() const              {return mMinTTLOrHL;}
+        BYTE maxHopLimit() const              {return mMaxTTLOrHL;}
+        BYTE meanHopLimit() const             {return mMeanTTLOrHL;}
+        BYTE devHopLimit() const              {return mDevTTLOrHL;}
+
+      public:
+        StatisticsSummaryReportBlock *mNextStatisticsSummaryReportBlock {};
+
+        DWORD mLostPackets {};
+        DWORD mDupPackets {};
+        DWORD mMinJitter {};
+        DWORD mMaxJitter {};
+        DWORD mMeanJitter {};
+        DWORD mDevJitter {};
+
+        BYTE mMinTTLOrHL {};
+        BYTE mMaxTTLOrHL {};
+        BYTE mMeanTTLOrHL {};
+        BYTE mDevTTLOrHL {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::VoIPMetricsReportBlock
+      #pragma mark
+
+      struct VoIPMetricsReportBlock : public ReportBlock
+      {
+        // https://tools.ietf.org/html/rfc3611#section-4.7
+
+        static const BYTE kBlockType {7};
+
+        VoIPMetricsReportBlock *nextVoIPMetricsReportBlock() const {return mNextVoIPMetricsReportBlock;}
+
+        DWORD ssrcOfSource() const              {return mSSRCOfSource;}
+
+        BYTE lossRate() const                   {return mLossRate;}
+        BYTE discardRate() const                {return mDiscardRate;}
+        BYTE burstDensity() const               {return mBurstDensity;}
+        BYTE gapDensity() const                 {return mGapDensity;}
+
+        WORD burstDuration() const              {return mBurstDuration;}
+        WORD gapDuration() const                {return mGapDuration;}
+
+        WORD roundTripDelay() const             {return mRoundTripDelay;}
+        WORD endSystemDelay() const             {return mEndSystemDelay;}
+
+        BYTE signalLevel() const                {return mSignalLevel;}
+        BYTE noiseLevel() const                 {return mNoiseLevel;}
+        BYTE rerl() const                       {return mRERL;}
+        BYTE Gmin() const                       {return mGmin;}
+
+        BYTE rFactor() const                    {return mRFactor;}
+        BYTE extRFactor() const                 {return mExtRFactor;}
+        BYTE mosLQ() const                      {return mMOSLQ;}
+        BYTE mosCQ() const                      {return mMOSCQ;}
+
+        BYTE rxConfig() const                   {return mRXConfig;}
+        BYTE plc() const;
+        BYTE jba() const;
+        BYTE jbRate() const;
+
+        WORD jbNominal() const                  {return mJBNominal;}
+        WORD jbMaximum() const                  {return mJBMaximum;}
+        WORD jbAbsMax() const                   {return mJBAbsMax;}
+
+      public:
+        VoIPMetricsReportBlock *mNextVoIPMetricsReportBlock {};
+
+        DWORD mSSRCOfSource {};
+
+        BYTE mLossRate {};
+        BYTE mDiscardRate {};
+        BYTE mBurstDensity {};
+        BYTE mGapDensity {};
+
+        WORD mBurstDuration {};
+        WORD mGapDuration {};
+
+        WORD mRoundTripDelay {};
+        WORD mEndSystemDelay {};
+
+        BYTE mSignalLevel {};
+        BYTE mNoiseLevel {};
+        BYTE mRERL {};
+        BYTE mGmin {};
+
+        BYTE mRFactor {};
+        BYTE mExtRFactor {};
+        BYTE mMOSLQ {};
+        BYTE mMOSCQ {};
+
+        BYTE mRXConfig {};
+        BYTE mReservedVoIP {};
+
+        WORD mJBNominal {};
+        WORD mJBMaximum {};
+        WORD mJBAbsMax {};
+      };
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::UnknownReportBlock
+      #pragma mark
+
+      struct UnknownReportBlock : public ReportBlock
+      {
+        UnknownReportBlock *nextUnknownReportBlock() const {return mNextUnknownReportBlock;}
+
+      public:
+        UnknownReportBlock *mNextUnknownReportBlock {};
+      };
+
+      //-------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::RunLength
+      #pragma mark
+
+      struct RunLength
+      {
+        // https://tools.ietf.org/html/rfc3611#section-4.1.1
+
+        RunLength(RLEChunk chunk);
+
+        BYTE runType() const {return mRunType;}
+        size_t runLength() const {return static_cast<size_t>(mRunLength);}
+
+      public:
+        BYTE mRunType {};   // Zero indicates a run of 0s.  One indicates a run of 1s.
+        WORD mRunLength {}; // A value between 1 and 16,383.
+      };
+
+      //-------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR::BitVector
+      #pragma mark
+
+      struct BitVector
+      {
+        // https://tools.ietf.org/html/rfc3611#section-4.1.2
+
+        BitVector(RLEChunk chunk);
+
+        BYTE bitAtIndex(size_t index) const;  // Zero indicates loss.
+        WORD bitVector() const { return mBitVector; }
+
+      public:
+        WORD mBitVector {};
+      };
+
+      //-------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTCPPacket::XR
+      #pragma mark
+
+      static const BYTE kPayloadType {207};
+
+      XR *nextXR() const                                                              {return mNextXR;}
+
+      BYTE reserved() const                                                           {return mReportSpecific;}
+
+      DWORD ssrc() const                                                              {return mSSRC;}
+
+      ReportBlock *firstReportBlock() const                                           {return mFirstReportBlock;}
+
+      LossRLEReportBlock *firstLossRLEReportBlock() const                             {return mFirstLossRLEReportBlock;}
+      DuplicateRLEReportBlock *firstDuplicateRLEReportBlock() const                   {return mFirstDuplicateRLEReportBlock;}
+      PacketReceiptTimesReportBlock *firstPacketReceiptTimesReportBlock() const       {return mFirstPacketReceiptTimesReportBlock;}
+      ReceiverReferenceTimeReportBlock *firstReceiverReferenceTimeReportBlock() const {return mFirstReceiverReferenceTimeReportBlock;}
+      DLRRReportBlock *firstDLRRReportBlock() const                                   {return mFirstDLRRReportBlock;}
+      StatisticsSummaryReportBlock *firstStatisticsSummaryReportBlock() const         {return mFirstStatisticsSummaryReportBlock;}
+      VoIPMetricsReportBlock *firstVoIPMetricsReportBlock() const                     {return mFirstVoIPMetricsReportBlock;}
+      UnknownReportBlock *firstUnknownReportBlock() const                             {return mFirstUnknownReportBlock;}
+
+      size_t reportBlockCount() const                                                 {return mReportBlockCount;}
+
+      size_t lossRLEReportBlockCount() const                                          {return mLossRLEReportBlockCount;}
+      size_t duplicateRLEReportBlockCount() const                                     {return mDuplicateRLEReportBlockCount;}
+      size_t packetReceiptTimesReportBlockCount() const                               {return mPacketReceiptTimesReportBlockCount;}
+      size_t receiverReferenceTimeReportBlockCount() const                            {return mReceiverReferenceTimeReportBlockCount;}
+      size_t dlrrReportBlockCount() const                                             {return mDLRRReportBlockCount;}
+      size_t statisticsSummaryReportBlockCount() const                                {return mStatisticsSummaryReportBlockCount;}
+      size_t voIPMetricsReportBlockCount() const                                      {return mVoIPMetricsReportBlockCount;}
+      size_t unknownReportBlockCount() const                                          {return mUnknownReportBlockCount;}
+
+      LossRLEReportBlock *lossRLEReportBlockAtIndex(size_t index) const;
+      DuplicateRLEReportBlock *duplicateRLEReportBlockAtIndex(size_t index) const;
+      PacketReceiptTimesReportBlock *packetReceiptTimesReportBlockAtIndex(size_t index) const;
+      ReceiverReferenceTimeReportBlock *receiverReferenceTimeReportBlockAtIndex(size_t index) const;
+      DLRRReportBlock *dlrrReportBlockAtIndex(size_t index) const;
+      StatisticsSummaryReportBlock *statisticsSummaryReportBlockAtIndex(size_t index) const;
+      VoIPMetricsReportBlock *voIPMetricsReportBlockAtIndex(size_t index) const;
+      UnknownReportBlock *unknownReportBlockAtIndex(size_t index) const;
+
+      static bool isRunLengthChunk(RLEChunk chunk);
+      static bool isBitVectorChunk(RLEChunk chunk);
+
+      static RunLength runLength(RLEChunk chunk)                                      {return RunLength(chunk);}
+      static BitVector bitVector(RLEChunk chunk)                                      {return BitVector(chunk);}
+
+    public:
+      XR *mNextXR {};
+
+      DWORD mSSRC {};
+
+      size_t mReportBlockCount {};
+
+      size_t mLossRLEReportBlockCount {};
+      size_t mDuplicateRLEReportBlockCount {};
+      size_t mPacketReceiptTimesReportBlockCount {};
+      size_t mReceiverReferenceTimeReportBlockCount {};
+      size_t mDLRRReportBlockCount {};
+      size_t mStatisticsSummaryReportBlockCount {};
+      size_t mVoIPMetricsReportBlockCount {};
+      size_t mUnknownReportBlockCount {};
+
+      ReportBlock *mFirstReportBlock {};
+
+      LossRLEReportBlock *mFirstLossRLEReportBlock {};
+      DuplicateRLEReportBlock *mFirstDuplicateRLEReportBlock {};
+      PacketReceiptTimesReportBlock *mFirstPacketReceiptTimesReportBlock {};
+      ReceiverReferenceTimeReportBlock *mFirstReceiverReferenceTimeReportBlock {};
+      DLRRReportBlock *mFirstDLRRReportBlock {};
+      StatisticsSummaryReportBlock *mFirstStatisticsSummaryReportBlock {};
+      VoIPMetricsReportBlock *mFirstVoIPMetricsReportBlock {};
+      UnknownReportBlock *mFirstUnknownReportBlock {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket::UnknownReport
+    #pragma mark
+
+    struct UnknownReport : public Report
+    {
+      UnknownReport *nextUnknown() const          {return mNextUnknown;}
+
+    public:
+      UnknownReport *mNextUnknown {};
+    };
+
+  public:
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark (public)
+    #pragma mark
+
+    RTCPPacket(
+               const make_private &,
+               MediaChannelID mediaChannelID
+               );
+    ~RTCPPacket();
+
+    static RTCPPacketPtr create(
+                                const BYTE *buffer,
+                                size_t bufferLengthInBytes,
+                                MediaChannelID mediaChannelID = 0
+                                );
+    static RTCPPacketPtr create(
+                                const SecureByteBlock &buffer,
+                                MediaChannelID mediaChannelID = 0
+                                );
+    static RTCPPacketPtr create(
+                                SecureByteBlockPtr buffer,
+                                MediaChannelID mediaChannelID = 0
+                                );  // NOTE: ownership of buffer is taken / assumed
+    static RTCPPacketPtr create(
+                                const Report *first,
+                                MediaChannelID mediaChannelID = 0
+                                );
+    static SecureByteBlockPtr generateFrom(const Report *first);
+
+    const BYTE *ptr() const;
+    size_t size() const;
+    SecureByteBlockPtr buffer() const;
+
+    Report *first() const                                                       {return mFirst;}
+
+    SenderReport *firstSenderReport() const                                     {return mFirstSenderReport;}
+    ReceiverReport *firstReceiverReport() const                                 {return mFirstReceiverReport;}
+    SDES *firstSDES() const                                                     {return mFirstSDES;}
+    Bye *firstBye() const                                                       {return mFirstBye;}
+    App *firstApp() const                                                       {return mFirstApp;}
+    TransportLayerFeedbackMessage *firstTransportLayerFeedbackMessage() const   {return mFirstTransportLayerFeedbackMessage;}
+    PayloadSpecificFeedbackMessage *firstPayloadSpecificFeedbackMessage() const {return mFirstPayloadSpecificFeedbackMessage;}
+    XR *firstXR() const                                                         {return mFirstXR;}
+    UnknownReport *firstUnknownReport() const                                   {return mFirstUnknownReport;}
+
+    size_t count() const                                                        {return mCount;}
+
+    size_t senderReportCount() const                                            {return mSenderReportCount;}
+    size_t receiverReportCount() const                                          {return mReceiverReportCount;}
+    size_t sdesCount() const                                                    {return mSDESCount;}
+    size_t byeCount() const                                                     {return mByeCount;}
+    size_t appCount() const                                                     {return mAppCount;}
+    size_t transportLayerFeedbackMessageCount() const                           {return mTransportLayerFeedbackMessageCount;}
+    size_t payloadSpecificFeedbackMessage() const                               {return mPayloadSpecificFeedbackMessageCount;}
+    size_t xrCount() const                                                      {return mXRCount;}
+    size_t unknownReportCount() const                                           {return mUnknownReportCount;}
+      
+    SenderReport *senderReportAtIndex(size_t index) const;
+    ReceiverReport *receiverReportAtIndex(size_t index) const;
+    SDES *sdesAtIndex(size_t index) const;
+    Bye *byeAtIndex(size_t index) const;
+    App *appAtIndex(size_t index) const;
+    TransportLayerFeedbackMessage *transportLayerFeedbackReportAtIndex(size_t index) const;
+    PayloadSpecificFeedbackMessage *payloadSpecificFeedbackReportAtIndex(size_t index) const;
+    XR *xrAtIndex(size_t index) const;
+    UnknownReport *unknownAtIndex(size_t index) const;
+
+    void trace(
+               const char *func = NULL,
+               const char *message = NULL
+               ) const;
+
+  protected:
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark (internal)
+    #pragma mark
+
+    bool parse();
+
+    bool getAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, BYTE pt, const BYTE *contents, size_t contentSize);
+    bool getSenderReportAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
+    bool getReceiverReportAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
+    bool getSDESAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
+    bool getByeAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
+    bool getAppAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
+    bool getTransportLayerFeedbackMessageAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
+    bool getPayloadSpecificFeedbackMessageAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
+    bool getXRAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
+    bool getUnknownReportAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
+
+    bool getTransportLayerFeedbackMessageGenericNACKAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+    bool getTransportLayerFeedbackMessageTMMBRAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+    bool getTransportLayerFeedbackMessageTMMBNAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+
+    bool getPayloadSpecificFeedbackMessagePLIAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+    bool getPayloadSpecificFeedbackMessageSLIAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+    bool getPayloadSpecificFeedbackMessageRPSIAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+    bool getPayloadSpecificFeedbackMessageFIRAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+    bool getPayloadSpecificFeedbackMessageTSTRAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+    bool getPayloadSpecificFeedbackMessageTSTNAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+    bool getPayloadSpecificFeedbackMessageVBCMAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+    bool getPayloadSpecificFeedbackMessageAFBAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+    bool getPayloadSpecificFeedbackMessageREMBAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
+
+    bool getXRLossRLEReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
+    bool getXRDuplicateRLEReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
+    bool getXRPacketReceiptTimesReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
+    bool getXRReceiverReferenceTimeReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
+    bool getXRDLRRReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
+    bool getXRStatisticsSummaryReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
+    bool getXRVoIPMetricsReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
+    bool getXRUnknownReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
+
+    bool parse(Report * &ioLastReport, BYTE version, BYTE padding, BYTE reportSpecific, BYTE pt, const BYTE *contents, size_t contentSize);
+    void fill(Report *report, BYTE version, BYTE padding, BYTE reportSpecific, BYTE pt, const BYTE *contents, size_t contentSize);
+
+    bool parseCommon(
+                      SenderReceiverCommonReport *report,
+                      size_t detailedHeaderSize
+                      );
+    bool parse(SenderReport *report);
+    bool parse(ReceiverReport *report);
+    bool parse(SDES *report);
+    bool parse(Bye *report);
+    bool parse(App *report);
+    bool parse(TransportLayerFeedbackMessage *report);
+    bool parse(PayloadSpecificFeedbackMessage *report);
+    bool parse(XR *report);
+    bool parse(UnknownReport *report);
+
+    void fill(FeedbackMessage *report, const BYTE *contents, size_t contentSize);
+    void fill(XR *report, XR::ReportBlock *reportBlock, XR::ReportBlock * &ioPreviousReportBlock, BYTE blockType, BYTE typeSpecific, const BYTE *contents, size_t contentSize);
+
+    bool parseGenericNACK(TransportLayerFeedbackMessage *report);
+    void fillTMMBRCommon(TransportLayerFeedbackMessage *report, TransportLayerFeedbackMessage::TMMBRCommon *common, const BYTE *pos);
+    bool parseTMMBR(TransportLayerFeedbackMessage *report);
+    bool parseTMMBN(TransportLayerFeedbackMessage *report);
+    bool parseUnknown(TransportLayerFeedbackMessage *report);
+
+    //CodecControlCommon
+    bool parsePLI(PayloadSpecificFeedbackMessage *report);
+    bool parseSLI(PayloadSpecificFeedbackMessage *report);
+    bool parseRPSI(PayloadSpecificFeedbackMessage *report);
+    void fillCodecControlCommon(PayloadSpecificFeedbackMessage *report, PayloadSpecificFeedbackMessage::CodecControlCommon *common, const BYTE *pos);
+    bool parseFIR(PayloadSpecificFeedbackMessage *report);
+    bool parseTSTR(PayloadSpecificFeedbackMessage *report);
+    bool parseTSTN(PayloadSpecificFeedbackMessage *report);
+    bool parseVBCM(PayloadSpecificFeedbackMessage *report);
+    bool parseAFB(PayloadSpecificFeedbackMessage *report);
+    bool parseREMB(PayloadSpecificFeedbackMessage *report);
+    bool parseUnknown(PayloadSpecificFeedbackMessage *report);
+
+    bool parseCommonRange(XR *xr, XR::ReportBlockRange *reportBlock);
+    bool parseCommonRLE(XR *xr, XR::RLEReportBlock *reportBlock);
+    bool parse(XR *xr, XR::LossRLEReportBlock *reportBlock);
+    bool parse(XR *xr, XR::DuplicateRLEReportBlock *reportBlock);
+    bool parse(XR *xr, XR::PacketReceiptTimesReportBlock *reportBlock);
+    bool parse(XR *xr, XR::ReceiverReferenceTimeReportBlock *reportBlock);
+    bool parse(XR *xr, XR::DLRRReportBlock *reportBlock);
+    bool parse(XR *xr, XR::StatisticsSummaryReportBlock *reportBlock);
+    bool parse(XR *xr, XR::VoIPMetricsReportBlock *reportBlock);
+    bool parse(XR *xr, XR::UnknownReportBlock *reportBlock);
+
+    void *allocateBuffer(size_t size);
+
+    static size_t getPacketSize(const Report *first);
+    static void writePacket(const Report *first, BYTE * &ioPos, size_t &ioRemaining);
+
+  public:
+    SecureByteBlockPtr mBuffer;
+    SecureByteBlockPtr mAllocationBuffer;
+
+    MediaChannelID mMediaChannelID {};
+
+    BYTE *mAllocationPos {};
+    size_t mAllocationSize {};
+
+    Report *mFirst {};
+
+    size_t mCount {};
+
+    size_t mSenderReportCount {};
+    size_t mReceiverReportCount {};
+    size_t mSDESCount {};
+    size_t mByeCount {};
+    size_t mAppCount {};
+    size_t mTransportLayerFeedbackMessageCount {};
+    size_t mPayloadSpecificFeedbackMessageCount {};
+    size_t mXRCount {};
+    size_t mUnknownReportCount {};
+
+    SenderReport *mFirstSenderReport {};
+    ReceiverReport *mFirstReceiverReport {};
+    SDES *mFirstSDES {};
+    Bye *mFirstBye {};
+    App *mFirstApp {};
+    TransportLayerFeedbackMessage *mFirstTransportLayerFeedbackMessage {};
+    PayloadSpecificFeedbackMessage *mFirstPayloadSpecificFeedbackMessage {};
+    XR *mFirstXR {};
+    UnknownReport *mFirstUnknownReport {};
+  };
+
+} // namespace ortc
diff --git a/ortc/RTPPacket.h b/ortc/RTPPacket.h
new file mode 100644
index 00000000..49dbbec9
--- /dev/null
+++ b/ortc/RTPPacket.h
@@ -0,0 +1,466 @@
+/*
+
+ Copyright (c) 2014, Hookflash Inc. / Hookflash Inc.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/types.h>
+#include <ortc/IICETypes.h>
+#include <ortc/IMediaStreamTrack.h>
+
+namespace ortc
+{
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket
+  #pragma mark
+
+  class RTPPacket
+  {
+  protected:
+    struct make_private {};
+
+  public:
+    struct HeaderExtension;
+    struct VideoOrientationHeaderExtension;
+    struct VideoOrientation6HeaderExtension;
+    typedef IMediaStreamTrackTypes::MediaChannelID MediaChannelID;
+
+  public:
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPPacket::CreationParams
+    #pragma mark
+
+    struct CreationParams
+    {
+      MediaChannelID mMediaChannelID {};
+      BYTE mVersion {2};
+      size_t mPadding {};
+      bool mM {};
+      BYTE mPT {};
+      WORD mSequenceNumber {};
+      DWORD mTimestamp {};
+      DWORD mSSRC {};
+
+      size_t mCC {};
+      DWORD *mCSRCList {};
+
+      const BYTE *mPayload {};
+      size_t mPayloadSize {};
+
+      HeaderExtension *mFirstHeaderExtension {};
+      BYTE mHeaderExtensionAppBits {};
+
+      size_t mHeaderExtensionPrepaddedSize {};
+      const BYTE *mHeaderExtensionStopParsePos {};
+      size_t mHeaderExtensionStopParseSize {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPPacket::Extension
+    #pragma mark
+
+    struct HeaderExtension
+    {
+      // see https://tools.ietf.org/html/rfc5285
+
+      BYTE mID {};
+
+      const BYTE *mData {};
+      size_t mDataSizeInBytes {};
+      size_t mPostPaddingSize {};
+
+      HeaderExtension *mNext {};
+
+      virtual void trace(
+                         const char *func = NULL,
+                         const char *message = NULL
+                         ) const;
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPPacket::ClientToMixerExtension
+    #pragma mark
+
+    struct ClientToMixerExtension : public HeaderExtension
+    {
+      // see https://tools.ietf.org/html/rfc6464
+
+      ClientToMixerExtension(const HeaderExtension &header);
+      ClientToMixerExtension(
+                              BYTE id,
+                              bool voiceActivity,
+                              BYTE level
+                              );
+
+      bool voiceActivity() const;
+      BYTE level() const;
+
+      virtual void trace(
+                         const char *func = NULL,
+                         const char *message = NULL
+                         ) const override;
+
+    public:
+      BYTE mLevelBuffer {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPPacket::MixerToClientExtension
+    #pragma mark
+
+    struct MixerToClientExtension : public HeaderExtension
+    {
+      // see https://tools.ietf.org/html/rfc6464
+
+      static const size_t kMaxLevelCount {0xF};
+
+      MixerToClientExtension(const HeaderExtension &header);
+      MixerToClientExtension(
+                              BYTE id,
+                              BYTE *levels,
+                              size_t count
+                              );
+
+      size_t levelsCount() const;
+
+      BYTE unusedBit(size_t index) const;
+      BYTE level(size_t index) const;
+
+      virtual void trace(
+                         const char *func = NULL,
+                         const char *message = NULL
+                         ) const override;
+
+    public:
+      BYTE mLevelBuffer[kMaxLevelCount] {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPPacket::StringHeaderExtension
+    #pragma mark
+
+    struct StringHeaderExtension : public HeaderExtension
+    {
+      static const size_t kMaxStringLength {0xFF};
+
+      StringHeaderExtension(const HeaderExtension &header);
+      StringHeaderExtension(
+                            BYTE id,
+                            const char *str
+                            );
+
+      const char *str() const;
+
+      virtual void trace(
+                         const char *func = NULL,
+                         const char *message = NULL
+                         ) const override;
+
+    public:
+      BYTE mStringBuffer[kMaxStringLength+sizeof(char)] {};
+    };
+      
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPPacket::NumberHeaderExtension
+    #pragma mark
+
+    struct NumberHeaderExtension : public HeaderExtension
+    {
+      static const size_t kMaxNumberByteLength {0xFF};
+
+      NumberHeaderExtension(const HeaderExtension &header);
+      NumberHeaderExtension(
+                            BYTE id,
+                            const BYTE *number,
+                            size_t lengthInBytes
+                            );
+      NumberHeaderExtension(
+                            BYTE id,
+                            const char *valueInBase10
+                            );
+
+      const BYTE *number() const;
+      size_t length() const;
+
+      String str() const;
+
+      virtual void trace(
+                         const char *func = NULL,
+                         const char *message = NULL
+                         ) const override;
+
+    public:
+      BYTE mNumberBuffer[kMaxNumberByteLength] {};
+    };
+      
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPPacket::MidHeaderExtension
+    #pragma mark
+
+    struct MidHeaderExtension : public StringHeaderExtension
+    {
+      // https://tools.ietf.org/html/draft-ietf-mmusic-sdp-bundle-negotiation-23#section-14.3
+
+      static const size_t kMaxMidLength = kMaxStringLength;
+
+      MidHeaderExtension(const HeaderExtension &header) : StringHeaderExtension(header) {}
+      MidHeaderExtension(
+                        BYTE id,
+                        const char *mid
+                        ) :                              StringHeaderExtension(id, mid) {}
+
+      const char *mid() const {return str();}
+
+      virtual void trace(
+                         const char *func = NULL,
+                         const char *message = NULL
+                         ) const override;
+
+    public:
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPPacket::RidHeaderExtension
+    #pragma mark
+
+    struct RidHeaderExtension : public StringHeaderExtension
+    {
+      // https://tools.ietf.org/html/draft-pthatcher-mmusic-rid-00
+
+      static const size_t kMaxMidLength = kMaxStringLength;
+
+      RidHeaderExtension(const HeaderExtension &header) : StringHeaderExtension(header) {}
+      RidHeaderExtension(
+                          BYTE id,
+                          const char *rid
+                          ) :                              StringHeaderExtension(id, rid) {}
+
+      const char *rid() const {return str();}
+
+      virtual void trace(
+                         const char *func = NULL,
+                         const char *message = NULL
+                         ) const override;
+
+    public:
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPPacket::VideoOrientationHeaderExtension
+    #pragma mark
+
+    struct VideoOrientationHeaderExtension : public HeaderExtension
+    {
+      struct Clockwise {};
+      struct CounterClockwise {};
+
+      VideoOrientationHeaderExtension(const HeaderExtension &header);
+      VideoOrientationHeaderExtension(const VideoOrientation6HeaderExtension &);
+      VideoOrientationHeaderExtension(
+                                      const Clockwise &,
+                                      bool frontFacingCamera, // true = front facing, false = backfacing
+                                      bool flip, // horizontal left-right flip (mirro)
+                                      UINT orientation
+                                      );
+      VideoOrientationHeaderExtension(
+                                      const CounterClockwise &,
+                                      bool frontFacingCamera, // true = front facing, false = backfacing
+                                      bool flip, // horizontal left-right flip (mirro)
+                                      UINT orientation
+                                      );
+
+      bool frontFacing() const;
+      bool backFacing() const;
+      bool flip() const;
+      virtual UINT degreesClockwise() const;
+      virtual UINT degreesCounterClockwise() const;
+
+      virtual void trace(
+                         const char *func = NULL,
+                         const char *message = NULL
+                         ) const override;
+
+    public:
+      BYTE mEncoded[1] {};
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPPacket::VideoOrientationHeaderExtension
+    #pragma mark
+
+    struct VideoOrientation6HeaderExtension : public VideoOrientationHeaderExtension
+    {
+      VideoOrientation6HeaderExtension(const HeaderExtension &header);
+      VideoOrientation6HeaderExtension(
+                                        const Clockwise &,
+                                        bool frontFacingCamera, // true = front facing, false = backfacing
+                                        bool flip, // horizontal left-right flip (mirro)
+                                        UINT orientation
+                                        );
+      VideoOrientation6HeaderExtension(
+                                        const CounterClockwise &,
+                                        bool frontFacingCamera, // true = front facing, false = backfacing
+                                        bool flip, // horizontal left-right flip (mirro)
+                                        UINT orientation
+                                        );
+
+      virtual UINT degreesClockwise() const override;
+      virtual UINT degreesCounterClockwise() const override;
+
+    public:
+    };
+
+  public:
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark (public)
+    #pragma mark
+
+    RTPPacket(
+              const make_private &,
+              MediaChannelID mediaChannelID
+              );
+    ~RTPPacket();
+
+    static RTPPacketPtr create(
+                               const RTPPacket &packet,
+                               MediaChannelID mediaChannelID  = 0
+                               );
+    static RTPPacketPtr create(const CreationParams &params);
+    static RTPPacketPtr create(
+                               const BYTE *buffer,
+                               size_t bufferLengthInBytes,
+                               MediaChannelID mediaChannelID = 0
+                               );
+    static RTPPacketPtr create(
+                               const SecureByteBlock &buffer,
+                               MediaChannelID mediaChannelID = 0
+                               );
+    static RTPPacketPtr create(
+                               SecureByteBlockPtr buffer,
+                               MediaChannelID mediaChannelID = 0
+                               );  // NOTE: exclusive ownership of buffer is taken / assumed
+
+    MediaChannelID mediaChannelID() const {return mMediaChannelID;}
+
+    const BYTE *ptr() const;
+    size_t size() const;
+    SecureByteBlockPtr buffer() const;
+
+    BYTE version() const {return mVersion;}
+    size_t padding() const {return mPadding;}
+    size_t cc() const {return static_cast<size_t>(mCC);}
+    bool m() const {return mM;}
+    BYTE pt() const {return mPT;}
+    WORD sequenceNumber() const {return mSequenceNumber;}
+    DWORD timestamp() const {return mTimestamp;}
+    DWORD ssrc() const {return mSSRC;}
+
+    size_t headerSize() {return mHeaderSize;}
+    size_t headerExtensionSize() {return mHeaderExtensionSize;}
+    size_t payloadSize() {return mPayloadSize;}
+
+    DWORD getCSRC(size_t index) const;
+    const BYTE *payload() const;
+    size_t payloadSize() const {return mPayloadSize;}
+
+    size_t totalHeaderExtensions() const {return mTotalHeaderExtensions;}
+    HeaderExtension *firstHeaderExtension() const {return mHeaderExtensions;}
+    HeaderExtension *getHeaderExtensionAtIndex(size_t index) const;
+    BYTE headerExtensionAppBits() const {return mHeaderExtensionAppBits;}
+
+    size_t headerExtensionPrepaddedSize() const {return mHeaderExtensionPrepaddedSize;}
+    const BYTE *headerExtensionParseStopped() const {return mHeaderExtensionParseStoppedPos;}
+    size_t headerExtensionParseStoppedSize() const {return mHeaderExtensionParseStoppedSize;}
+
+    void changeHeaderExtensions(HeaderExtension *firstExtension);
+
+    void trace(
+               const char *func = NULL,
+               const char *message = NULL
+               ) const;
+
+  protected:
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark (internal)
+    #pragma mark
+
+    bool parse();
+
+    void writeHeaderExtensions(
+                                HeaderExtension *firstExtension,
+                                bool twoByteHeader
+                                );
+    void generate(const RTPPacket &params);
+    void generate(const CreationParams &params);
+
+  public:
+    SecureByteBlockPtr mBuffer;
+
+    MediaChannelID mMediaChannelID {};
+
+    BYTE mVersion {};
+    size_t mPadding {};
+    BYTE mCC {};
+    bool mM {};
+    BYTE mPT {};
+    WORD mSequenceNumber {};
+    DWORD mTimestamp {};
+    DWORD mSSRC {};
+
+    size_t mHeaderSize {};
+    size_t mHeaderExtensionSize {};
+    size_t mPayloadSize {};
+
+    size_t mTotalHeaderExtensions {};
+    HeaderExtension *mHeaderExtensions {};
+    BYTE mHeaderExtensionAppBits {};
+
+    size_t mHeaderExtensionPrepaddedSize {};
+    const BYTE *mHeaderExtensionParseStoppedPos {};
+    size_t mHeaderExtensionParseStoppedSize {};
+  };
+}
+
diff --git a/ortc/adapter/IHelper.h b/ortc/adapter/IHelper.h
index 09f66af6..96826470 100644
--- a/ortc/adapter/IHelper.h
+++ b/ortc/adapter/IHelper.h
@@ -82,8 +82,8 @@ namespace ortc
 
       ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::HeaderExtension, RTPHeaderExtension);
       ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::HeaderExtensionParameters, RTPHeaderExtensionParameters);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::HeaderExtensionsList, RTPHeaderExtensionsList);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::HeaderExtensionParametersList, RTPHeaderExtensionParametersList);
+      //ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::HeaderExtensionsList, RTPHeaderExtensionsList);
+      //ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::HeaderExtensionParametersList, RTPHeaderExtensionParametersList);
 
       ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::FECMechanism, RTPFECMechanism);
       ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::FECMechanismList, RTPFECMechanismList);
@@ -91,7 +91,7 @@ namespace ortc
       ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::RTCPFeedback, RTPRTCPFeedback);
       ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::RTCPFeedbackList, RTPRTCPFeedbackList);
 
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::CodecParametersList, RTPCodecParametersList);
+      //ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::CodecParametersList, RTPCodecParametersList);
 
       typedef IRTPTypes::CodecKinds RTPCodecKinds;
 
diff --git a/ortc/adapter/IPeerConnection.h b/ortc/adapter/IPeerConnection.h
index effe67f3..e7ae966a 100644
--- a/ortc/adapter/IPeerConnection.h
+++ b/ortc/adapter/IPeerConnection.h
@@ -255,6 +255,8 @@ namespace ortc
                                        const Optional<Configuration> &configuration = Optional<Configuration>()
                                        );
 
+      virtual PUID getID() const = 0;
+
       virtual IPeerConnectionSubscriptionPtr subscribe(IPeerConnectionDelegatePtr delegate) = 0;
 
       virtual PromiseWithDescriptionPtr createOffer(const Optional<OfferOptions> &configuration = Optional<OfferOptions>()) = 0;
diff --git a/ortc/adapter/ISessionDescription.h b/ortc/adapter/ISessionDescription.h
index e8c59a30..d387df00 100644
--- a/ortc/adapter/ISessionDescription.h
+++ b/ortc/adapter/ISessionDescription.h
@@ -353,7 +353,7 @@ namespace ortc
         ElementPtr toDebug() const;
         String hash() const;
 
-        static ICECandidatePtr createFromSDP(ElementPtr rootEl);
+        static ICECandidatePtr createFromJSON(ElementPtr rootEl) { return create(rootEl); }
         static ICECandidatePtr createFromSDP(const char *value);
         String toSDP() const;
         ElementPtr toJSON() const;
diff --git a/ortc/adapter/cpp/ortc_adapter_Helper.cpp b/ortc/adapter/cpp/ortc_adapter_Helper.cpp
index 3ecf45ba..200720bf 100644
--- a/ortc/adapter/cpp/ortc_adapter_Helper.cpp
+++ b/ortc/adapter/cpp/ortc_adapter_Helper.cpp
@@ -42,8 +42,10 @@
 #include <zsLib/Stringize.h>
 //#include <zsLib/XML.h>
 
+//#define USE_TEMPORAL_LAYERS
+//#define USE_SPATIAL_LAYERS
 
-namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(ortclib_adapter) } }
+namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_adapter) } }
 
 namespace ortc
 {
@@ -370,8 +372,6 @@ namespace ortc
       result->mRTCPFeedback = parameters.mRTCPFeedback;
       
       if (parameters.mParameters) {
-        auto supportedCodec = IRTPTypes::toSupportedCodec(parameters.mName);
-
         switch (supportedCodec)
         {
           case IRTPTypes::SupportedCodec_Unknown:         break;
@@ -869,8 +869,6 @@ namespace ortc
       for (auto iterPrimary = primaryList.begin(); iterPrimary != primaryList.end(); ++iterPrimary) {
         auto &primaryCodec = (*iterPrimary);
 
-        auto supportedType = IRTPTypes::toSupportedCodec(primaryCodec.mName);
-
         const RTPCodecCapability *foundSecondaryExact = nullptr;
         const RTPCodecCapability *foundSecondaryInexact = nullptr;
 
@@ -1049,8 +1047,6 @@ namespace ortc
       for (auto iterCodecParams = codecParameters.begin(); iterCodecParams != codecParameters.end(); ++iterCodecParams) {
         auto &codecParam = (*iterCodecParams);
 
-        auto supportedType = IRTPTypes::toSupportedCodec(codecParam.mName);
-
         const RTPCodecCapability *foundSecondaryExact = nullptr;
         const RTPCodecCapability *foundSecondaryInexact = nullptr;
 
@@ -1345,7 +1341,46 @@ namespace ortc
             }
           }
         }
+#ifdef USE_TEMPORAL_LAYERS
+        auto kind = UseRTPTypesHelper::getCodecsKind(parameters);
+        if (kind == ortc::IMediaStreamTrackTypes::Kind_Video) {
+          encoding.mEncodingID = "1";
+          encoding.mFramerateScale = 0.25;
+        }
+#endif
+#ifdef USE_SPATIAL_LAYERS
+        auto kind = UseRTPTypesHelper::getCodecsKind(parameters);
+        if (kind == ortc::IMediaStreamTrackTypes::Kind_Video) {
+          encoding.mEncodingID = "1";
+          encoding.mResolutionScale = 0.5;
+        }
+#endif
         parameters.mEncodings.push_back(encoding);
+#ifdef USE_TEMPORAL_LAYERS
+        if (kind == ortc::IMediaStreamTrackTypes::Kind_Video) {
+          IRTPTypes::EncodingParameters encoding;
+          encoding.mActive = true;
+          encoding.mEncodingID = "2";
+          encoding.mFramerateScale = 0.5;
+          encoding.mDependencyEncodingIDs.push_back("1");
+          parameters.mEncodings.push_back(encoding);
+          encoding.mActive = true;
+          encoding.mEncodingID = "3";
+          encoding.mFramerateScale = 1.0;
+          encoding.mDependencyEncodingIDs.push_back("2");
+          parameters.mEncodings.push_back(encoding);
+        }
+#endif
+#ifdef USE_SPATIAL_LAYERS
+        if (kind == ortc::IMediaStreamTrackTypes::Kind_Video) {
+          IRTPTypes::EncodingParameters encoding;
+          encoding.mActive = true;
+          encoding.mEncodingID = "2";
+          encoding.mResolutionScale = 1.0;
+          encoding.mDependencyEncodingIDs.push_back("1");
+          parameters.mEncodings.push_back(encoding);
+        }
+#endif
       }
     }
 
diff --git a/ortc/adapter/cpp/ortc_adapter_MediaStream.cpp b/ortc/adapter/cpp/ortc_adapter_MediaStream.cpp
index 8bf34d86..611da14f 100644
--- a/ortc/adapter/cpp/ortc_adapter_MediaStream.cpp
+++ b/ortc/adapter/cpp/ortc_adapter_MediaStream.cpp
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/adapter/internal/ortc_adapter_MediaStream.h>
 
 #include <ortc/internal/ortc_MediaStreamTrack.h>
@@ -38,10 +40,11 @@
 
 #include <ortc/services/IHelper.h>
 
+#include <zsLib/eventing/Log.h>
 #include <zsLib/Log.h>
 #include <zsLib/XML.h>
 
-namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(ortclib_adapter); } }
+namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_adapter); } }
 
 namespace ortc
 {
@@ -325,7 +328,8 @@ namespace ortc
         AutoRecursiveLock lock(*this);
         auto result = getTrackByID(track->id());
         if (nullptr != result) {
-          ZS_LOG_WARNING(Debug, log("already added track (not added again)") + IMediaStreamTrack::toDebug(track));
+          ZS_EVENTING_TRACE_OBJECT_PTR(Detail, track, "already added track (not added again)");
+          ZS_LOG_WARNING(Debug, log("already added track (not added again)"));
           return;
         }
         mTracks.push_back(MediaStreamTrack::convert(track));
diff --git a/ortc/adapter/cpp/ortc_adapter_PeerConnection.cpp b/ortc/adapter/cpp/ortc_adapter_PeerConnection.cpp
index 8e1c1072..4c123ece 100644
--- a/ortc/adapter/cpp/ortc_adapter_PeerConnection.cpp
+++ b/ortc/adapter/cpp/ortc_adapter_PeerConnection.cpp
@@ -29,8 +29,11 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/adapter/internal/ortc_adapter_PeerConnection.h>
 #include <ortc/adapter/internal/ortc_adapter_MediaStream.h>
+#include <ortc/adapter/internal/ortc_adapter_SDPParser.h>
 
 #include <ortc/internal/ortc_ORTC.h>
 #include <ortc/internal/ortc_RTPTypes.h>
@@ -52,7 +55,7 @@
 #pragma warning(3 : 4062)
 #endif //_MSC_VER
 
-namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(ortclib_adapter) } }
+namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_adapter) } }
 
 namespace ortc
 {
@@ -82,7 +85,7 @@ namespace ortc
 
         UseServicesHelper::debugAppend(resultEl, "ice gatherer", mGatherer ? mGatherer->getID() : 0);
         UseServicesHelper::debugAppend(resultEl, "ice transort", mTransport ? mTransport->getID() : 0);
-        UseServicesHelper::debugAppend(resultEl, "end of candidates", mRTPEndOfCandidates);
+        UseServicesHelper::debugAppend(resultEl, "end of candidates", mICEEndOfCandidates);
         UseServicesHelper::debugAppend(resultEl, "dtls transport", mDTLSTransport ? mDTLSTransport->getID() : 0);
         UseServicesHelper::debugAppend(resultEl, "srtp/sdes transport", mSRTPSDESTransport ? mSRTPSDESTransport->getID() : 0);
 
@@ -320,8 +323,8 @@ namespace ortc
                                      IPeerConnectionDelegatePtr delegate,
                                      const Optional<Configuration> &configuration
                                      ) :
-        SharedRecursiveLock(SharedRecursiveLock::create()),
-        MessageQueueAssociator(queue)
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create())
       {
         if (configuration.hasValue()) {
           mConfiguration = configuration.value();
@@ -1023,9 +1026,9 @@ namespace ortc
           auto &info = *((*iter).second);
 
           if (stats.hasStatType(IStatsReportTypes::StatsType_DataChannel)) {
-            for (auto iter = info.mDataChannels.begin(); iter != info.mDataChannels.end(); ++iter)
+            for (auto iterChannel = info.mDataChannels.begin(); iterChannel != info.mDataChannels.end(); ++iterChannel)
             {
-              auto dataChannelInfo = (*iter).second;
+              auto dataChannelInfo = (*iterChannel).second;
               promises.push_back(dataChannelInfo->mDataChannel->getStats(stats));
             }
           }
@@ -1979,6 +1982,55 @@ namespace ortc
             {
               auto found = mTransports.find(transport.mID);
               if (found == mTransports.end()) {
+
+                bool foundUsage = false;
+
+                // remote offered - but is it needed? if the remote bundles another transport then this one is not needed
+                for (auto iterLines = description->mRTPMediaLines.begin(); iterLines != description->mRTPMediaLines.end(); ++iterLines)
+                {
+                  auto &mediaLine = (*iterLines);
+                  if (mediaLine->mTransportID.hasData()) {
+                    if (mediaLine->mTransportID == transport.mID) foundUsage = true;
+
+                    auto foundExistingTransport = mTransports.find(mediaLine->mTransportID);
+                    if (foundExistingTransport != mTransports.end()) continue;
+                  }
+
+                  if (mediaLine->mDetails) {
+                    if (mediaLine->mDetails->mPrivateTransportID.hasData()) {
+                      if (transport.mID == mediaLine->mDetails->mPrivateTransportID) {
+                        foundUsage = true;
+                        break;
+                      }
+                    }
+                  }
+                }
+
+                for (auto iterLines = description->mSCTPMediaLines.begin(); iterLines != description->mSCTPMediaLines.end(); ++iterLines)
+                {
+                  auto &mediaLine = (*iterLines);
+                  if (mediaLine->mTransportID.hasData()) {
+                    if (mediaLine->mTransportID == transport.mID) foundUsage = true;
+
+                    auto foundExistingTransport = mTransports.find(mediaLine->mTransportID);
+                    if (foundExistingTransport != mTransports.end()) continue;
+                  }
+
+                  if (mediaLine->mDetails) {
+                    if (mediaLine->mDetails->mPrivateTransportID.hasData()) {
+                      if (transport.mID == mediaLine->mDetails->mPrivateTransportID) {
+                        foundUsage = true;
+                        break;
+                      }
+                    }
+                  }
+                }
+
+                if (!foundUsage) {
+                  ZS_LOG_DEBUG(log("transport offered but media lines only use bundled usages thus transport offered is not needed") + transportInfo->toDebug());
+                  continue;
+                }
+
                 // no matching local transport, create one
                 transportInfo = getTransportFromPool(transport.mID);
                 transportInfo->mNegotiationState = NegotiationState_RemoteOffered;
@@ -2076,6 +2128,44 @@ namespace ortc
             try {
               // scope: setup ICE
               {
+                for (auto iterCandidates = transport.mRTP->mICECandidates.begin(); iterCandidates != transport.mRTP->mICECandidates.end(); ++iterCandidates)
+                {
+                  auto &candidate = (*iterCandidates);
+                  if (!candidate) continue;
+                  auto hash = candidate->hash();
+                  if (transportInfo->mRTP.mProcessedICECandidates.end() != transportInfo->mRTP.mProcessedICECandidates.find(hash)) {
+                    transportInfo->mRTP.mProcessedICECandidates.insert(hash);
+                    transportInfo->mRTP.mTransport->addRemoteCandidate(*candidate);
+                  }
+                }
+                if (transport.mRTP->mEndOfCandidates) {
+                  if (!transportInfo->mRTP.mICEEndOfCandidates) {
+                    IICEGathererTypes::CandidateComplete complete;
+                    transportInfo->mRTP.mTransport->addRemoteCandidate(complete);
+                    transportInfo->mRTP.mICEEndOfCandidates = true;
+                  }
+                }
+
+                if (hasRTCPICE) {
+                  for (auto iterCandidates = transport.mRTCP->mICECandidates.begin(); iterCandidates != transport.mRTCP->mICECandidates.end(); ++iterCandidates)
+                  {
+                    auto &candidate = (*iterCandidates);
+                    if (!candidate) continue;
+                    auto hash = candidate->hash();
+                    if (transportInfo->mRTCP.mProcessedICECandidates.end() != transportInfo->mRTCP.mProcessedICECandidates.find(hash)) {
+                      transportInfo->mRTCP.mProcessedICECandidates.insert(hash);
+                      transportInfo->mRTCP.mTransport->addRemoteCandidate(*candidate);
+                    }
+                  }
+                  if (transport.mRTCP->mEndOfCandidates) {
+                    if (!transportInfo->mRTCP.mICEEndOfCandidates) {
+                      IICEGathererTypes::CandidateComplete complete;
+                      transportInfo->mRTCP.mTransport->addRemoteCandidate(complete);
+                      transportInfo->mRTCP.mICEEndOfCandidates = true;
+                    }
+                  }
+                }
+
                 transportInfo->mRTP.mTransport->start(transportInfo->mRTP.mGatherer, *(transport.mRTP->mICEParameters), options);
                 if (hasRTCPICE) {
                   transportInfo->mRTCP.mTransport->start(transportInfo->mRTCP.mGatherer, *useRTCPICEParams, options);
@@ -2238,13 +2328,20 @@ namespace ortc
               }
             }
 
+            if (mediaLine.mDetails) {
+              switch (mediaLine.mDetails->mMediaDirection)
+              {
+                case ISDPTypes::Direction_SendReceive: mediaLineInfo->mDirection = ISessionDescriptionTypes::MediaDirection_SendReceive; break;
+                case ISDPTypes::Direction_None:
+                case ISDPTypes::Direction_Send:        mediaLineInfo->mDirection = ISessionDescriptionTypes::MediaDirection_ReceiveOnly; break;
+                case ISDPTypes::Direction_Receive:     mediaLineInfo->mDirection = ISessionDescriptionTypes::MediaDirection_SendOnly; break;
+              }
+            }
             mediaLineInfo->mMediaType = mediaLine.mMediaType;
             mediaLineInfo->mBundledTransportID = mediaLine.mTransportID;
             mediaLineInfo->mPrivateTransportID = mediaLine.mDetails ? mediaLine.mDetails->mPrivateTransportID : String();
             mediaLineInfo->mRemoteSenderCapabilities = make_shared<IRTPTypes::Capabilities>(*mediaLine.mSenderCapabilities);
             mediaLineInfo->mRemoteReceiverCapabilities = make_shared<IRTPTypes::Capabilities>(*mediaLine.mReceiverCapabilities);
-            mediaLineInfo->mBundledTransportID = mediaLine.mTransportID;
-            mediaLineInfo->mPrivateTransportID = mediaLine.mDetails ? mediaLine.mDetails->mPrivateTransportID : String();
 
             if ((!mediaLineInfo->mRemoteSenderCapabilities) ||
                 (!mediaLineInfo->mRemoteReceiverCapabilities)) {
@@ -2409,16 +2506,26 @@ namespace ortc
               goto reject_sender;
             }
 
+            IRTPTransportPtr useRtpTransport = (transportInfo->mRTP.mDTLSTransport ? IRTPTransportPtr(transportInfo->mRTP.mDTLSTransport) : IRTPTransportPtr(transportInfo->mRTP.mSRTPSDESTransport));
+            IRTCPTransportPtr useRtcpTransport = (transportInfo->mRTP.mDTLSTransport ? IRTCPTransportPtr(transportInfo->mRTCP.mDTLSTransport) : IRTCPTransportPtr(transportInfo->mRTCP.mTransport));
+
             if (!receiverInfo->mReceiver) {
               receiverInfo->mReceiver = IRTPReceiver::create(
                                                              mThisWeak.lock(),
                                                              IMediaStreamTrackTypes::toKind(mediaLine->mMediaType),
-                                                             transportInfo->mRTP.mDTLSTransport ? IRTPTransportPtr(transportInfo->mRTP.mDTLSTransport) : IRTPTransportPtr(transportInfo->mRTP.mSRTPSDESTransport),
-                                                             transportInfo->mRTP.mDTLSTransport ? IRTCPTransportPtr(transportInfo->mRTCP.mDTLSTransport) : IRTCPTransportPtr(transportInfo->mRTCP.mTransport)
+                                                             useRtpTransport,
+                                                             useRtcpTransport
                                                              );
               eventReceiver = true;
             }
 
+            auto existingTransport = receiverInfo->mReceiver->transport();
+            PUID existingTransportID = (existingTransport ? existingTransport->getID() : 0);
+            PUID useTransportID = (useRtpTransport ? useRtpTransport->getID() : 0);
+            if (existingTransportID != useTransportID) {
+              receiverInfo->mReceiver->setTransport(useRtpTransport, useRtcpTransport);
+            }
+
             try {
               fillRTCPSSRC(*filteredParams);
               receiverInfo->mReceiver->receive(*filteredParams);
@@ -2430,7 +2537,6 @@ namespace ortc
               goto reject_sender;
             }
 
-
             auto existingSet = convertToSet(receiverInfo->mMediaStreams);
 
             MediaStreamSet added;
@@ -2438,8 +2544,8 @@ namespace ortc
 
             calculateDelta(*existingSet, sender.mMediaStreamIDs, added, removed);
 
-            for (auto iter = added.begin(); iter != added.end(); ++iter) {
-              auto &id = (*iter);
+            for (auto iterAdded = added.begin(); iterAdded != added.end(); ++iterAdded) {
+              auto &id = (*iterAdded);
 
               UseMediaStreamPtr stream;
 
@@ -2456,8 +2562,8 @@ namespace ortc
               stream->notifyAddTrack(receiverInfo->mReceiver->track());
             }
 
-            for (auto iter = removed.begin(); iter != removed.end(); ++iter) {
-              auto &id = (*iter);
+            for (auto iterRemoved = removed.begin(); iterRemoved != removed.end(); ++iterRemoved) {
+              auto &id = (*iterRemoved);
 
               UseMediaStreamPtr stream;
 
@@ -2604,6 +2710,7 @@ namespace ortc
                   mediaLineInfo->mSCTPTransport->setOptions(mConfiguration.mSCTPSocketOptions);
                 }
               }
+
               if (!mediaLineInfo->mRemotePort.hasValue()) {
                 mediaLineInfo->mRemotePort = mediaLine.mPort;
                 mediaLineInfo->mSCTPTransport->start(*mediaLine.mCapabilities, mediaLine.mPort);
@@ -3415,7 +3522,7 @@ namespace ortc
         ZS_LOG_TRACE(log("step - create offer"));
 
         if (mPendingMethods.size() < 1) {
-          ZS_LOG_TRACE(log("skipping step to creeate offer (no pending methods)"));
+          ZS_LOG_TRACE(log("skipping step to create offer (no pending methods)"));
           return true;
         }
 
@@ -3488,8 +3595,8 @@ namespace ortc
             transport->mRTCP = make_shared<ISessionDescription::Transport::Parameters>();
 
             // always get end of candidates state before candidates
-            transport->mRTP->mEndOfCandidates = (IICEGathererTypes::State_Complete == transportInfo->mRTCP.mGatherer->state());
-            transport->mRTP->mICECandidates = *convertCandidateList(*(transportInfo->mRTCP.mGatherer->getLocalCandidates()));
+            transport->mRTCP->mEndOfCandidates = (IICEGathererTypes::State_Complete == transportInfo->mRTCP.mGatherer->state());
+            transport->mRTCP->mICECandidates = *convertCandidateList(*(transportInfo->mRTCP.mGatherer->getLocalCandidates()));
           }
           transport->mUseMux = true;
 
@@ -3507,6 +3614,7 @@ namespace ortc
           if ((isSDP) ||
               (mediaInfo->mPrivateTransportID.hasData())) {
             mediaLine->mDetails = make_shared<ISessionDescriptionTypes::RTPMediaLine::Details>();
+            mediaLine->mDetails->mMediaDirection = mediaInfo->mDirection;
             mediaLine->mDetails->mPrivateTransportID = mediaInfo->mPrivateTransportID;
             if (isSDP) {
               mediaLine->mDetails->mInternalIndex = mediaInfo->mLineIndex;
@@ -3936,6 +4044,15 @@ namespace ortc
 
         for (auto iter = mTransports.begin(); iter != mTransports.end(); ++iter) {
           auto &transportInfo = (*iter).second;
+          
+          switch (transportInfo->mNegotiationState)
+          {
+            case NegotiationState_PendingOffer:
+            case NegotiationState_Agreed:
+            case NegotiationState_LocalOffered:
+            case NegotiationState_RemoteOffered:    break;
+            case NegotiationState_Rejected:         continue;
+          }
 
           figureOutState(iceTransportStateCount, transportInfo->mRTP.mTransport);
           figureOutState(iceTransportStateCount, transportInfo->mRTCP.mTransport);
@@ -4031,9 +4148,9 @@ namespace ortc
               (0 == iceTransportStateCount[IICETransportTypes::State_Failed]) &&
               (0 == dtlsTranportStateCount[IDTLSTransportTypes::State_Failed]) &&
               (0 == iceTransportStateCount[IICETransportTypes::State_Disconnected]) &&
-              ((0 > iceTransportStateCount[IICETransportTypes::State_Closed]) ||
-               (0 > dtlsTranportStateCount[IDTLSTransportTypes::State_Closed]))) {
-            peerConnectionState = IPeerConnectionTypes::PeerConnectionState_New;
+              ((iceTransportStateCount[IICETransportTypes::State_Closed] > 0) ||
+               (dtlsTranportStateCount[IDTLSTransportTypes::State_Closed] > 0))) {
+            peerConnectionState = IPeerConnectionTypes::PeerConnectionState_Closed;
           }
 
           if (((iceTransportStateCount[IICETransportTypes::State_Checking] > 0) ||
diff --git a/ortc/adapter/cpp/ortc_adapter_SDPParser.cpp b/ortc/adapter/cpp/ortc_adapter_SDPParser.cpp
index 85575323..a3ed1a3c 100644
--- a/ortc/adapter/cpp/ortc_adapter_SDPParser.cpp
+++ b/ortc/adapter/cpp/ortc_adapter_SDPParser.cpp
@@ -50,7 +50,7 @@
 #pragma warning(3 : 4062)
 #endif //_MSC_VER
 
-namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(ortclib_adapter) } }
+namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_adapter) } }
 
 namespace ortc
 {
@@ -363,7 +363,7 @@ namespace ortc
           case Attribute_MSIDSemantic:      return AttributeLevel_Session;
           case Attribute_ICEUFrag:          return AttributeLevel_SessionAndMedia;
           case Attribute_ICEPwd:            return AttributeLevel_SessionAndMedia;
-          case Attribute_ICEOptions:        return AttributeLevel_Session;
+          case Attribute_ICEOptions:        return AttributeLevel_SessionAndMedia;
           case Attribute_ICELite:           return AttributeLevel_Session;
           case Attribute_Candidate:         return AttributeLevel_Media;
           case Attribute_EndOfCandidates:   return AttributeLevel_Media;
@@ -436,7 +436,21 @@ namespace ortc
       }
 
       //-----------------------------------------------------------------------
-      const char *ISDPTypes::toString(Directions direction)
+      const char *ISDPTypes::toStringForA(Directions direction)
+      {
+        switch (direction)
+        {
+        case Direction_None:        return "inactive";
+        case Direction_Send:        return "sendonly";
+        case Direction_Receive:     return "recvonly";
+        case Direction_SendReceive: return "sendrecv";
+        }
+
+        ORTC_THROW_NOT_SUPPORTED_ERRROR("unknown direction");
+      }
+
+      //-----------------------------------------------------------------------
+      const char *ISDPTypes::toStringForRID(Directions direction)
       {
         switch (direction)
         {
@@ -464,7 +478,10 @@ namespace ortc
         if (str.isEmpty()) return Direction_None;
 
         for (size_t index = 0; index <= (sizeof(check)/sizeof(check[0])); ++index) {
-          if (0 == str.compareNoCase(toString(check[index]))) return check[index];
+          if (0 == str.compareNoCase(toStringForA(check[index]))) return check[index];
+        }
+        for (size_t index = 0; index <= (sizeof(check) / sizeof(check[0])); ++index) {
+          if (0 == str.compareNoCase(toStringForRID(check[index]))) return check[index];
         }
 
         ORTC_THROW_INVALID_PARAMETERS("Invalid parameter value: " + str);
@@ -887,7 +904,8 @@ namespace ortc
       }
 
       //-----------------------------------------------------------------------
-      ISDPTypes::AICEOptionsLine::AICEOptionsLine(const char *value)
+      ISDPTypes::AICEOptionsLine::AICEOptionsLine(MLinePtr mline, const char *value) :
+        AMediaLine(mline)
       {
         IHelper::SplitMap split;
         IHelper::split(String(value), split, " ");
@@ -896,7 +914,6 @@ namespace ortc
         ORTC_THROW_INVALID_PARAMETERS_IF(split.size() < 1);
 
         for (auto iter = split.begin(); iter != split.end(); ++iter) {
-          auto &value = (*iter).second;
           mTags.push_back(value);
         }
       }
@@ -953,21 +970,21 @@ namespace ortc
         if (split.size() > 8) {
           for (size_t index = 10; index < split.size(); index += 2)
           {
-            ExtensionPair value(split[index], split[index + 1]);
-            if (0 == value.first.compareNoCase("raddr")) {
-              mRelAddr = value.second;
+            ExtensionPair valuePair(split[index], split[index + 1]);
+            if (0 == valuePair.first.compareNoCase("raddr")) {
+              mRelAddr = valuePair.second;
               continue;
             }
-            if (0 == value.first.compareNoCase("rport")) {
+            if (0 == valuePair.first.compareNoCase("rport")) {
               try {
-                mRelPort = Numeric<decltype(mRelPort.mType)>(value.second);
+                mRelPort = Numeric<decltype(mRelPort.mType)>(valuePair.second);
               } catch (const Numeric<decltype(mRelPort.mType)>::ValueOutOfRange &) {
                 ORTC_THROW_INVALID_PARAMETERS("rel port value out of range: " + split[9]);
               }
               continue;
             }
 
-            mExtensionPairs.push_back(value);
+            mExtensionPairs.push_back(valuePair);
           }
         }
       }
@@ -1188,7 +1205,7 @@ namespace ortc
           case Direction_Send:
           case Direction_Receive:       {
             result.append("/");
-            result.append(ISDPTypes::toString(mDirection));
+            result.append(ISDPTypes::toStringForA(mDirection));
             break;
           }
         }
@@ -1584,13 +1601,12 @@ namespace ortc
           case ISDPTypes::Direction_None:
           case ISDPTypes::Direction_SendReceive:  return String();
           case ISDPTypes::Direction_Send:         
-          case ISDPTypes::Direction_Receive:      result.append(ISDPTypes::toString(mDirection)); break;
+          case ISDPTypes::Direction_Receive:      result.append(ISDPTypes::toStringForRID(mDirection)); break;
         }
         bool inserted = false;
         if (mPayloadTypes.size() > 0) {
           result.append(" ");
           result.append("pt=");
-          bool first = true;
           for (auto iter = mPayloadTypes.begin(); iter != mPayloadTypes.end(); ++iter) {
             auto &pt = (*iter);
             if (inserted) result.append(",");
diff --git a/ortc/adapter/cpp/ortc_adapter_SDPParser_DescriptionToSDP.cpp b/ortc/adapter/cpp/ortc_adapter_SDPParser_DescriptionToSDP.cpp
index 24511d71..1326b91d 100644
--- a/ortc/adapter/cpp/ortc_adapter_SDPParser_DescriptionToSDP.cpp
+++ b/ortc/adapter/cpp/ortc_adapter_SDPParser_DescriptionToSDP.cpp
@@ -50,7 +50,7 @@
 #pragma warning(3 : 4062)
 #endif //_MSC_VER
 
-namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(ortclib_adapter) } }
+namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_adapter) } }
 
 namespace ortc
 {
@@ -142,7 +142,6 @@ namespace ortc
         }
 
         for (auto iter = bundles.begin(); iter != bundles.end(); ++iter) {
-          auto &bundleID = (*iter).first;
           auto &bundleSet = (*iter).second;
 
           if (bundleSet.size() < 2) continue;
@@ -167,31 +166,46 @@ namespace ortc
                                          ISDPTypes::MLine &ioMLine
                                          )
       {
-        auto &result = ioSDP;
         auto &mline = ioMLine;
 
         ORTC_THROW_INVALID_PARAMETERS_IF(!mediaLine.mDetails);
 
+        bool foundPort = false;
+
         mline.mMedia = mediaLine.mMediaType;
         mline.mPort = 9;
         mline.mProtoStr = mediaLine.mDetails->mProtocol;
         mline.mProto = ISDPTypes::toProtocolType(mline.mProtoStr);
 
-        // figure out the port based upon the associated transport's ICE candidates
-        for (auto iter = description.mTransports.begin(); iter != description.mTransports.end(); ++iter) {
-          auto &transport = *(*iter);
-          if (0 != transport.mID.compareNoCase(mediaLine.mTransportID)) continue;
+        if (mediaLine.mDetails) {
+          if (mediaLine.mDetails->mConnectionData) {
+            if (mediaLine.mDetails->mConnectionData->mRTP) {
+              if (mediaLine.mDetails->mConnectionData->mRTP->mPort.hasValue()) {
+                mline.mPort = mediaLine.mDetails->mConnectionData->mRTP->mPort.value();
+                foundPort = true;
+              }
+            }
+          }
+        }
 
-          if (!transport.mRTP) break;
-          if (transport.mRTP->mICECandidates.size() < 1) break;
+        if (!foundPort) {
+          // figure out the port based upon the associated transport's ICE candidates
+          for (auto iter = description.mTransports.begin(); iter != description.mTransports.end(); ++iter) {
+            auto &transport = *(*iter);
+            if (0 != transport.mID.compareNoCase(mediaLine.mTransportID)) continue;
 
-          for (auto iterCandidate = transport.mRTP->mICECandidates.begin(); iterCandidate != transport.mRTP->mICECandidates.end(); ++iterCandidate) {
-            auto &candidate = *(*iterCandidate);
-            if (IICETypes::CandidateType_Host != candidate.mCandidateType) continue;
-            mline.mPort = candidate.mPort;
-          }
+            if (!transport.mRTP) break;
+            if (transport.mRTP->mICECandidates.size() < 1) break;
 
-          if (9 != mline.mPort) break;
+            for (auto iterCandidate = transport.mRTP->mICECandidates.begin(); iterCandidate != transport.mRTP->mICECandidates.end(); ++iterCandidate) {
+              auto &candidate = *(*iterCandidate);
+              if (IICETypes::CandidateType_Host != candidate.mCandidateType) continue;
+              mline.mPort = candidate.mPort;
+              break;
+            }
+
+            if (9 != mline.mPort) break;
+          }
         }
       }
 
@@ -203,7 +217,6 @@ namespace ortc
                                         ISDPTypes::MLine &ioMLine
                                         )
       {
-        auto &result = ioSDP;
         auto &mline = ioMLine;
 
         createSDPMediaLineBase(description, mediaLine, ioSDP, ioMLine);
@@ -226,7 +239,6 @@ namespace ortc
                                          ISDPTypes::MLine &ioMLine
                                          )
       {
-        auto &result = ioSDP;
         auto &mline = ioMLine;
 
         createSDPMediaLineBase(description, mediaLine, ioSDP, ioMLine);
@@ -652,7 +664,6 @@ namespace ortc
                                    ISDPTypes::MLine &ioMLine
                                    )
       {
-        auto &result = ioSDP;
         auto &mline = ioMLine;
 
         if (mediaLine.mReceiverCapabilities) {
diff --git a/ortc/adapter/cpp/ortc_adapter_SDPParser_GenerateSDP.cpp b/ortc/adapter/cpp/ortc_adapter_SDPParser_GenerateSDP.cpp
index ded6ce9b..03e8c127 100644
--- a/ortc/adapter/cpp/ortc_adapter_SDPParser_GenerateSDP.cpp
+++ b/ortc/adapter/cpp/ortc_adapter_SDPParser_GenerateSDP.cpp
@@ -50,7 +50,7 @@
 #pragma warning(3 : 4062)
 #endif //_MSC_VER
 
-namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(ortclib_adapter) } }
+namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_adapter) } }
 
 namespace ortc
 {
@@ -151,7 +151,7 @@ namespace ortc
         appendLine(ioResult, 'c', ISDPTypes::CLine::toString(sdp.mCLine));
 
         if (sdp.mMediaDirection.hasValue()) {
-          appendLine(ioResult, 'a', ISDPTypes::toString(sdp.mMediaDirection.value()));
+          appendLine(ioResult, 'a', ISDPTypes::toStringForA(sdp.mMediaDirection.value()));
         }
 
         if ((sdp.mICELite.hasValue()) &&
@@ -202,7 +202,7 @@ namespace ortc
           appendLine(ioResult, 'a', ISDPTypes::AMaxMessageSizeLine::toString(mline.mAMaxMessageSize));
 
           if (mline.mMediaDirection.hasValue()) {
-            appendLine(ioResult, 'a', ISDPTypes::toString(mline.mMediaDirection.value()));
+            appendLine(ioResult, 'a', ISDPTypes::toStringForA(mline.mMediaDirection.value()));
           }
           if ((mline.mRTCPMux.hasValue()) &&
               (mline.mRTCPMux.value())) {
diff --git a/ortc/adapter/cpp/ortc_adapter_SDPParser_ParseSDP.cpp b/ortc/adapter/cpp/ortc_adapter_SDPParser_ParseSDP.cpp
index ddebeb68..842dd85c 100644
--- a/ortc/adapter/cpp/ortc_adapter_SDPParser_ParseSDP.cpp
+++ b/ortc/adapter/cpp/ortc_adapter_SDPParser_ParseSDP.cpp
@@ -48,7 +48,7 @@
 #pragma warning(3 : 4062)
 #endif //_MSC_VER
 
-namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(ortclib_adapter) } }
+namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_adapter) } }
 
 namespace ortc
 {
@@ -278,8 +278,6 @@ namespace ortc
       //-----------------------------------------------------------------------
       void SDPParser::parseLinesDetails(SDP &sdp)
       {
-        AttributeLevels currentLevel = AttributeLevel_Session;
-
         MLinePtr currentMLine;
         ASSRCLinePtr currentSourceLine;
 
@@ -336,7 +334,7 @@ namespace ortc
             case Attribute_MSIDSemantic:      info.mLineValue = make_shared<AMSIDSemanticLine>(info.mValue); break;
             case Attribute_ICEUFrag:          info.mLineValue = make_shared<AICEUFragLine>(currentMLine, info.mValue); break;
             case Attribute_ICEPwd:            info.mLineValue = make_shared<AICEPwdLine>(currentMLine, info.mValue); break;
-            case Attribute_ICEOptions:        info.mLineValue = make_shared<AICEOptionsLine>(info.mValue); break;
+            case Attribute_ICEOptions:        info.mLineValue = make_shared<AICEOptionsLine>(currentMLine, info.mValue); break;
             case Attribute_ICELite:           break;  // session level flag; struct not needed
             case Attribute_Candidate:         info.mLineValue = make_shared<ACandidateLine>(currentMLine, info.mValue); break;
             case Attribute_EndOfCandidates:   info.mLineValue = make_shared<AMediaFlagLine>(currentMLine); break;
diff --git a/ortc/adapter/cpp/ortc_adapter_SDPParser_SDPToDescription.cpp b/ortc/adapter/cpp/ortc_adapter_SDPParser_SDPToDescription.cpp
index c35445fe..a5854cfc 100644
--- a/ortc/adapter/cpp/ortc_adapter_SDPParser_SDPToDescription.cpp
+++ b/ortc/adapter/cpp/ortc_adapter_SDPParser_SDPToDescription.cpp
@@ -50,7 +50,7 @@
 #pragma warning(3 : 4062)
 #endif //_MSC_VER
 
-namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(ortclib_adapter) } }
+namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_adapter) } }
 
 namespace ortc
 {
@@ -314,7 +314,7 @@ namespace ortc
           auto &acandidate = *(*iter);
           auto candidate = convertCandidate(acandidate);
 
-          if (0 == acandidate.mComponentID) {
+          if (acandidate.mComponentID < 2) {
             outRTPCandidates.push_back(candidate);
           } else {
             if (!ioRTCPTransport) {
@@ -473,7 +473,7 @@ namespace ortc
           bool found = false;
           for (auto iter = description.mTransports.begin(); iter != description.mTransports.end(); ++iter) {
             auto &transport = *(*iter);
-            if (transport.mID != foundBundleID) continue;
+            if (transport.mID != searchForTransportID) continue;
             mediaLine.mTransportID = foundBundleID;
             found = true;
           }
@@ -857,7 +857,6 @@ namespace ortc
           if (!rtpMap) {
             auto reservedType = IRTPTypes::toReservedCodec(pt);
             auto supportedType = IRTPTypes::toSupportedCodec(reservedType);
-            auto codecKind = IRTPTypes::getCodecKind(supportedType);
 
             if (IRTPTypes::SupportedCodec_Unknown == supportedType) {
               ZS_LOG_WARNING(Debug, internal::slog("codec payload type is not understood") + ZS_PARAM("payload type", pt));
diff --git a/ortc/adapter/cpp/ortc_adapter_SessionDescription.cpp b/ortc/adapter/cpp/ortc_adapter_SessionDescription.cpp
index 9d98bfd0..839002f1 100644
--- a/ortc/adapter/cpp/ortc_adapter_SessionDescription.cpp
+++ b/ortc/adapter/cpp/ortc_adapter_SessionDescription.cpp
@@ -48,7 +48,7 @@
 #pragma warning(3 : 4062)
 #endif //_MSC_VER
 
-namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(ortclib_adapter) } }
+namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_adapter) } }
 
 namespace ortc
 {
diff --git a/ortc/adapter/cpp/ortc_adapter_adapter.cpp b/ortc/adapter/cpp/ortc_adapter_adapter.cpp
index f6acc9b5..3d533d81 100644
--- a/ortc/adapter/cpp/ortc_adapter_adapter.cpp
+++ b/ortc/adapter/cpp/ortc_adapter_adapter.cpp
@@ -41,7 +41,7 @@
 //#include <zsLib/XML.h>
 
 
-namespace ortc { namespace adapter { ZS_IMPLEMENT_SUBSYSTEM(ortclib_adapter); } }
+namespace ortc { namespace adapter { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_adapter); } }
 
 namespace ortc
 {
diff --git a/ortc/adapter/internal/ortc_adapter_PeerConnection.h b/ortc/adapter/internal/ortc_adapter_PeerConnection.h
index 75e28e36..971aa455 100644
--- a/ortc/adapter/internal/ortc_adapter_PeerConnection.h
+++ b/ortc/adapter/internal/ortc_adapter_PeerConnection.h
@@ -179,13 +179,16 @@ namespace ortc
         typedef std::map<PUID, DataChannelInfoPtr> DataChannelMap;
         ZS_DECLARE_PTR(DataChannelMap);
 
+        typedef std::set<String> HashSet;
+
         struct TransportInfo
         {
           struct Details
           {
             IICEGathererPtr mGatherer;
             IICETransportPtr mTransport;
-            bool mRTPEndOfCandidates {false};
+            HashSet mProcessedICECandidates;
+            bool mICEEndOfCandidates {false};
 
             IDTLSTransportPtr mDTLSTransport;
             ISRTPSDESTransportPtr mSRTPSDESTransport;
@@ -223,6 +226,8 @@ namespace ortc
         {
           String mMediaType;
 
+          ISessionDescriptionTypes::MediaDirections mDirection {ISessionDescriptionTypes::MediaDirection_SendReceive};
+           
           IHelper::IDPreferences mIDPreference {IHelper::IDPreference_First};
           IRTPTypes::CapabilitiesPtr mLocalSenderCapabilities;
           IRTPTypes::CapabilitiesPtr mLocalReceiverCapabilities;
@@ -357,8 +362,8 @@ namespace ortc
                        const Noop &,
                        IMessageQueuePtr queue
                        ) :
-          SharedRecursiveLock(SharedRecursiveLock::create()),
-          MessageQueueAssociator(queue) {}
+          MessageQueueAssociator(queue),
+          SharedRecursiveLock(SharedRecursiveLock::create()) {}
 
         void init();
 
@@ -375,6 +380,8 @@ namespace ortc
                                         const Optional<Configuration> &configuration = Optional<Configuration>()
                                         );
 
+        virtual PUID getID() const override { return mID; }
+
         virtual IPeerConnectionSubscriptionPtr subscribe(IPeerConnectionDelegatePtr delegate) override;
 
         virtual PromiseWithDescriptionPtr createOffer(const Optional<OfferOptions> &configuration = Optional<OfferOptions>()) override;
diff --git a/ortc/adapter/internal/ortc_adapter_SDPParser.h b/ortc/adapter/internal/ortc_adapter_SDPParser.h
index 56e37942..91221642 100644
--- a/ortc/adapter/internal/ortc_adapter_SDPParser.h
+++ b/ortc/adapter/internal/ortc_adapter_SDPParser.h
@@ -240,7 +240,8 @@ namespace ortc
           Direction_SendReceive = Direction_Send | Direction_Receive,
         };
 
-        static const char *toString(Directions direction);
+        static const char *toStringForA(Directions direction);
+        static const char *toStringForRID(Directions direction);
         static Directions toDirection(const char *direction);
         static bool isValid(
                             Directions direction,
@@ -492,12 +493,12 @@ namespace ortc
         };
 
         // https://tools.ietf.org/html/rfc5245#section-15.5
-        struct AICEOptionsLine : public ALine
+        struct AICEOptionsLine : public AMediaLine
         {
           StringList mTags;
 
-          AICEOptionsLine(const Noop &) {}
-          AICEOptionsLine(const char *value);
+          AICEOptionsLine(const Noop &) : AMediaLine(nullptr) {}
+          AICEOptionsLine(MLinePtr mline, const char *value);
           String toString() const;
           static String toString(const AICEOptionsLinePtr &line) { if (!line) return String(); return line->toString(); }
         };
diff --git a/ortc/adapter/types.h b/ortc/adapter/types.h
index 1be4f820..7213c298 100644
--- a/ortc/adapter/types.h
+++ b/ortc/adapter/types.h
@@ -33,6 +33,9 @@
 
 #include <ortc/types.h>
 
+#define __STRUCT__ struct
+#define interface __STRUCT__
+
 namespace ortc
 {
   namespace adapter
diff --git a/ortc/cpp/ortc.cpp b/ortc/cpp/ortc.cpp
index a0383c17..07d39dfb 100644
--- a/ortc/cpp/ortc.cpp
+++ b/ortc/cpp/ortc.cpp
@@ -29,48 +29,53 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/types.h>
 #include <ortc/internal/ortc.h>
+
+#include <ortc/adapter/internal/ortc_adapter_adapter.h>
+
 #include <ortc/internal/ortc.events.h>
 #include <zsLib/Log.h>
 
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_webrtc) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_dtlstransport) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_icegatherer) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_icegatherer_router) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_icetransport) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_icetransport_controller) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_mediadevices) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_mediastreamtrack) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_rtp_rtcp_packet) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_rtplistener) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_rtpmediaengine) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_rtpreceiver) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_rtpsender) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_rtptypes) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_sctp_datachannel) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_srtp) }
-namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(ortclib_stats) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_webrtc) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_dtls_transport) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_ice_gatherer) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_ice_gatherer_router) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_ice_transport) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_ice_transport_controller) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_media_devices) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_media_engine) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_media_stream_track) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_rtp_rtcp_packet) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_rtp_listener) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_rtp_receiver) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_rtp_sender) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_rtp_types) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_sctp_data_channel) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_srtp) }
+namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_stats) }
 
 ZS_EVENTING_EXCLUSIVE(OrtcLib);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_webrtc, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_dtlstransport, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_icegatherer, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_icegatherer_router, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_icetransport, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_icetransport_controller, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_mediadevices, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_mediastreamtrack, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_rtp_rtcp_packet, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_rtplistener, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_rtpmediaengine, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_rtpreceiver, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_rtpsender, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_rtptypes, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_sctp_datachannel, Debug);
-ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(ortclib_srtp, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_webrtc, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_dtlstransport, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_ice_gatherer, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_ice_gatherer_router, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_ice_transport, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_ice_transport_controller, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_media_devices, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_media_engine, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_media_stream_track, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_rtp_rtcp_packet, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_rtp_listener, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_rtp_receiver, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_rtp_sender, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_rtp_types, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_sctp_data_channel, Debug);
+ZS_EVENTING_SUBSYSTEM_DEFAULT_LEVEL(org_ortc_srtp, Debug);
 ZS_EVENTING_EXCLUSIVE(x);
 
 ZS_EVENTING_EXCLUSIVE(OrtcLibStatsReport);
@@ -83,8 +88,85 @@ namespace ortc
   {
     void initSubsystems()
     {
-      ZS_GET_SUBSYSTEM_LOG_LEVEL(ZS_GET_OTHER_SUBSYSTEM(ortc, ortclib));
-      ZS_GET_SUBSYSTEM_LOG_LEVEL(ZS_GET_OTHER_SUBSYSTEM(ortc, ortclib_webrtc));
+      ZS_GET_SUBSYSTEM_LOG_LEVEL(ZS_GET_OTHER_SUBSYSTEM(ortc, org_ortc));
+      ZS_GET_SUBSYSTEM_LOG_LEVEL(ZS_GET_OTHER_SUBSYSTEM(ortc, org_ortc_webrtc));
     }
   }
 }
+
+ZS_DECLARE_TEAR_AWAY_IMPLEMENT(ortc::IDataChannel, ortc::internal::DataChannel::TearAwayData)
+ZS_DECLARE_TEAR_AWAY_IMPLEMENT(ortc::IRTPListener, ortc::internal::RTPListener::TearAwayData)
+ZS_DECLARE_TEAR_AWAY_IMPLEMENT(ortc::ISCTPTransport, ortc::internal::SCTPTransport::TearAwayData)
+
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::IDataChannelDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::IDTLSTransportDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::IDTMFSenderDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::IICEGathererDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::IICETransportDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::IMediaDevicesDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::IMediaStreamTrackDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::IRTPListenerDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::IRTPReceiverDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::IRTPSenderDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::ISCTPTransportDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::ISCTPTransportListenerDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::ISRTPSDESTransportDelegate)
+
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::adapter::IPeerConnectionDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::adapter::IMediaStreamDelegate)
+
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IDataChannelAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IDTLSTransportAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IGathererAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IICETransportAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::ITransportControllerAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IMediaDeviceCaptureDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IMediaDeviceRenderDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IMediaDevicesAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IMediaStreamTrackAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IRTPDecoderDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IRTPDecoderAysncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IRTPEncoderAysncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IRTPEncoderDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IRTPListenerAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IRTPReceiverChannelAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IRTPSenderAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::IRTPSenderChannelAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::ISCTPTransportForDataChannelDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::ISecureTransportDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::ISRTPSDESTransportAsyncDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::ISRTPTransportDelegate)
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::internal::ISCTPTransportAsyncDelegate)
+
+ZS_DECLARE_PROXY_IMPLEMENT(ortc::adapter::internal::IPeerConnectionAsyncDelegate)
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IDTLSTransportDelegate, ortc::IDTLSTransportSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IDTMFSenderDelegate, ortc::IDTMFSenderSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IDataChannelDelegate, ortc::IDataChannelSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IICEGathererDelegate, ortc::IICEGathererSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IICETransportDelegate, ortc::IICETransportSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IMediaDevicesDelegate, ortc::IMediaDevicesSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IMediaStreamTrackDelegate, ortc::IMediaStreamTrackSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IMediaElementDelegate, ortc::IMediaElementSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IMediaStreamTrackAsyncMediaDelegate, ortc::IMediaStreamTrackMediaSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IMediaStreamTrackSyncMediaDelegate, ortc::IMediaStreamTrackMediaSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IMediaStreamTrackSelectorDelegate, ortc::IMediaStreamTrackSelectorSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IRTPListenerDelegate, ortc::IRTPListenerSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IRTPReceiverDelegate, ortc::IRTPReceiverSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::IRTPSenderDelegate, ortc::IRTPSenderSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::ISCTPTransportDelegate, ortc::ISCTPTransportSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::ISCTPTransportListenerDelegate, ortc::ISCTPTransportListenerSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::ISRTPSDESTransportDelegate, ortc::ISRTPSDESTransportSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::adapter::IMediaStreamDelegate, ortc::adapter::IMediaStreamSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::adapter::IPeerConnectionDelegate, ortc::adapter::IPeerConnectionSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::internal::IMediaDeviceCaptureDelegate, ortc::internal::IMediaDeviceCaptureSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::internal::IMediaDeviceRenderDelegate, ortc::internal::IMediaDeviceRenderSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::internal::IMediaStreamTrackRTPDelegate, ortc::internal::IMediaStreamTrackRTPSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::internal::IMediaStreamTrackMonitorDelegate, ortc::internal::IMediaStreamTrackMonitorSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::internal::IRTPDecoderDelegate, ortc::internal::IRTPDecoderSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::internal::IRTPEncoderDelegate, ortc::internal::IRTPEncoderSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::internal::ISRTPTransportDelegate, ortc::internal::ISRTPTransportSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::internal::ISecureTransportDelegate, ortc::internal::ISecureTransportSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_IMPLEMENT(ortc::internal::ISCTPTransportForDataChannelDelegate, ortc::internal::ISCTPTransportForDataChannelSubscription)
+
+
diff --git a/ortc/cpp/ortc.events.json b/ortc/cpp/ortc.events.json
index 429ced3a..7277e26b 100644
--- a/ortc/cpp/ortc.events.json
+++ b/ortc/cpp/ortc.events.json
@@ -73,14 +73,25 @@
         "ortc_ICETransportController.cpp",
         "ortc_ORTC.cpp",
         "ortc_RTPListener.cpp",
-        "ortc_RTPMediaEngine.cpp",
+        "ortc_MediaEngine.cpp",
+        "ortc_MediaDeviceCaptureAudio.cpp",
+        "ortc_MediaDeviceCaptureVideo.cpp",
+        "ortc_MediaDeviceRenderAudio.cpp",
+        "ortc_MediaStreamTrack.cpp",
+        "ortc_MediaStreamTrackMonitor.cpp",
+        "ortc_RTPEncoderAudio.cpp",
+        "ortc_RTPEncoderVideo.cpp",
+        "ortc_RTPDecoderAudio.cpp",
+        "ortc_RTPDecoderVideo.cpp",
         "ortc_RTPReceiver.cpp",
         "ortc_RTPReceiverChannel.cpp",
         "ortc_RTPSender.cpp",
         "ortc_RTPSenderChannel.cpp",
         "ortc_SCTPTransport.cpp",
         "ortc_SCTPTransportListener.cpp",
-        "ortc_SRTPTransport.cpp"
+        "ortc_SRTPTransport.cpp",
+        "ortc_RTPPacket.cpp",
+        "ortc_RTCPPacket.cpp"
       ]
     },
     "channels": {
@@ -137,10 +148,19 @@
           "name": "IceTransportController"
         },
         {
-          "name": "RtpListener"
+          "name": "MediaEngine"
+        },
+        {
+          "name": "MediaStreamTrackMonitor" 
+        },
+        {
+          "name":  "RtpPacket"
+        },
+        {
+          "name":  "RtcpPacket"
         },
         {
-          "name": "RtpMediaEngine"
+          "name": "RtpListener"
         },
         {
           "name": "RtpReceiver",
@@ -208,6 +228,15 @@
         {
           "name": "Deliver"
         },
+        {
+          "name": "Parse"
+        },
+        {
+          "name": "Install"
+        },
+        {
+          "name": "Remove"
+        },
         {
           "name": "Event"
         },
diff --git a/ortc/cpp/ortc_Capabilities.cpp b/ortc/cpp/ortc_Capabilities.cpp
index b1d5a83f..bc808764 100644
--- a/ortc/cpp/ortc_Capabilities.cpp
+++ b/ortc/cpp/ortc_Capabilities.cpp
@@ -46,7 +46,7 @@
 #include <cryptopp/sha.h>
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc) }
 
 namespace ortc
 {
diff --git a/ortc/cpp/ortc_Certificate.cpp b/ortc/cpp/ortc_Certificate.cpp
index 1d9318c4..ae60a595 100644
--- a/ortc/cpp/ortc_Certificate.cpp
+++ b/ortc/cpp/ortc_Certificate.cpp
@@ -45,7 +45,7 @@
 #include <zsLib/Log.h>
 #include <zsLib/XML.h>
 
-#include <cryptopp/Integer.h>
+#include <cryptopp/integer.h>
 #include <cryptopp/sha.h>
 
 #include <openssl/bio.h>
@@ -57,7 +57,7 @@
 
 #include <sstream>
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc) }
 
 namespace ortc
 {
@@ -347,8 +347,8 @@ namespace ortc
       SharedRecursiveLock(SharedRecursiveLock::create()),
       mKeygenAlgorithm(keygenAlgorithm ? keygenAlgorithm->clone()->toElement() : ElementPtr()),
       mName(ISettings::getString(ORTC_SETTING_CERTIFICATE_DEFAULT_KEY_NAME)),
-      mHash(ISettings::getString(ORTC_SETTING_CERTIFICATE_DEFAULT_HASH)),
       mNamedCurve(ISettings::getString(ORTC_SETTING_CERTIFICATE_DEFAULT_KEY_NAMED_CURVE)),
+      mHash(ISettings::getString(ORTC_SETTING_CERTIFICATE_DEFAULT_HASH)),
       mKeyLength(ISettings::getUInt(ORTC_SETTING_CERTIFICATE_DEFAULT_KEY_LENGTH_IN_BITS)),
       mRandomBits(ISettings::getUInt(ORTC_SETTING_CERTIFICATE_DEFAULT_SERIAL_RANDOM_BITS)),
       mPublicExponentLength(ISettings::getString(ORTC_SETTING_CERTIFICATE_DEFAULT_PUBLIC_EXPONENT)),
diff --git a/ortc/cpp/ortc_Constraints.cpp b/ortc/cpp/ortc_Constraints.cpp
index 5b529de1..c3203af2 100644
--- a/ortc/cpp/ortc_Constraints.cpp
+++ b/ortc/cpp/ortc_Constraints.cpp
@@ -48,7 +48,7 @@
 #include <cryptopp/sha.h>
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc) }
 
 namespace ortc
 {
@@ -710,4 +710,44 @@ namespace ortc
     return hasher->finalizeAsString();
   }
 
+  //---------------------------------------------------------------------------
+  void IConstraints::ConstrainString::exact(StringList &values) const
+  {
+    if (mValue.hasValue()) {
+      if (mValue.value().mValue.hasValue()) {
+        values.push_back(mValue.value().mValue.value());
+        return;
+      }
+      if (mValue.value().mValues.hasValue()) {
+        auto &source = mValue.value().mValues.value();
+        values.insert(values.end(), source.begin(), source.end());
+        return;
+      }
+    }
+
+    if (!mParameters.hasValue()) return;
+    if (!mParameters.value().mExact.hasValue()) return;
+    if (mParameters.value().mExact.value().mValue.hasValue()) {
+      values.push_back(mValue.value().mValue.value());
+      return;
+    }
+    if (!mParameters.value().mExact.value().mValues.hasValue()) return;
+    auto &source = mParameters.value().mExact.value().mValues.value();
+    values.insert(values.end(), source.begin(), source.end());
+  }
+
+  //---------------------------------------------------------------------------
+  void IConstraints::ConstrainString::ideal(StringList &values) const
+  {
+    if (!mParameters.hasValue()) return;
+    if (!mParameters.value().mIdeal.hasValue()) return;
+    if (mParameters.value().mIdeal.value().mValue.hasValue()) {
+      values.push_back(mValue.value().mValue.value());
+      return;
+    }
+    if (!mParameters.value().mIdeal.value().mValues.hasValue()) return;
+    auto &source = mParameters.value().mIdeal.value().mValues.value();
+    values.insert(values.end(), source.begin(), source.end());
+  }
+
 }
diff --git a/ortc/cpp/ortc_DTLSTransport.cpp b/ortc/cpp/ortc_DTLSTransport.cpp
index 19fe8a78..c1fff9eb 100644
--- a/ortc/cpp/ortc_DTLSTransport.cpp
+++ b/ortc/cpp/ortc_DTLSTransport.cpp
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_DTLSTransport.h>
 #include <ortc/internal/ortc_ICETransport.h>
 #include <ortc/internal/ortc_Certificate.h>
@@ -72,7 +74,7 @@
 #define ASSERT(x)
 #endif //_DEBUG
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_dtlstransport) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_dtls_transport) }
 
 namespace ortc
 {
@@ -114,7 +116,7 @@ namespace ortc
 
     // Maximum number of pending packets in the queue. Packets are read immediately
     // after they have been written, so a capacity of "1" is sufficient.
-    static const size_t kMaxPendingPackets = 1;
+    //static const size_t kMaxPendingPackets = 1;
 
     static bool isDtlsPacket(const BYTE *data, size_t len) {
       return (len >= kDtlsRecordHeaderLen && (data[0] > 19 && data[0] < 64));
@@ -387,7 +389,9 @@ namespace ortc
                                  ) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create()),
       mICETransport(ICETransport::convert(iceTransport)),
+      mSecureTransportSubscriptions(decltype(mSecureTransportSubscriptions)::create()),
       mComponent(mICETransport->component()),
       mMaxPendingDTLSBuffer(ISettings::getUInt(ORTC_SETTING_DTLS_TRANSPORT_MAX_PENDING_DTLS_BUFFER)),
       mMaxPendingRTPPackets(ISettings::getUInt(ORTC_SETTING_DTLS_TRANSPORT_MAX_PENDING_RTP_PACKETS)),
@@ -1031,7 +1035,8 @@ namespace ortc
                     puid, id, mID,
                     enum, viaComponent, zsLib::to_underlying(viaComponent)
                     );
-      packet->trace(__func__);
+
+      ZS_EVENTING_TRACE_OBJECT(Trace, *packet, "dtls received stun packet");
 
       ZS_LOG_TRACE(log("handle receive STUN packet") + packet->toDebug())
 
@@ -3020,17 +3025,17 @@ namespace ortc
       if (ctx == NULL)
         return NULL;
 
-      SSL_CTX_set_min_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_VERSION : TLS1_VERSION);
+      SSL_CTX_set_min_proto_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_VERSION : TLS1_VERSION);
       switch (ssl_max_version_) {
         case SSL_PROTOCOL_TLS_10:
-          SSL_CTX_set_max_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_VERSION : TLS1_VERSION);
+          SSL_CTX_set_max_proto_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_VERSION : TLS1_VERSION);
           break;
         case SSL_PROTOCOL_TLS_11:
-          SSL_CTX_set_max_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_VERSION : TLS1_1_VERSION);
+          SSL_CTX_set_max_proto_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_VERSION : TLS1_1_VERSION);
           break;
         case SSL_PROTOCOL_TLS_12:
         default:
-          SSL_CTX_set_max_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
+          SSL_CTX_set_max_proto_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
           break;
       }
 
diff --git a/ortc/cpp/ortc_DTMFSender.cpp b/ortc/cpp/ortc_DTMFSender.cpp
index c9721079..53bfce38 100644
--- a/ortc/cpp/ortc_DTMFSender.cpp
+++ b/ortc/cpp/ortc_DTMFSender.cpp
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_DTMFSender.h>
 #include <ortc/internal/ortc_RTPSender.h>
 #include <ortc/internal/ortc_ORTC.h>
@@ -55,7 +57,7 @@
 #endif //_DEBUG
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpsender) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_rtp_sender) }
 
 namespace ortc
 {
@@ -152,6 +154,7 @@ namespace ortc
                            ) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create()),
       mRTPSender(RTPSender::convert(sender))
     {
       ZS_LOG_DETAIL(debug("created"))
@@ -538,6 +541,7 @@ namespace ortc
       }
 
       mRTPSenderSubscription = sender->subscribe(mThisWeak.lock());
+
       return true;
     }
 
diff --git a/ortc/cpp/ortc_DataChannel.cpp b/ortc/cpp/ortc_DataChannel.cpp
index 6f2a4f71..287a3557 100644
--- a/ortc/cpp/ortc_DataChannel.cpp
+++ b/ortc/cpp/ortc_DataChannel.cpp
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_DataChannel.h>
 #include <ortc/internal/ortc_SCTPTransport.h>
 #include <ortc/internal/ortc_Helper.h>
@@ -59,7 +61,7 @@
 #endif //_DEBUG
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_sctp_datachannel) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_sctp_data_channel) }
 
 namespace ortc
 {
@@ -275,15 +277,16 @@ namespace ortc
                              ) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create()),
       mDataTransport(transport),
-      mParameters(params),
       mIncoming(ORTC_SCTP_INVALID_DATA_CHANNEL_SESSION_ID != sessionID),
-      mSessionID(ORTC_SCTP_INVALID_DATA_CHANNEL_SESSION_ID == sessionID ? (params->mID.hasValue() ? params->mID.value() : ORTC_SCTP_INVALID_DATA_CHANNEL_SESSION_ID) : sessionID)
+      mSessionID(ORTC_SCTP_INVALID_DATA_CHANNEL_SESSION_ID == sessionID ? (params->mID.hasValue() ? params->mID.value() : ORTC_SCTP_INVALID_DATA_CHANNEL_SESSION_ID) : sessionID),
+      mParameters(params)
     {
       ZS_EVENTING_5(
                     x, i, Detail, DataChannelCreate, ol, DataChannel, Start,
                     puid, id, mID,
-                    puid, dataTransportId, ((bool)transport) ? transport->getID() : 0,
+                    puid, dataTransportId, ((bool)transport) ? transport->getRealID() : 0,
                     string, parameters, ((bool)mParameters) ? IHelper::toString(mParameters->createElement("params")) : String(),
                     bool, incoming, mIncoming,
                     word, sessionId, mSessionID
@@ -603,7 +606,7 @@ namespace ortc
                     dword, timestamp, packet->mTimestamp,
                     int, flags, packet->mFlags,
                     buffer, packet, ((bool)packet->mBuffer) ? packet->mBuffer->BytePtr() : NULL,
-                    size, size, ((bool)packet->mBuffer) ? packet->mBuffer->SizeInBytes() : static_cast<size_t>(0)
+                    size, size, ((bool)packet->mBuffer) ? size_t(SafeInt<unsigned int>(packet->mBuffer->SizeInBytes())) : 0
                     );
 
       // scope: obtain whatever data is required inside lock to process SCTP packet
@@ -690,12 +693,20 @@ namespace ortc
     //-------------------------------------------------------------------------
     void DataChannel::notifyClosed()
     {
-      ZS_EVENTING_1(x, i, Trace, DataChannelSCTPTransportRequestNotifyClosed, ol, DataChannel, InternalEvent, puid, id, mID);
+      ZS_EVENTING_1(x, i, Trace, DataChannelSCTPTransportInternalNotifyClosed, ol, DataChannel, InternalEvent, puid, id, mID);
 
       ZS_LOG_TRACE(log("notify closed"));
       IDataChannelAsyncDelegateProxy::create(mThisWeak.lock())->onNotifiedClosed();
     }
 
+    void DataChannel::notifyRemapFailure()
+    {
+      ZS_EVENTING_1(x, i, Trace, DataChannelSCTPTransportInternalNotifyRemapFailure, ol, DataChannel, InternalEvent, puid, id, mID);
+
+      ZS_LOG_TRACE(log("notify remap failure"));
+      IDataChannelAsyncDelegateProxy::create(mThisWeak.lock())->onNotifiedRemapFailure();
+    }
+
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -734,13 +745,27 @@ namespace ortc
     //-------------------------------------------------------------------------
     void DataChannel::onNotifiedClosed()
     {
-      ZS_LOG_TRACE(log("on notified closed"))
+      ZS_LOG_TRACE(log("on notified closed"));
+
+      AutoRecursiveLock lock(*this);
+      mNotifiedClosed = true;
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    void DataChannel::onNotifiedRemapFailure()
+    {
+      ZS_LOG_TRACE(log("on notified remap failure"));
 
       AutoRecursiveLock lock(*this);
+
+      setError(UseHTTP::HTTPStatusCode_Conflict, "Data channel moved from locally created SCTP transport to remote incoming SCTP transport except incoming transport already has a data channel with the same ID mapped.");
+
       mNotifiedClosed = true;
       cancel();
     }
 
+
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -846,7 +871,7 @@ namespace ortc
       IHelper::debugAppend(resultEl, "default subscription", (bool)mDefaultSubscription);
 
       auto dataTransport = mDataTransport.lock();
-      IHelper::debugAppend(resultEl, "data transport", dataTransport ? dataTransport->getID() : 0);
+      IHelper::debugAppend(resultEl, "data transport", dataTransport ? dataTransport->getRealID() : 0);
       IHelper::debugAppend(resultEl, "data transport subscription", (bool)mDataTransportSubscription);
 
       IHelper::debugAppend(resultEl, "state", toString(mCurrentState));
@@ -1599,7 +1624,7 @@ namespace ortc
                     dword, timestamp, packet.mTimestamp,
                     int, flags, packet.mFlags,
                     buffer, packet, ((bool)packet.mBuffer) ? packet.mBuffer->BytePtr() : NULL,
-                    size, size, ((bool)packet.mBuffer) ? SafeInt<unsigned int>(packet.mBuffer->SizeInBytes()) : 0
+                    size, size, ((bool)packet.mBuffer) ? size_t(SafeInt<unsigned int>(packet.mBuffer->SizeInBytes())) : 0
                     );
 
 
diff --git a/ortc/cpp/ortc_Helper.cpp b/ortc/cpp/ortc_Helper.cpp
index 981ac64f..77cbfbcc 100644
--- a/ortc/cpp/ortc_Helper.cpp
+++ b/ortc/cpp/ortc_Helper.cpp
@@ -46,7 +46,7 @@ namespace std {
 }
 #endif //_WIN32
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc) }
 
 namespace ortc
 {
diff --git a/ortc/cpp/ortc_ICEGatherer.cpp b/ortc/cpp/ortc_ICEGatherer.cpp
index 11e2d47a..2be15c7d 100644
--- a/ortc/cpp/ortc_ICEGatherer.cpp
+++ b/ortc/cpp/ortc_ICEGatherer.cpp
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_ICEGatherer.h>
 #include <ortc/internal/ortc_ICETransport.h>
 #include <ortc/internal/ortc_Helper.h>
@@ -74,7 +76,7 @@
 #include <netinet6/in6_var.h>
 #endif //HAVE_NETINIT6_IN6_VAR_H
 
-#ifdef _ANDROID
+#ifdef ANDROID
 #include <ortc/internal/ifaddrs-android.h>
 #else
 #endif
@@ -84,9 +86,9 @@
 #pragma comment(lib, "Iphlpapi.lib")
 #endif //HAVE_IPHLPAPI_H
 
-#ifdef WINRT
+#ifdef WINUWP
 using namespace Windows::Networking::Connectivity;
-#endif //WINRT
+#endif //WINUWP
 
 #ifdef __APPLE__
 #include <TargetConditionals.h>
@@ -94,7 +96,7 @@ using namespace Windows::Networking::Connectivity;
 
 #define ORTC_ICEGATHERER_TO_ORDER(xInterfaceType, xOrder) ((((ULONG)xInterfaceType)*100)+xOrder)
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_icegatherer) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_ice_gatherer) }
 
 namespace ortc
 {
@@ -581,23 +583,24 @@ namespace ortc
                              const make_private &,
                              const ConstructorOptions &options
                              ) :
-      SharedRecursiveLock(SharedRecursiveLock::create()),
       MessageQueueAssociator(options.mQueue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create()),
       mGathererRouter(ICEGathererRouter::create()),
+      mComponent(options.mComponent),
       mUsernameFrag(options.mUsernameFragment.hasData() ? options.mUsernameFragment : IHelper::randomString(ISettings::getUInt(ORTC_SETTING_GATHERER_USERNAME_FRAG_LENGTH))),
       mPassword(options.mPassword.hasData() ? options.mPassword : IHelper::randomString(ISettings::getUInt(ORTC_SETTING_GATHERER_PASSWORD_LENGTH))),
-      mCreateTCPCandidates(ISettings::getBool(ORTC_SETTING_GATHERER_CREATE_TCP_CANDIDATES)),
-      mOptions(options.mOptions),
-      mComponent(options.mComponent),
       mRTPGatherer(options.mRTPGatherer),
+      mOptions(options.mOptions),
+      mCreateTCPCandidates(ISettings::getBool(ORTC_SETTING_GATHERER_CREATE_TCP_CANDIDATES)),
+      mPortRestriction(RangeSelection::createFromSetting(ORTC_SETTING_GATHERER_PORT_RESTRICTIONS)),
       mReflexiveInactivityTime(Seconds(ISettings::getUInt(ORTC_SETTING_GATHERER_REFLEXIVE_INACTIVITY_TIMEOUT_IN_SECONDS))),
       mRelayInactivityTime(Seconds(ISettings::getUInt(ORTC_SETTING_GATHERER_RELAY_INACTIVITY_TIMEOUT_IN_SECONDS))),
-      mMaxBufferingTime(Seconds(ISettings::getUInt(ORTC_SETTING_GATHERER_MAX_INCOMING_PACKET_BUFFERING_TIME_IN_SECONDS))),
-      mMaxTotalBuffers(ISettings::getUInt(ORTC_SETTING_GATHERER_MAX_TOTAL_INCOMING_PACKET_BUFFERING)),
+      mGatherPassiveTCP(ISettings::getBool(ORTC_SETTING_GATHERER_GATHER_PASSIVE_TCP_CANDIDATES)),
       mMaxTCPBufferingSizePendingConnection(ISettings::getUInt(ORTC_SETTING_GATHERER_MAX_PENDING_OUTGOING_TCP_SOCKET_BUFFERING_IN_BYTES)),
       mMaxTCPBufferingSizeConnected(ISettings::getUInt(ORTC_SETTING_GATHERER_MAX_CONNECTED_TCP_SOCKET_BUFFERING_IN_BYTES)),
-      mGatherPassiveTCP(ISettings::getBool(ORTC_SETTING_GATHERER_GATHER_PASSIVE_TCP_CANDIDATES)),
-      mPortRestriction(RangeSelection::createFromSetting(ORTC_SETTING_GATHERER_PORT_RESTRICTIONS))
+      mMaxBufferingTime(Seconds(ISettings::getUInt(ORTC_SETTING_GATHERER_MAX_INCOMING_PACKET_BUFFERING_TIME_IN_SECONDS))),
+      mMaxTotalBuffers(ISettings::getUInt(ORTC_SETTING_GATHERER_MAX_TOTAL_INCOMING_PACKET_BUFFERING))
     {
       mSTUNPacketParseOptions = STUNPacket::ParseOptions(STUNPacket::RFC_AllowAll, false, "ortc::ICEGatherer", mID);
 
@@ -1153,7 +1156,7 @@ namespace ortc
 
       auto route = (*found).second;
 
-      route->trace(__func__, "remove");
+      ZS_EVENTING_TRACE_OBJECT(Trace, *route, "remove route");
 
       ZS_LOG_DEBUG(log("removing route") + route->toDebug())
 
@@ -1627,7 +1630,7 @@ namespace ortc
                           puid, id, mID,
                           puid, routerRouteId, buffer->mRouterRoute->mID
                           );
-            buffer->mSTUNPacket->trace(__func__);
+            ZS_EVENTING_TRACE_OBJECT(Debug, *(buffer->mSTUNPacket), "buffer clean-up");
           }
 
           ZS_LOG_TRACE(log("buffering for too long (or too many buffered packets)") + ZS_PARAM("buffer time", (now - buffer->mTimestamp)) + buffer->toDebug())
@@ -2705,7 +2708,7 @@ namespace ortc
 
       mResolvedHostIPs.clear();
 
-      stepGetHostIPs_WinRT();
+      stepGetHostIPs_WinUWP();
       stepGetHostIPs_Win32();
       stepGetHostIPs_ifaddr();
 
@@ -2720,14 +2723,14 @@ namespace ortc
     }
 
     //-------------------------------------------------------------------------
-    void ICEGatherer::stepGetHostIPs_WinRT()
+    void ICEGatherer::stepGetHostIPs_WinUWP()
     {
-#if defined(WINRT) && !defined(HAVE_GETADAPTERADDRESSES)
+#if defined(WINUWP) && !defined(HAVE_GETADAPTERADDRESSES)
       ZS_EVENTING_1(x, i, Debug, IceGathererStep, ol, IceGatherer, Step, puid, id, mID);
 
       // http://stackoverflow.com/questions/10336521/query-local-ip-address
 
-      // Use WinRT GetHostNames to search for IP addresses
+      // Use WinUWP GetHostNames to search for IP addresses
       {
         typedef std::map<String, bool> HostNameMap;
         typedef std::list<ConnectionProfile ^> ConnectionProfileList;
@@ -2847,7 +2850,7 @@ namespace ortc
           }
         }
       }
-#endif //defined(WINRT) && !defined(HAVE_GETADAPTERADDRESSES)
+#endif //defined(WINUWP) && !defined(HAVE_GETADAPTERADDRESSES)
     }
     
     //-------------------------------------------------------------------------
@@ -5305,11 +5308,11 @@ namespace ortc
             setState(InternalState_Gathering);
           }
 
-          CandidatePtr sendCandidate(make_shared<Candidate>(*otherCandidate));
+          CandidatePtr sendNotifyCandidate(make_shared<Candidate>(*otherCandidate));
 
           ZS_LOG_DEBUG(log("notify replacement local candidate") + otherCandidate->toDebug())
           if (pThis) {
-            mSubscriptions.delegate()->onICEGathererLocalCandidate(mThisWeak.lock(), sendCandidate);
+            mSubscriptions.delegate()->onICEGathererLocalCandidate(mThisWeak.lock(), sendNotifyCandidate);
           }
           return;
         }
@@ -5896,10 +5899,10 @@ namespace ortc
 
             // scope: search for existing route
             {
-              auto route = installRoute(localCandidate, remoteIP, UseICETransportPtr());
-              if (route) {
-                routerRoute = route->mRouterRoute;
-                transport = route->mTransport.lock();
+              auto routeInstalled = installRoute(localCandidate, remoteIP, UseICETransportPtr());
+              if (routeInstalled) {
+                routerRoute = routeInstalled->mRouterRoute;
+                transport = routeInstalled->mTransport.lock();
 
                 if (transport) goto found_transport;
               }
@@ -5973,7 +5976,7 @@ namespace ortc
                       puid, routerRouteId, routerRoute->mID,
                       bool, wasBuffered, false
                       );
-        stunPacket->trace(__func__);
+        ZS_EVENTING_TRACE_OBJECT(Trace, *stunPacket, "forwarding packet to transport");
         transport->notifyPacket(routerRoute, stunPacket);
         return SecureByteBlockPtr();
       }
@@ -5996,7 +5999,7 @@ namespace ortc
                       );
 
         ZS_LOG_ERROR(Debug, log("candidate password integrity failed") + ZS_PARAM("request", stunPacket->toDebug()) + ZS_PARAM("reply", response->toDebug()))
-        response->trace(__func__);
+        ZS_EVENTING_TRACE_OBJECT(Debug, *response, "candidate password integrity check failed");
         return response->packetize(STUNPacket::RFC_5245_ICE);
       }
 
@@ -6023,7 +6026,7 @@ namespace ortc
                       puid, id, mID,
                       puid, routerRouteId, routerRoute->mID
                       );
-        stunPacket->trace(__func__);
+        ZS_EVENTING_TRACE_OBJECT(Trace, *stunPacket, "buffering packet where no transport is installed");
 
         ZS_LOG_TRACE(log("buffering stun packet until ice transport installed to handle packet") + packet->toDebug())
         mBufferedPackets.push_back(packet);
@@ -6329,8 +6332,8 @@ namespace ortc
               if ((hostPort->mCandidateTCPPassive == sentFromLocalCandidate) ||
                   (hostPort->mCandidateTCPActive == sentFromLocalCandidate)) {
                 // search for an incoming or outgoing TCP connection that satisfies the requirement
-                for (auto iter = hostPort->mTCPPorts.begin(); iter != hostPort->mTCPPorts.end(); ++iter) {
-                  auto tcpPort = (*iter).second.second;
+                for (auto iterTcpPorts = hostPort->mTCPPorts.begin(); iterTcpPorts != hostPort->mTCPPorts.end(); ++iterTcpPorts) {
+                  auto tcpPort = (*iterTcpPorts).second.second;
                   auto tcpPortTransport = tcpPort->mTransport.lock();
 
                   if (tcpPort->mRemoteIP != remoteIP) continue; // must be connecting to/from same remote location
@@ -6450,12 +6453,12 @@ namespace ortc
             goto failed_resolve_local_candidate;
           }
 
-          route->trace(__func__, "install route");
+          ZS_EVENTING_TRACE_OBJECT(Trace, *route, "install route");
 
           ZS_LOG_TRACE(log("installing route") + route->toDebug());
 
           ZS_EVENTING_4(
-                        x, i, Debug, IceGathererInstallQuickRoute, ol, IceGatherer, Receive,
+                        x, i, Debug, IceGathererInstallQuickRoute, ol, IceGatherer, Install,
                         puid, id, mID,
                         pointer, candidate, search.first.get(),
                         string, ip, search.second.string(),
@@ -6521,7 +6524,7 @@ namespace ortc
         auto route = (*current).second;
         if (route->mTransportID != transportID) continue;
 
-        route->trace(__func__, "remove all related");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "need to remove route because of unbinding previous transport");
 
         ZS_LOG_WARNING(Detail, log("need to remove route because of unbinding previous transport") + route->toDebug())
 
@@ -7099,11 +7102,14 @@ namespace ortc
     #pragma mark
 
     //-------------------------------------------------------------------------
-    void ICEGatherer::Route::trace(const char *function, const char *message) const
+    void ICEGatherer::Route::trace(
+                                   const char *function,
+                                   const char *message
+                                   ) const
     {
       if (mLocalCandidate) {
         ZS_EVENTING_20(
-                       x, i, Trace, IceGathererRouteTrace, ol, IceGatherer, Info,
+                       x, i, Basic, IceGathererRouteTrace, ol, IceGatherer, Info,
                        puid, routeId, mID,
                        string, callingMethod, function,
                        string, message, message,
@@ -7128,7 +7134,7 @@ namespace ortc
 
       } else {
         ZS_EVENTING_20(
-                       x, i, Trace, IceGathererRouteTrace, ol, IceGatherer, Info,
+                       x, i, Basic, IceGathererRouteTrace, ol, IceGatherer, Info,
                        puid, routeId, mID,
                        string, callingMethod, function,
                        string, message, message,
diff --git a/ortc/cpp/ortc_ICEGathererRouter.cpp b/ortc/cpp/ortc_ICEGathererRouter.cpp
index 2df3212e..e096c7a9 100644
--- a/ortc/cpp/ortc_ICEGathererRouter.cpp
+++ b/ortc/cpp/ortc_ICEGathererRouter.cpp
@@ -40,7 +40,7 @@
 
 #include <zsLib/XML.h>
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_icegatherer_router) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_ice_gatherer_router) }
 
 namespace ortc
 {
@@ -139,7 +139,7 @@ namespace ortc
                         string, remoteIp, remoteIP.string()
                         );
 
-          route->trace(__func__, "found");
+          ZS_EVENTING_TRACE_OBJECT(Insane, *route, "found route");
           ZS_LOG_TRACE(log("route found") + route->toDebug() + ZS_PARAM("create route", createRouteIfNeeded))
           return route;
         }
@@ -189,7 +189,7 @@ namespace ortc
                     word, localCandidatePort, ((bool)localCandidate) ? localCandidate->mPort : static_cast<WORD>(0),
                     string, remoteIp, remoteIP.string()
                     );
-      route->trace(__func__, "created");
+      ZS_EVENTING_TRACE_OBJECT(Trace, *route, "route created");
 
       mRoutes[search] = route;
 
@@ -224,7 +224,6 @@ namespace ortc
         auto remoteIP = ((*current).first).second;
 
         if (route) {
-          //IceGathererRouterInternalEvent(__func__, mID, "keep", candidateHash, NULL, 0, remoteIP.string());
           ZS_EVENTING_6(
                         x, i, Trace, IceGathererRouterInternalEvent, ol, IceGathererRouter, InternalEvent,
                         puid, id, mID,
@@ -234,12 +233,11 @@ namespace ortc
                         word, localCandidatePort, 0,
                         string, remoteIp, remoteIP.string()
                         );
-          route->trace(__func__, "keep");
+          ZS_EVENTING_TRACE_OBJECT(Insane, *route, "route still in use (not pruning)");
           ZS_LOG_TRACE(log("route still in use") + ZS_PARAM("candidate hash", candidateHash) + ZS_PARAM("remote ip", remoteIP.string()))
           continue;
         }
 
-        //IceGathererRouterInternalEvent(__func__, mID, "prune", candidateHash, NULL, 0, remoteIP.string());
         ZS_EVENTING_6(
                       x, i, Trace, IceGathererRouterInternalEvent, ol, IceGathererRouter, InternalEvent,
                       puid, id, mID,
@@ -329,28 +327,8 @@ namespace ortc
                                          ) const
     {
       if (mLocalCandidate) {
-        /*
-        IceGathererRouterRouteTrace(
-                                                  __func__,
-                                                  function,
-                                                  message,
-                                                  mID,
-                                                  mLocalCandidate->mInterfaceType,
-                                                  mLocalCandidate->mFoundation,
-                                                  mLocalCandidate->mPriority,
-                                                  mLocalCandidate->mUnfreezePriority,
-                                                  IICETypes::toString(mLocalCandidate->mProtocol),
-                                                  mLocalCandidate->mIP,
-                                                  mLocalCandidate->mPort,
-                                                  IICETypes::toString(mLocalCandidate->mCandidateType),
-                                                  IICETypes::toString(mLocalCandidate->mTCPType),
-                                                  mLocalCandidate->mRelatedAddress,
-                                                  mLocalCandidate->mRelatedPort,
-                                                  mRemoteIP.string()
-                                                  );
-                                                  */
         ZS_EVENTING_15(
-                       x, i, Trace, IceGathererRouterRouteTrace, ol, IceGathererRouter, Info,
+                       x, i, Basic, IceGathererRouterRouteTrace, ol, IceGathererRouter, Info,
                        puid, routeId, mID,
                        string, callingMethod, function,
                        string, message, message,
@@ -368,28 +346,8 @@ namespace ortc
                        string, remoteIp, mRemoteIP.string()
                        );
       } else {
-        /*
-        EventWriteOrtcIceGathererRouterRouteTrace(
-                                                  __func__,
-                                                  function,
-                                                  message,
-                                                  mID,
-                                                  NULL,
-                                                  NULL,
-                                                  0,
-                                                  0,
-                                                  NULL,
-                                                  NULL,
-                                                  0,
-                                                  NULL,
-                                                  NULL,
-                                                  NULL,
-                                                  0,
-                                                  mRemoteIP.string()
-                                                  );
-                                                  */
         ZS_EVENTING_15(
-                       x, i, Trace, IceGathererRouterRouteTrace, ol, IceGathererRouter, Info,
+                       x, i, Basic, IceGathererRouterRouteTrace, ol, IceGathererRouter, Info,
                        puid, routeId, mID,
                        string, callingMethod, function,
                        string, message, message,
diff --git a/ortc/cpp/ortc_ICETransport.cpp b/ortc/cpp/ortc_ICETransport.cpp
index 152a4716..b05443c1 100644
--- a/ortc/cpp/ortc_ICETransport.cpp
+++ b/ortc/cpp/ortc_ICETransport.cpp
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_ICETransport.h>
 #include <ortc/internal/ortc_ICEGatherer.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
@@ -54,7 +56,7 @@
 
 #include <cryptopp/sha.h>
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_icetransport) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_ice_transport) }
 
 namespace ortc
 {
@@ -221,7 +223,9 @@ namespace ortc
                                ) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create()),
       mGatherer(ICEGatherer::convert(gatherer)),
+      mLegalRoutesComputeQueue(IORTCForInternal::queueORTC()),
       mRouteStateTracker(make_shared<RouteStateTracker>(mID)),
       mNoPacketsReceivedRecheckTime(ISettings::getUInt(ORTC_SETTING_ICE_TRANSPORT_NO_PACKETS_RECEVIED_RECHECK_CANDIDATES_IN_SECONDS)),
       mExpireRouteTime(ISettings::getUInt(ORTC_SETTING_ICE_TRANSPORT_EXPIRE_ROUTE_IN_SECONDS)),
@@ -229,8 +233,7 @@ namespace ortc
       mBlacklistConsent(ISettings::getBool(ORTC_SETTING_ICE_TRANSPORT_BLACKLIST_AFTER_CONSENT_REMOVAL)),
       mKeepWarmTimeBase(ISettings::getUInt(ORTC_SETTING_ICE_TRANSPORT_KEEP_WARM_TIME_BASE_IN_MILLISECONDS)),
       mKeepWarmTimeRandomizedAddTime(ISettings::getUInt(ORTC_SETTING_ICE_TRANSPORT_KEEP_WARM_TIME_RANDOMIZED_ADD_TIME_IN_MILLISECONDS)),
-      mMaxBufferedPackets(ISettings::getUInt(ORTC_SETTING_ICE_TRANSPORT_MAX_BUFFERED_FOR_SECURE_TRANSPORT)),
-      mLegalRoutesComputeQueue(IORTCForInternal::queueORTC())
+      mMaxBufferedPackets(ISettings::getUInt(ORTC_SETTING_ICE_TRANSPORT_MAX_BUFFERED_FOR_SECURE_TRANSPORT))
     {
       ZS_LOG_BASIC(debug("created"));
 
@@ -963,7 +966,7 @@ namespace ortc
                       bool, keepWarm, keepWarm
                       );
 
-        route->trace(__func__, "keepp warm blacklisted");
+        ZS_EVENTING_TRACE_OBJECT(Detail, *route, "keep warm blacklisted");
         ZS_LOG_WARNING(Detail, log("cannot keep warm as route is blacklisted") + route->toDebug())
         return;
       }
@@ -976,8 +979,7 @@ namespace ortc
                     bool, keepWarm, keepWarm
                     );
 
-      route->trace(__func__, "keep warm");
-
+      ZS_EVENTING_TRACE_OBJECT(Debug, *route, "route found for keep warm");
       ZS_LOG_DETAIL(log("route found for keep warm") + route->toDebug() + ZS_PARAMIZE(keepWarm) + ZS_PARAMIZE(hash))
 
       route->mKeepWarm = keepWarm;
@@ -1010,8 +1012,8 @@ namespace ortc
                     puid, id, mID,
                     puid, routerRouteId, routerRoute->mID
                     );
-      routerRoute->trace(__func__, "received stun packet");
-      packet->trace(__func__);
+      ZS_EVENTING_TRACE_OBJECT(Trace, *routerRoute, "received stun packet")
+      ZS_EVENTING_TRACE_OBJECT(Trace, *packet, "received stun packet");
 
       {
         AutoRecursiveLock lock(*this);
@@ -1060,8 +1062,8 @@ namespace ortc
               sendPacket(routerRoute, response);
 
               setBlacklisted(route);
-              route->trace(__func__, "blacklist response to stun binding request");
-              response->trace(__func__);
+              ZS_EVENTING_TRACE_OBJECT(Debug, *route, "blacklist response to stun binding request");
+              ZS_EVENTING_TRACE_OBJECT(Debug, *response, "blacklist response to stun binding request");
               return;
             }
           }
@@ -1074,8 +1076,8 @@ namespace ortc
 
           ZS_LOG_WARNING(Debug, log("returning conflict error to remote party") + routerRoute->toDebug() + response->toDebug())
           sendPacket(routerRoute, response);
-          route->trace(__func__, "blacklist response to stun binding request");
-          response->trace(__func__);
+          ZS_EVENTING_TRACE_OBJECT(Debug, *route, "returning conflict error to remote party");
+          ZS_EVENTING_TRACE_OBJECT(Debug, *response, "returning conflict error to remote party");
           return;
         }
 
@@ -1083,7 +1085,7 @@ namespace ortc
         if (Time() == route->mLastReceivedResponse) {
           if (route->mOutgoingCheck) {
             ZS_LOG_DEBUG(log("forcing a trigger check response immediately") + route->toDebug())
-            route->trace(__func__, "activate trigger check");
+            ZS_EVENTING_TRACE_OBJECT(Trace, *route, "activate trigger check");
             route->mOutgoingCheck->retryRequestNow();
           }
         }
@@ -1095,7 +1097,7 @@ namespace ortc
             (route->isIgnored())) {
           if (mRemoteParameters.mUsernameFragment.hasData()) {
             ZS_LOG_DETAIL(log("going to activate candidate pair because of incoming request") + route->toDebug())
-            route->trace(__func__, "activate route (due to incoming request)");
+            ZS_EVENTING_TRACE_OBJECT(Debug, *route, "activate route (due to incoming request)");
             setInProgress(route);
           } else {
             mNextActivationCausesAllRoutesThatReceivedChecksToActivate = true;
@@ -1104,8 +1106,8 @@ namespace ortc
 
         auto response = createBindResponse(packet, route);
 
-        route->trace(__func__, "create response to stun binding request");
-        response->trace(__func__);
+        ZS_EVENTING_TRACE_OBJECT(Trace, *route, "create response to stun binding request");
+        ZS_EVENTING_TRACE_OBJECT(Trace, *response, "create response to stun binding request");
 
         ZS_LOG_TRACE(log("sending binding response to remote party") + route->toDebug() + response->toDebug())
         sendPacket(routerRoute, response);
@@ -1143,7 +1145,7 @@ namespace ortc
             mLastReceivedUseCandidate = mLastReceivedPacket;
 
             if (previousRoute != mActiveRoute) {
-              mActiveRoute->trace(__func__, reason);
+              ZS_EVENTING_TRACE_OBJECT(Trace, *mActiveRoute, reason);
               ZS_LOG_DEBUG(log("controlling side indicates to use this route") + mActiveRoute->toDebug())
               wakeUp();
             }
@@ -1183,14 +1185,15 @@ namespace ortc
         auto found = mGathererRoutes.find(routerRoute->mID);
         if (found == mGathererRoutes.end()) {
           ZS_LOG_WARNING(Detail, log("route was not found") + routerRoute->toDebug() + ZS_PARAMIZE(bufferSizeInBytes))
+          ZS_EVENTING_TRACE_OBJECT(Debug, *routerRoute, "route was not found");
           return;
         }
 
         auto route = (*found).second;
 
         if (route->isBlacklisted()) {
-          ZS_LOG_WARNING(Debug, log("no consent given on this route") + route->toDebug() + ZS_PARAMIZE(bufferSizeInBytes))
-          route->trace(__func__, "ignoring incoming packet (route was blacklisted)");
+          ZS_LOG_WARNING(Debug, log("no consent given on this route") + route->toDebug() + ZS_PARAMIZE(bufferSizeInBytes));
+          ZS_EVENTING_TRACE_OBJECT(Debug, *route, "ignoring incoming packet (route was blacklisted)");
           return;
         }
 
@@ -1199,8 +1202,8 @@ namespace ortc
         updateAfterPacket(route);
 
         if (!mActiveRoute) {
-          ZS_LOG_WARNING(Debug, log("no active route chosen (thus must ignore packet)") + route->toDebug() + ZS_PARAMIZE(bufferSizeInBytes))
-          route->trace(__func__, "ignoring incoming packet (no route was chosen)");
+          ZS_LOG_WARNING(Debug, log("no active route chosen (thus must ignore packet)") + route->toDebug() + ZS_PARAMIZE(bufferSizeInBytes));
+          ZS_EVENTING_TRACE_OBJECT(Trace, *route, "ignoring incoming packet (no route was chosen)");
           return;
         }
 
@@ -1550,7 +1553,7 @@ namespace ortc
                     size, size, bufferSizeInBytes
                     );
 
-      routerRoute->trace(__func__, "gatherer to use this route to send secure packet");
+      ZS_EVENTING_TRACE_OBJECT(Insane, *routerRoute, "gatherer to use this route to send secure packet");
       return gatherer->sendPacket(*this, routerRoute, buffer, bufferSizeInBytes);
     }
 
@@ -1599,8 +1602,8 @@ namespace ortc
                     puid, id, mID,
                     puid, routerRouteId, routerRoute->mID
                     );
-      routerRoute->trace(__func__, "retry received stun packet");
-      stunPacket->trace(__func__);
+      ZS_EVENTING_TRACE_OBJECT(Insane, *routerRoute, "retry received stun packet");
+      ZS_EVENTING_TRACE_OBJECT(Trace, *stunPacket, "retry received stun packet");
 
       ZS_LOG_TRACE(log("retrying to handle packet again") + routerRoute->toDebug() + stunPacket->toDebug())
 
@@ -1877,7 +1880,7 @@ namespace ortc
                     puid, routeId, route->mID
                     );
 
-      route->trace(__func__, "unfrozen promise settled");
+      ZS_EVENTING_TRACE_OBJECT(Trace, *route, "unfrozen promise settled");
 
       mFrozen.erase(found);
       route->mFrozenPromise.reset();
@@ -2192,7 +2195,7 @@ namespace ortc
                     puid, stunReuqesterId, requester->getID(),
                     string, fromIpAddress, fromIPAddress.string()
                     );
-      response->trace(__func__);
+      ZS_EVENTING_TRACE_OBJECT(Trace, *response, "ice transport response received");
 
       AutoRecursiveLock lock(*this);
 
@@ -2719,7 +2722,7 @@ namespace ortc
         route->mCandidatePair = candidatePair;
         route->mCandidatePairHash = hash;
 
-        route->trace(__func__, "new legal route");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "new legal route");
 
         ZS_LOG_DEBUG(log("found new legal route") + route->toDebug());
         mLegalRoutes[hash] = route;
@@ -2920,7 +2923,7 @@ namespace ortc
                       puid, activeRouteId, mActiveRoute->mID
                       );
 
-        mActiveRoute->trace(__func__, reason);
+        ZS_EVENTING_TRACE_OBJECT(Debug, *mActiveRoute, reason);
         ZS_LOG_DETAIL(log("new route chosen") + mActiveRoute->toDebug())
         mSubscriptions.delegate()->onICETransportCandidatePairChanged(mThisWeak.lock(), cloneCandidatePair(mActiveRoute));
       } else {
@@ -2979,7 +2982,7 @@ namespace ortc
       ZS_LOG_DEBUG(log("nominating candidate") + mActiveRoute->toDebug())
 
       mUseCandidateRoute = mActiveRoute;
-      mUseCandidateRoute->trace(__func__, "nominate candidate");
+      ZS_EVENTING_TRACE_OBJECT(Debug, *mUseCandidateRoute, "nominate candidate");
 
       mUseCandidateRequest = createBindRequest(mUseCandidateRoute, true);
 
@@ -3022,7 +3025,7 @@ namespace ortc
           continue;
         }
 
-        route->trace(__func__, "dewarm");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "route cannot be kept warm any longer (expired)");
 
         ZS_LOG_DEBUG(log("route cannot be kept warm any longer (expired)") + ZS_PARAM("difference", (now - route->mLastReceivedResponse)) + route->toDebug() + ZS_PARAM("expires (s)", mExpireRouteTime))
 
@@ -3078,7 +3081,7 @@ namespace ortc
             continue;
           }
 
-          route->trace(__func__, "keep warm");
+          ZS_EVENTING_TRACE_OBJECT(Debug, *route, "installing keep warm timer");
 
           ZS_LOG_DEBUG(log("installing keep warm timer") + route->toDebug())
 
@@ -3489,7 +3492,7 @@ namespace ortc
         auto latest = getLastRemoteActivity(mActiveRoute);
         if (Time() != latest) {
           if (latest + mExpireRouteTime < now) {
-            mActiveRoute->trace(__func__, "expire route");
+            ZS_EVENTING_TRACE_OBJECT(Debug, *mActiveRoute, "expire route");
             if (mBlacklistConsent) {
               ZS_LOG_WARNING(Detail, log("blacklisting consent on active route") + ZS_PARAM("difference", (now - latest)) + mActiveRoute->toDebug())
               setBlacklisted(mActiveRoute);
@@ -3521,7 +3524,7 @@ namespace ortc
             continue;
           }
 
-          route->trace(__func__, "warm route expired");
+          ZS_EVENTING_TRACE_OBJECT(Debug, *route, "warm route expired");
 
           expired = true;
           mWarmRoutes.erase(current);
@@ -3769,7 +3772,7 @@ namespace ortc
           activate_previous_route:
             {
               ZS_LOG_DEBUG(log("activating route due to possible failure situation about to happen") + route->toDebug())
-              route->trace(__func__, "activate route (due to potential failure condition as no remote activity detected)");
+              ZS_EVENTING_TRACE_OBJECT(Debug, *route, "activate route (due to potential failure condition as no remote activity detected)");
               setInProgress(route);
               goto check_activation_timer;
             }
@@ -3831,7 +3834,7 @@ namespace ortc
       auto pThis = mThisWeak.lock();
       if (!pThis) return;
 
-      route->trace(__func__, "forced active");
+      ZS_EVENTING_TRACE_OBJECT(Trace, *route, "forcing route to generate activity");
 
       // install a temporary keep warm timer (to force route activate sooner)
       route->mNextKeepWarm = ITimer::create(mThisWeak.lock(), zsLib::now() + Milliseconds(IHelper::random(0, static_cast<size_t>(mKeepWarmTimeRandomizedAddTime.count()))));
@@ -3845,7 +3848,7 @@ namespace ortc
     {
       if (!route) return;
 
-      route->trace(__func__, "shutdown");
+      ZS_EVENTING_TRACE_OBJECT(Trace, *route, "ice transport shutting down route");
 
       ZS_LOG_TRACE(log("shutting down route") + route->toDebug())
 
@@ -3970,7 +3973,7 @@ namespace ortc
 
     insert_pending:
       {
-        route->trace(__func__, "pending");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "route is now being set to the pending state");
 
         ZS_LOG_DEBUG(log("route is now being set to the pending state") + route->toDebug())
 
@@ -4041,7 +4044,7 @@ namespace ortc
 
     freeze:
       {
-        route->trace(__func__, "frozen");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "route is now being frozen");
 
         ZS_LOG_DEBUG(log("route is now being frozen") + route->toDebug())
 
@@ -4087,7 +4090,7 @@ namespace ortc
 
     in_progress:
       {
-        route->trace(__func__, "in progress");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "route is now being set in progress");
 
         ZS_LOG_DEBUG(log("route is now being set in progress") + route->toDebug())
 
@@ -4129,7 +4132,7 @@ namespace ortc
 
     succeeded:
       {
-        route->trace(__func__, "succeeded");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "route is now successful");
 
         ZS_LOG_DEBUG(log("route is now successful") + route->toDebug())
 
@@ -4175,7 +4178,7 @@ namespace ortc
 
     failed:
       {
-        route->trace(__func__, "failed");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "route is now a failure");
 
         ZS_LOG_DEBUG(log("route is now a failure") + route->toDebug())
 
@@ -4211,7 +4214,7 @@ namespace ortc
 
     ignored:
       {
-        route->trace(__func__, "ignored");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "route is now being ignored");
 
         ZS_LOG_DEBUG(log("route is now being ignored") + route->toDebug())
 
@@ -4247,7 +4250,7 @@ namespace ortc
 
     blacklist:
       {
-        route->trace(__func__, "blacklisted");
+        ZS_EVENTING_TRACE_OBJECT(Detail, *route, "route is now blacklisted");
 
         ZS_LOG_DEBUG(log("route is now blacklisted") + route->toDebug())
 
@@ -4313,11 +4316,11 @@ namespace ortc
         if (Time() != route->mLastReceivedResponse) {
           ZS_LOG_DEBUG(log("setting route to active since received a response and no other route is available") + route->toDebug())
           mActiveRoute = route;
-          mActiveRoute->trace(__func__, "choosing as active route (as response was received and no other route is available)");
+          ZS_EVENTING_TRACE_OBJECT(Debug, *mActiveRoute, "choosing as active route (as response was received and no other route is available)");
         } else if (Time() != route->mLastReceivedCheck) {
           ZS_LOG_DEBUG(log("setting route to active since received a validated incoming request") + route->toDebug())
           mActiveRoute = route;
-          mActiveRoute->trace(__func__, "choosing as active route (as incoming check was received on this route)");
+          ZS_EVENTING_TRACE_OBJECT(Debug, *mActiveRoute, "choosing as active route (as incoming check was received on this route)");
         }
       }
 
@@ -4399,7 +4402,7 @@ namespace ortc
         return false;
       }
 
-      route->trace(__func__, "gatherer route installed");
+      ZS_EVENTING_TRACE_OBJECT(Insane, *route, "gatherer route installed");
 
       mGathererRoutes[route->mGathererRoute->mID] = route;
       return true;
@@ -4423,7 +4426,7 @@ namespace ortc
                       size_t, totalRoutes, routes.size()
                       );
 
-        route->trace(__func__, "installed foundation");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "installed foundation");
 
         mFoundationRoutes[foundation] = routes;
         return;
@@ -4445,7 +4448,7 @@ namespace ortc
                       size_t, totalRoutes, routes.size()
                       );
 
-        route->trace(__func__, "installed foundation");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "installed foundation");
       }
     }
 
@@ -4579,7 +4582,7 @@ namespace ortc
         mGatherer->removeRoute(route->mGathererRoute);
       }
 
-      route->trace(__func__, "removing fatherer route");
+      ZS_EVENTING_TRACE_OBJECT(Trace, *route, "removing gatherer route");
       route->mGathererRoute.reset();
     }
     
@@ -4727,7 +4730,8 @@ namespace ortc
           puid, id, mID,
           puid, stunRequesterId, ((bool)result) ? result->getID() : 0
         );
-        route->trace(__func__, "create binding request");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *stunPacket, "create binding request");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *route, "create binding request");
       }
 
       return result;
@@ -4752,8 +4756,8 @@ namespace ortc
 
       fix(stunPacket);
 
-      route->trace(__func__, "create binding response");
-      stunPacket->trace(__func__);
+      ZS_EVENTING_TRACE_OBJECT(Trace, *route, "create binding response");
+      ZS_EVENTING_TRACE_OBJECT(Trace, *stunPacket, "create binding response");
 
       return stunPacket;
     }
@@ -4811,7 +4815,7 @@ namespace ortc
                     buffer, packet, packetized->BytePtr(),
                     size, size, packetized->SizeInBytes()
                     );
-      packet->trace(__func__);
+      ZS_EVENTING_TRACE_OBJECT(Insane, *packet, "ice transport send packet");
       mGatherer->sendPacket(*this, routerRoute, packetized->BytePtr(), packetized->SizeInBytes());
     }
 
@@ -4847,8 +4851,8 @@ namespace ortc
         response->mMappedAddress = routerRoute->mRemoteIP;
         setRole(response);
 
-        routerRoute->trace(__func__, "role conflict detected");
-        response->trace(__func__);
+        ZS_EVENTING_TRACE_OBJECT(Debug, *routerRoute, "ice transport role conflict detected");
+        ZS_EVENTING_TRACE_OBJECT(Debug, *response, "ice transport role conflict detected");
 
         ZS_LOG_WARNING(Detail, log("returning conflict error to remote party") + routerRoute->toDebug() + response->toDebug())
         sendPacket(routerRoute, response);
@@ -4912,7 +4916,7 @@ namespace ortc
           // add to gathering routes
           route->mGathererRoute = routerRoute;
 
-          route->trace(__func__, "added gatherer route");
+          ZS_EVENTING_TRACE_OBJECT(Trace, *route, "added gatherer route");
 
           mGathererRoutes[route->mGathererRoute->mID] = route;
           return route;
@@ -4953,8 +4957,8 @@ namespace ortc
         route->mCandidatePair->mRemote = remoteCandidate;
         route->mCandidatePairHash = route->mCandidatePair->hash();
 
-        route->trace("added missing route (because of incoming stun packet)");
-        packet->trace(__func__);
+        ZS_EVENTING_TRACE_OBJECT(Trace, *route, "ice transport added missing route (because of incoming stun packet)");
+        ZS_EVENTING_TRACE_OBJECT(Trace, *packet, "ice transport added missing route (because of incoming stun packet)");
 
         // add as legal routes
         mLegalRoutes[route->mCandidatePairHash] = route;
@@ -5018,7 +5022,7 @@ namespace ortc
                       puid, secureTransportId, transport->getID()
                       );
 
-        packet->trace(__func__);
+        ZS_EVENTING_TRACE_OBJECT(Insane, *packet, "ice transport delivering packet");
         transport->handleReceivedSTUNPacket(mComponent, packet);
       }
     }
@@ -5169,7 +5173,7 @@ namespace ortc
     void ICETransport::Route::trace(const char *function, const char *message) const
     {
       ZS_EVENTING_COMPACT_41(
-                             x, i, Trace, IceTransportRouteTrace, ol, IceTransport, Info,
+                             x, i, Basic, IceTransportRouteTrace, ol, IceTransport, Info,
                              puid/routeId, mID,
                              string/callingMethod, function,
                              string/message, message,
diff --git a/ortc/cpp/ortc_ICETransportController.cpp b/ortc/cpp/ortc_ICETransportController.cpp
index 5463925d..fc5fdbba 100644
--- a/ortc/cpp/ortc_ICETransportController.cpp
+++ b/ortc/cpp/ortc_ICETransportController.cpp
@@ -46,7 +46,7 @@
 
 #include <cryptopp/sha.h>
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_icetransport_controller) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_ice_transport_controller) }
 
 namespace ortc
 {
diff --git a/ortc/cpp/ortc_ICETypes.cpp b/ortc/cpp/ortc_ICETypes.cpp
index 5bb1ba5a..a9f1fef9 100644
--- a/ortc/cpp/ortc_ICETypes.cpp
+++ b/ortc/cpp/ortc_ICETypes.cpp
@@ -44,7 +44,7 @@
 #include <cryptopp/sha.h>
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc) }
 
 namespace ortc
 {
@@ -246,6 +246,22 @@ namespace ortc
   #pragma mark IICETypes::Candidate
   #pragma mark
 
+  //---------------------------------------------------------------------------
+  IICETypes::Candidate::Candidate()
+  {
+  }
+
+  //---------------------------------------------------------------------------
+  IICETypes::Candidate::Candidate(const Candidate &op2)
+  {
+    (*this) = op2;
+  }
+
+  //---------------------------------------------------------------------------
+  IICETypes::Candidate::~Candidate()
+  {
+  }
+
   //---------------------------------------------------------------------------
   IICETypes::CandidatePtr IICETypes::Candidate::convert(GatherCandidatePtr candidate)
   {
@@ -266,7 +282,7 @@ namespace ortc
         try {
           std::underlying_type<decltype(mComponent)>::type converted = Numeric<std::underlying_type<decltype(mComponent)>::type>(str);
           IICETypes::Components component = static_cast<decltype(mComponent)>(converted);
-          if ((component >= IICETypes::Component_First) ||
+          if ((component >= IICETypes::Component_First) &&
               (component <= IICETypes::Component_Last)) {
             mComponent = component;
           } else {
@@ -470,7 +486,7 @@ namespace ortc
         try {
           std::underlying_type<decltype(mComponent)>::type converted = Numeric<std::underlying_type<decltype(mComponent)>::type>(str);
           IICETypes::Components component = static_cast<decltype(mComponent)>(converted);
-          if ((component >= IICETypes::Component_First) ||
+          if ((component >= IICETypes::Component_First) &&
               (component <= IICETypes::Component_Last)) {
             mComponent = component;
           } else {
diff --git a/ortc/cpp/ortc_ISecureTransport.cpp b/ortc/cpp/ortc_ISecureTransport.cpp
index 5c41d1fc..457cf3ed 100644
--- a/ortc/cpp/ortc_ISecureTransport.cpp
+++ b/ortc/cpp/ortc_ISecureTransport.cpp
@@ -46,7 +46,13 @@
 //
 //#include <cryptopp/sha.h>
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib) }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#endif //__GNUC__
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc) }
 
 namespace ortc
 {
@@ -449,3 +455,8 @@ namespace ortc
   }
 
 }
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif //__GNUC__
diff --git a/ortc/cpp/ortc_Identity.cpp b/ortc/cpp/ortc_Identity.cpp
index a0a78796..1962a3a4 100644
--- a/ortc/cpp/ortc_Identity.cpp
+++ b/ortc/cpp/ortc_Identity.cpp
@@ -54,7 +54,7 @@
 #endif //_DEBUG
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc) }
 
 namespace ortc
 {
@@ -209,7 +209,7 @@ namespace ortc
     //-------------------------------------------------------------------------
     IIdentityTypes::PromiseWithResultPtr Identity::getIdentityAssertion(
                                                                         const char *provider,
-                                                                        const char *protoocl,
+                                                                        const char *protoocol,
                                                                         const char *username
                                                                         ) throw (InvalidStateError)
     {
diff --git a/ortc/cpp/ortc_MediaChannelTraceHelper.cpp b/ortc/cpp/ortc_MediaChannelTraceHelper.cpp
new file mode 100644
index 00000000..d9dc8664
--- /dev/null
+++ b/ortc/cpp/ortc_MediaChannelTraceHelper.cpp
@@ -0,0 +1,197 @@
+/*
+
+ Copyright (c) 2017, Hookflash Inc. / Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_MediaChannelTraceHelper.h>
+#include <ortc/internal/platform.h>
+
+#include <zsLib/ISettings.h>
+#include <zsLib/Singleton.h>
+#include <zsLib/SafeInt.h>
+
+#include <set>
+
+#ifdef _DEBUG
+#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
+#else
+#define ASSERT(x)
+#endif //_DEBUG
+
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_stream_track) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+
+  namespace internal
+  {
+    ZS_DECLARE_CLASS_PTR(MediaChannelTraceHelperDefaults);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark (helpers)
+    #pragma mark
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaChannelTraceHelperDefaults
+    #pragma mark
+
+    class MediaChannelTraceHelperDefaults : public ISettingsApplyDefaultsDelegate
+    {
+    public:
+      //-----------------------------------------------------------------------
+      ~MediaChannelTraceHelperDefaults()
+      {
+        ISettings::removeDefaults(*this);
+      }
+
+      //-----------------------------------------------------------------------
+      static MediaChannelTraceHelperDefaultsPtr singleton()
+      {
+        static SingletonLazySharedPtr<MediaChannelTraceHelperDefaults> singleton(create());
+        return singleton.singleton();
+      }
+
+      //-----------------------------------------------------------------------
+      static MediaChannelTraceHelperDefaultsPtr create()
+      {
+        auto pThis(make_shared<MediaChannelTraceHelperDefaults>());
+        ISettings::installDefaults(pThis);
+        return pThis;
+      }
+
+      //-----------------------------------------------------------------------
+      virtual void notifySettingsApplyDefaults() override
+      {
+        ISettings::setUInt(ORTC_SETTING_MEDIA_CHANNEL_TRACE_HELPER_USAGE_INACTIVITY_AGE_PURGE_TIME_IN_SECONDS, 30);
+        ISettings::setInt(ORTC_SETTING_MEDIA_CHANNEL_TRACE_HELPER_USAGE_INACTIVITY_AGE_CHECK_MODULAS_VALUE, 512);
+      }
+    };
+
+    //-------------------------------------------------------------------------
+    void installMediaChannelTraceHelperDefaults()
+    {
+      MediaChannelTraceHelperDefaults::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaChannelTraceHelper
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    MediaChannelTraceHelper::MediaChannelTraceHelper(MediaChannelID mediaChannelID) :
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      selfChannelID_(mediaChannelID),
+      lastAgeCountTimeAt_(zsLib::now()),
+      agePurge_(SafeInt<decltype(agePurge_)::rep>(ISettings::getUInt(ORTC_SETTING_MEDIA_CHANNEL_TRACE_HELPER_USAGE_INACTIVITY_AGE_PURGE_TIME_IN_SECONDS))),
+      ageCheck_(SafeInt<decltype(ageCheck_)>(ISettings::getInt(ORTC_SETTING_MEDIA_CHANNEL_TRACE_HELPER_USAGE_INACTIVITY_AGE_CHECK_MODULAS_VALUE)))
+    {
+      ASSERT(ageCheck_ > 1);  // assert value is set properly
+      if (ageCheck_ < 1) ageCheck_ = 1;
+    }
+
+    //-------------------------------------------------------------------------
+    MediaChannelTraceHelper::ImmutableMediaChannelTracePtr MediaChannelTraceHelper::trace(ImmutableMediaChannelTracePtr sourceTrace)
+    {
+      ASSERT((bool)sourceTrace);
+      uintptr_t handle = reinterpret_cast<uintptr_t>(sourceTrace.get());
+
+      int checkCount = (++lastUsageCount_);
+      bool shouldCheck = (0 == (checkCount % ageCheck_));
+
+      {
+        AutoRecursiveLock lock(*this);
+        auto found = traceSources_.find(handle);
+        if (found != traceSources_.end()) {
+          auto &info = (*found).second;
+          info.lastUsageAt_ = checkCount;
+          if (shouldCheck) {
+            ImmutableMediaChannelTracePtr result = info.trace_;
+            doPurge();
+            return result;
+          }
+          return info.trace_;
+        }
+
+        TraceSourceInfo info;
+        info.lastUsageAt_ = checkCount;
+        info.trace_ = IMediaStreamTrackTypes::MediaChannelTrace::create(*sourceTrace, selfChannelID_);
+        traceSources_[handle] = info;
+
+        if (shouldCheck) {
+          ImmutableMediaChannelTracePtr result = info.trace_;
+          doPurge();
+          return result;
+        }
+        return info.trace_;
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaChannelTraceHelper::doPurge()
+    {
+      auto tick = zsLib::now();
+
+      if (lastAgeCountTimeAt_ + agePurge_ > tick) return; // not time to purge yet
+
+      if (lastUsageCount_ < 0) lastUsageCount_ = 0; // count roll over prevention
+
+      // setup values to check for next time
+      lastAgeCountTimeAt_ = tick;
+      int lastAgeCountValueAtTime = lastAgeCountValueAtTime_;
+      lastAgeCountValueAtTime_ = lastUsageCount_;
+
+      for (auto iter_doNotUse = traceSources_.begin(); iter_doNotUse != traceSources_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto &info = (*current).second;
+        if (info.lastUsageAt_ > lastAgeCountValueAtTime) continue;
+
+        traceSources_.erase(current);
+      }
+    }
+
+  } // namespace internal
+} // namespace ortc
diff --git a/ortc/cpp/ortc_MediaDevice.cpp b/ortc/cpp/ortc_MediaDevice.cpp
new file mode 100644
index 00000000..eeb04f2e
--- /dev/null
+++ b/ortc/cpp/ortc_MediaDevice.cpp
@@ -0,0 +1,374 @@
+/*
+
+ Copyright (c) 2017, Hookflash Inc. / Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_IMediaDevice.h>
+
+//#include <ortc/internal/ortc_MediaEngine.h>
+
+//#include <ortc/internal/ortc_MediaDeviceCaptureAudio.h>
+//#include <ortc/internal/ortc_MediaDeviceCaptureVideo.h>
+//#include <ortc/internal/ortc_MediaDeviceRenderAudio.h>
+////#include <ortc/internal/ortc_RTPReceiverChannelAudio.h>
+////#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
+////#include <ortc/internal/ortc_RTPSenderChannelAudio.h>
+////#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
+//#include <ortc/internal/ortc_RTPPacket.h>
+//#include <ortc/internal/ortc_RTCPPacket.h>
+//#include <ortc/internal/ortc_ORTC.h>
+//#include <ortc/internal/ortc_StatsReport.h>
+//#include <ortc/internal/ortc.events.h>
+//#include <ortc/internal/platform.h>
+//
+//#include <ortc/IStatsReport.h>
+//
+//#include <ortc/IHelper.h>
+//#include <ortc/services/IHTTP.h>
+//
+//#include <zsLib/ISettings.h>
+//#include <zsLib/Singleton.h>
+//#include <zsLib/Log.h>
+//#include <zsLib/XML.h>
+//#include <zsLib/SafeInt.h>
+//
+//#include <cryptopp/sha.h>
+//
+//#include <webrtc/base/event_tracer.h>
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#endif //__GNUC__
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+
+  namespace internal
+  {
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark (helpers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaStreamTrackTypes::SettingsPtr obtainBestMode(
+                                                       const std::list<IMediaStreamTrackTypes::TrackConstraintsPtr> &allConstraints,
+                                                       const std::list<IMediaStreamTrackTypes::SettingsPtr> &availableModes
+                                                       )
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::StringList, StringList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraintsPtr, UseTrackConstraints);
+      ZS_DECLARE_TYPEDEF_PTR(std::list<UseTrackConstraintsPtr>, UseTrackConstraintsList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Settings, UseSettings);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ConstraintSet, UseConstraintSet);
+
+      //-----------------------------------------------------------------------
+      struct ModeInfo
+      {
+        UseSettingsPtr settings_;
+        bool rejected{};
+        size_t idealCount_{};
+
+        static bool containsString(
+                                   const StringList &strs,
+                                   const String &str
+                                   )
+        {
+          for (auto iter = strs.begin(); iter != strs.end(); ++iter) { auto &value = (*iter); if (value == str) return true; }
+          return false;
+        }
+
+        //---------------------------------------------------------------------
+        bool innerProcessConstrain(
+                                   const IMediaStreamTrackTypes::ConstrainString &constrain,
+                                   const Optional<String> &value
+                                   )
+        {
+          StringList exacts;
+          StringList ideals;
+          constrain.ideal(ideals);
+          constrain.exact(exacts);
+          if (!value.hasValue()) {
+            return (exacts.size() < 1);
+          }
+          if (exacts.size() > 0) {
+            if (!containsString(exacts, value.value())) return false;
+          }
+          if (ideals.size() < 1) return true;
+          if (!containsString(ideals, value.value())) return true;
+          ++idealCount_;
+          return true;
+        }
+
+        //---------------------------------------------------------------------
+        bool processConstrain(
+                              const IMediaStreamTrackTypes::ConstrainString &constrain,
+                              const Optional<String> &value
+                              )
+        {
+          if (!innerProcessConstrain(constrain, value)) {
+            rejected = true;
+            return false;
+          }
+          return true;
+        }
+
+        //---------------------------------------------------------------------
+        bool innerProcessConstrain(
+                                   const IMediaStreamTrackTypes::ConstrainDouble &constrain,
+                                   const Optional<double> &value
+                                   )
+        {
+          if (constrain.mValue.hasValue()) {
+            if (!value.hasValue()) return false;
+            return constrain.mValue.value() == value.value();
+          }
+          if (!constrain.mRange.hasValue()) return true;
+
+          auto &values = constrain.mRange.value();
+          if (values.mMin.hasValue()) {
+            if (!value.hasValue()) return false;
+            if (value.value() < values.mMin.value()) return false;
+          }
+          if (values.mMax.hasValue()) {
+            if (!value.hasValue()) return false;
+            if (value.value() > values.mMax.value()) return false;
+          }
+          if (values.mExact.hasValue()) {
+            if (!value.hasValue()) return false;
+            if (value.value() != values.mExact.value()) return false;
+          }
+          if (!values.mIdeal.hasValue()) return true;
+          if (!value.hasValue()) return true;
+          if (values.mIdeal.value() != value.value()) return true;
+          ++idealCount_;
+          return true;
+        }
+
+        //---------------------------------------------------------------------
+        bool processConstrain(
+                              const IMediaStreamTrackTypes::ConstrainDouble &constrain,
+                              const Optional<double> &value
+                              )
+        {
+          if (!innerProcessConstrain(constrain, value)) {
+            rejected = true;
+            return false;
+          }
+          return true;
+        }
+
+        //---------------------------------------------------------------------
+        bool innerProcessConstrain(
+                                   const IMediaStreamTrackTypes::ConstrainLong &constrain,
+                                   const Optional<LONG> &value
+                                   )
+        {
+          if (constrain.mValue.hasValue()) {
+            if (!value.hasValue()) return false;
+            return constrain.mValue.value() == value.value();
+          }
+          if (!constrain.mRange.hasValue()) return true;
+
+          auto &values = constrain.mRange.value();
+          if (values.mMin.hasValue()) {
+            if (!value.hasValue()) return false;
+            if (value.value() < values.mMin.value()) return false;
+          }
+          if (values.mMax.hasValue()) {
+            if (!value.hasValue()) return false;
+            if (value.value() > values.mMax.value()) return false;
+          }
+          if (values.mExact.hasValue()) {
+            if (!value.hasValue()) return false;
+            if (value.value() != values.mExact.value()) return false;
+          }
+          if (!values.mIdeal.hasValue()) return true;
+          if (!value.hasValue()) return true;
+          if (values.mIdeal.value() != value.value()) return true;
+          ++idealCount_;
+          return true;
+        }
+
+        //---------------------------------------------------------------------
+        bool processConstrain(
+                              const IMediaStreamTrackTypes::ConstrainLong &constrain,
+                              const Optional<LONG> &value
+                              )
+        {
+          if (!innerProcessConstrain(constrain, value)) {
+            rejected = true;
+            return false;
+          }
+          return true;
+        }
+
+
+        //---------------------------------------------------------------------
+        bool innerProcessConstrain(
+                                   const IMediaStreamTrackTypes::ConstrainBoolean &constrain,
+                                   const Optional<bool> &value
+                                   )
+        {
+          if (constrain.mValue.hasValue()) {
+            if (!value.hasValue()) return false;
+            return constrain.mValue.value() == value.value();
+          }
+          if (!constrain.mParameters.hasValue()) return true;
+
+          auto &values = constrain.mParameters.value();
+          if (values.mExact.hasValue()) {
+            if (!value.hasValue()) return false;
+            if (value.value() != values.mExact.value()) return false;
+          }
+          if (!values.mIdeal.hasValue()) return true;
+          if (!value.hasValue()) return true;
+          if (values.mIdeal.value() != value.value()) return true;
+          ++idealCount_;
+          return true;
+        }
+
+        //---------------------------------------------------------------------
+        bool processConstrain(
+                              const IMediaStreamTrackTypes::ConstrainBoolean &constrain,
+                              const Optional<bool> &value
+                              )
+        {
+          if (!innerProcessConstrain(constrain, value)) {
+            rejected = true;
+            return false;
+          }
+          return true;
+        }
+        //---------------------------------------------------------------------
+        bool checkConstrainSet(const UseConstraintSet &constrain)
+        {
+          auto &settings = (*settings_);
+
+          if (!processConstrain(constrain.mWidth, settings.mWidth)) return false;
+          if (!processConstrain(constrain.mHeight, settings.mHeight)) return false;
+          if (!processConstrain(constrain.mAspectRatio, settings.mAspectRatio)) return false;
+          if (!processConstrain(constrain.mFrameRate, settings.mFrameRate)) return false;
+          if (!processConstrain(constrain.mFacingMode, settings.mFacingMode)) return false;
+          if (!processConstrain(constrain.mOrientation, settings.mOrientation)) return false;
+          if (!processConstrain(constrain.mVolume, settings.mVolume)) return false;
+          if (!processConstrain(constrain.mSampleRate, settings.mSampleRate)) return false;
+          if (!processConstrain(constrain.mSampleSize, settings.mSampleSize)) return false;
+          if (!processConstrain(constrain.mEchoCancellation, settings.mEchoCancellation)) return false;
+          if (!processConstrain(constrain.mLatency, settings.mLatency)) return false;
+          if (!processConstrain(constrain.mChannelCount, settings.mChannelCount)) return false;
+          if (!processConstrain(constrain.mDeviceID, settings.mDeviceID)) return false;
+          if (!processConstrain(constrain.mGroupID, settings.mGroupID)) return false;
+          if (!processConstrain(constrain.mEncodingFormat, settings.mEncodingFormat)) return false;
+
+          return true;
+        }
+      };
+
+      ZS_DECLARE_TYPEDEF_PTR(std::list<ModeInfo>, ModeInfoList);
+
+      ModeInfoList outputModes;
+      for (auto iter = availableModes.begin(); iter != availableModes.end(); ++iter)
+      {
+        ModeInfo info;
+        info.settings_ = (*iter);
+        outputModes.push_back(info);
+      }
+
+      for (auto iter = allConstraints.begin(); iter != allConstraints.end(); ++iter) {
+        auto &constraints = *(*iter);
+
+        for (auto iterMode = outputModes.begin(); iterMode != outputModes.end(); ++iterMode) {
+          auto &mode = (*iterMode);
+          if (mode.rejected) continue;
+
+          if (!mode.checkConstrainSet(constraints)) continue;
+
+          for (auto iterAdv = constraints.mAdvanced.begin(); iterAdv != constraints.mAdvanced.end(); ++iterAdv) {
+            auto &advancedConstraints = *(*iter);
+            if (!mode.checkConstrainSet(advancedConstraints)) break;
+          }
+        }
+      }
+
+      UseSettingsPtr foundSettings;
+      size_t mostIdeal {};
+
+      for (auto iterMode = outputModes.begin(); iterMode != outputModes.end(); ++iterMode) {
+        auto &mode = (*iterMode);
+        if (mode.rejected) continue;
+
+        if ((foundSettings) ||
+            (mode.idealCount_ <= mostIdeal)) continue;
+
+        foundSettings = mode.settings_;
+        mostIdeal = mode.idealCount_;
+      }
+
+      return foundSettings;
+    }
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDevice
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    const char *IMediaDevice::toString(States state)
+    {
+      switch (state)
+      {
+        case State_Pending:         return "pending";
+        case State_Active:          return "active";
+        case State_Reinitializing:  return "reinitialzing";
+        case State_ShuttingDown:    return "shutting down";
+        case State_Shutdown:        return "shutdown";
+      }
+      return "UNKNOWN";
+    }
+
+  } // internal namespace
+
+}
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif // __GNUC__
diff --git a/ortc/cpp/ortc_MediaDeviceCapture.cpp b/ortc/cpp/ortc_MediaDeviceCapture.cpp
new file mode 100644
index 00000000..b50b50fc
--- /dev/null
+++ b/ortc/cpp/ortc_MediaDeviceCapture.cpp
@@ -0,0 +1,115 @@
+/*
+
+ Copyright (c) 2017, Hookflash Inc. / Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_IMediaDeviceCapture.h>
+
+#include <ortc/internal/ortc_MediaEngine.h>
+
+//#include <ortc/internal/ortc_MediaDeviceCaptureAudio.h>
+//#include <ortc/internal/ortc_MediaDeviceCaptureVideo.h>
+//#include <ortc/internal/ortc_MediaDeviceRenderAudio.h>
+////#include <ortc/internal/ortc_RTPReceiverChannelAudio.h>
+////#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
+////#include <ortc/internal/ortc_RTPSenderChannelAudio.h>
+////#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
+//#include <ortc/internal/ortc_RTPPacket.h>
+//#include <ortc/internal/ortc_RTCPPacket.h>
+//#include <ortc/internal/ortc_ORTC.h>
+//#include <ortc/internal/ortc_StatsReport.h>
+//#include <ortc/internal/ortc.events.h>
+//#include <ortc/internal/platform.h>
+//
+//#include <ortc/IStatsReport.h>
+//
+//#include <ortc/IHelper.h>
+//#include <ortc/services/IHTTP.h>
+//
+//#include <zsLib/ISettings.h>
+//#include <zsLib/Singleton.h>
+//#include <zsLib/Log.h>
+//#include <zsLib/XML.h>
+//#include <zsLib/SafeInt.h>
+//
+//#include <cryptopp/sha.h>
+//
+//#include <webrtc/base/event_tracer.h>
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#endif //__GNUC__
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+
+  namespace internal
+  {
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark (helpers)
+    #pragma mark
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCapture
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaDeviceCapture::MediaDeviceCapturePromisePtr IMediaDeviceCapture::create(
+                                                                                  MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                                  Kinds kind,
+                                                                                  const TrackConstraints &constraints,
+                                                                                  IMediaDeviceCaptureDelegatePtr delegate
+                                                                                  )
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceCapture, UseEngine);
+      return UseEngine::createMediaDeviceCapture(repaceExistingDeviceObjectID, kind, constraints, delegate);
+    }
+
+  } // internal namespace
+}
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif //__GNUC__
diff --git a/ortc/cpp/ortc_MediaDeviceCaptureAudio.cpp b/ortc/cpp/ortc_MediaDeviceCaptureAudio.cpp
new file mode 100644
index 00000000..ef448a1d
--- /dev/null
+++ b/ortc/cpp/ortc_MediaDeviceCaptureAudio.cpp
@@ -0,0 +1,1278 @@
+/*
+
+ Copyright (c) 2017, Hookflash Inc. / Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_MediaDeviceCaptureAudio.h>
+#include <ortc/internal/ortc_MediaEngine.h>
+//#include <ortc/internal/ortc_MediaStreamTrack.h>
+//#include <ortc/internal/ortc_MediaDeviceCaptureAudio.h>
+//#include <ortc/internal/ortc_MediaDeviceCaptureVideo.h>
+//#include <ortc/internal/ortc_MediaDeviceRenderAudio.h>
+////#include <ortc/internal/ortc_RTPReceiverChannelAudio.h>
+////#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
+////#include <ortc/internal/ortc_RTPSenderChannelAudio.h>
+////#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
+//#include <ortc/internal/ortc_RTPPacket.h>
+//#include <ortc/internal/ortc_RTCPPacket.h>
+#include <ortc/internal/ortc_ORTC.h>
+#include <ortc/internal/ortc_StatsReport.h>
+#include <ortc/internal/ortc.events.h>
+#include <ortc/internal/platform.h>
+
+#include <ortc/IStatsReport.h>
+//
+//#include <ortc/IHelper.h>
+#include <ortc/services/IHTTP.h>
+//
+#include <zsLib/ISettings.h>
+//#include <zsLib/Singleton.h>
+//#include <zsLib/Log.h>
+//#include <zsLib/XML.h>
+//#include <zsLib/SafeInt.h>
+//
+//#include <cryptopp/sha.h>
+//
+//#include <webrtc/base/event_tracer.h>
+
+#if 0
+#include <limits>
+#include <float.h>
+#include <math.h>
+
+#include <webrtc/rtc_base/timeutils.h>
+#include <webrtc/call/rtc_event_log.h>
+#include <webrtc/voice_engine/include/voe_codec.h>
+#include <webrtc/voice_engine/include/voe_rtp_rtcp.h>
+#include <webrtc/voice_engine/include/voe_network.h>
+#include <webrtc/voice_engine/include/voe_hardware.h>
+#include <webrtc/system_wrappers/include/cpu_info.h>
+#include <webrtc/voice_engine/include/voe_audio_processing.h>
+#include <webrtc/modules/video_capture/video_capture_factory.h>
+#include <webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h>
+#ifdef WINRT
+#include <third_party/h264_winrt/h264_winrt_factory.h>
+#endif
+#endif //0
+
+#ifdef _DEBUG
+#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
+#else
+#define ASSERT(x)
+#endif //_DEBUG
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+
+  namespace internal
+  {
+    ZS_DECLARE_CLASS_PTR(MediaDeviceCaptureAudioSettingsDefaults);
+    ZS_DECLARE_TYPEDEF_PTR(IStatsReportForInternal, UseStatsReport);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudioSettingsDefaults
+    #pragma mark
+
+    class MediaDeviceCaptureAudioSettingsDefaults : public ISettingsApplyDefaultsDelegate
+    {
+    public:
+      //-----------------------------------------------------------------------
+      ~MediaDeviceCaptureAudioSettingsDefaults()
+      {
+        ISettings::removeDefaults(*this);
+      }
+
+      //-----------------------------------------------------------------------
+      static MediaDeviceCaptureAudioSettingsDefaultsPtr singleton()
+      {
+        static SingletonLazySharedPtr<MediaDeviceCaptureAudioSettingsDefaults> singleton(create());
+        return singleton.singleton();
+      }
+
+      //-----------------------------------------------------------------------
+      static MediaDeviceCaptureAudioSettingsDefaultsPtr create()
+      {
+        auto pThis(make_shared<MediaDeviceCaptureAudioSettingsDefaults>());
+        ISettings::installDefaults(pThis);
+        return pThis;
+      }
+
+      //-----------------------------------------------------------------------
+      virtual void notifySettingsApplyDefaults() override
+      {
+      }
+      
+    };
+
+    //-------------------------------------------------------------------------
+    void installMediaDeviceCaptureAudioSettingsDefaults()
+    {
+      MediaDeviceCaptureAudioSettingsDefaults::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureAudioForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaDeviceCaptureAudioForMediaEngine::ForMediaEnginePtr IMediaDeviceCaptureAudioForMediaEngine::create(
+                                                                                                             UseMediaEnginePtr mediaEngine,
+                                                                                                             const String &deviceID
+                                                                                                             )
+    {
+      return internal::IMediaDeviceCaptureAudioFactory::singleton().create(mediaEngine, deviceID);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureAudio::MediaDeviceCaptureAudio(
+                                                     const make_private &,
+                                                     IMessageQueuePtr queue,
+                                                     UseMediaEnginePtr mediaEngine,
+                                                     const String &deviceID
+                                                     ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      mediaEngine_(mediaEngine),
+      deviceID_(deviceID),
+      subscribers_(make_shared<MediaSubscriberMap>())
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceCaptureAudioCreate, ol, MediaEngine, Start, puid, id, id_, string, deviceID, deviceID_);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::init()
+    {
+      AutoRecursiveLock lock(*this);
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureAudio::~MediaDeviceCaptureAudio()
+    {
+      if (isNoop()) return;
+
+      thisWeak_.reset();
+
+      cancel();
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureAudioDestroy, ol, MediaEngine, Stop, puid, id, id_);
+    }
+
+    //-----------------------------------------------------------------------
+    MediaDeviceCaptureAudioPtr MediaDeviceCaptureAudio::create(
+                                                               UseMediaEnginePtr mediaEngine,
+                                                               const String &deviceID
+                                                               )
+    {
+      auto pThis(make_shared<MediaDeviceCaptureAudio>(make_private{}, IORTCForInternal::queueMediaDevices(), mediaEngine, deviceID));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureAudioPtr MediaDeviceCaptureAudio::convert(ForMediaEnginePtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaDeviceCaptureAudio, object);
+    }
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio => (for Media)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::notifyMediaStateChanged()
+    {
+      ZS_EVENTING_1(x, i, Debug, MediaDeviceCaptureAudioNotifyMediaStateChanged, ol, MediaEngine, Event, puid, id, id_);
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::notifyMediaFailure(
+                                                     MediaPtr media,
+                                                     WORD errorCode,
+                                                     const char *inReason
+                                                     )
+    {
+      ZS_EVENTING_2(x, e, Debug, MediaDeviceCaptureAudioNotifyMediaFailure, ol, MediaEngine, Event, puid, id, id_, puid, mediaId, media->getID());
+
+      auto pThis = thisWeak_.lock();
+      String reason(inReason);
+      postClosure([pThis, media, errorCode, reason] {
+        AutoRecursiveLock lock(*pThis);
+
+        if (media != pThis->media_) return;
+
+        pThis->setError(errorCode, reason);
+        pThis->cancel();
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio => (for MediaSubscribers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::notifySusbcriberGone()
+    {
+      ZS_EVENTING_1(x, i, Debug, MediaDeviceCaptureAudioNotifySubscriberGone, ol, MediaEngine, Event, puid, id, id_);
+
+      recheckMode_ = true;
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio => IMediaDeviceForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::isDeviceIdle()
+    {
+      AutoRecursiveLock lock(*this);
+
+      if (isShutdown()) return true;
+
+      if (pendingSubscribers_.size() > 0) return false;
+      if (subscribers_->size() > 0) return false;
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureAudioShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureAudio::States MediaDeviceCaptureAudio::getState() const
+    {
+      AutoRecursiveLock lock(*this);
+      return currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio => IMediaDeviceCaptureForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::mediaDeviceCaptureSubscribe(
+                                                              MediaDeviceCapturePromisePtr promise,
+                                                              MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                              TrackConstraintsPtr constraints,
+                                                              IMediaDeviceCaptureDelegatePtr delegate
+                                                              )
+    {    
+      auto pThis = thisWeak_.lock();
+
+      PendingSubscriber info;
+      info.promise_ = promise;
+      info.repaceExistingDeviceObjectID_ = repaceExistingDeviceObjectID;
+      info.constraints_ = constraints;
+      info.delegate_ = delegate;
+
+      postClosure([pThis, info] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->pendingSubscribers_.push_back(info);
+        pThis->step();
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio => IMediaDeviceCaptureAudioForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::onWake()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaDeviceCaptureAudioOnWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio => IPromiseSettledDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::onPromiseSettled(PromisePtr promise)
+    {
+      ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioOnPromiseSettled, ol, MediaEngine, Event, puid, id, id_, puid, promiseId, promise->getID());
+
+      AutoRecursiveLock lock(*this);
+
+      if (deviceModesPromise_) {
+        if (deviceModesPromise_->getID() == promise->getID()) {
+          if (promise->isRejected()) {
+            setError(promise);
+            cancel();
+            return;
+          }
+        }
+      }
+
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::cancel()
+    {
+      //.......................................................................
+      // try to gracefully shutdown
+
+      if (isShutdown()) return;
+
+      setState(IMediaDevice::State_ShuttingDown);
+
+      deviceModesPromise_.reset();
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+        ZS_EVENTING_2(x, i, Debug, MediaDeviceCaptureAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "graceful");
+
+        // perform any graceful asynchronous shutdown processes needed and
+        // re-attempt shutdown again later if needed.
+
+        if (!stepShutdownPendingRequests()) return;
+        if (!stepShutdownSubscribers()) return;
+        if (!stepShutdownMedia()) return;
+      }
+
+      //.......................................................................
+      // final cleanup (hard shutdown)
+
+      setState(IMediaDevice::State_Shutdown);
+
+      stepShutdownPendingRequests();
+      stepShutdownSubscribers();
+      stepShutdownMedia();
+
+      auto engine = mediaEngine_.lock();
+      if (engine) {
+        engine->notifyDeviceIsIdleOrShutdownStateChanged();
+      }
+
+      // make sure to cleanup any final reference to self
+      gracefulShutdownReference_.reset();
+
+      mediaEngine_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::stepShutdownPendingRequests()
+    {
+      ZS_EVENTING_2(x, i, Debug, MediaDeviceCaptureAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "pending requests");
+
+      for (auto iter_doNotUse = pendingSubscribers_.begin(); iter_doNotUse != pendingSubscribers_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto pending = (*current).promise_;
+
+        pending->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+        pendingSubscribers_.erase(current);
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::stepShutdownSubscribers()
+    {
+      if (subscribers_->size() < 1) return true;
+
+      ZS_EVENTING_2(x, i, Debug, MediaDeviceCaptureAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "subscribers");
+
+      for (auto iter_doNotUse = subscribers_->begin(); iter_doNotUse != subscribers_->end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto subscriber = (*current).second;
+
+        subscriber->shutdown();
+      }
+
+      // empty the subscriber list
+      subscribers_ = make_shared<MediaSubscriberMap>();
+
+      if (media_) {
+        media_->notifySubscribersChanged(subscribers_);
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::stepShutdownMedia()
+    {
+      ZS_EVENTING_2(x, i, Debug, MediaDeviceCaptureAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media");
+
+      if (!media_) return true;
+
+      media_->shutdown();
+      bool shutdown = media_->isShutdown();
+      if (shutdown) {
+        media_.reset();
+      }
+      return shutdown;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaDeviceCaptureAudioStep, ol, MediaEngine, Step, puid, id, id_);
+
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, MediaDeviceCaptureAudioStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      if (!stepMediaReinitializationShutdown()) goto reinitializing;
+      if (!stepDiscoverModes()) goto not_ready;
+      if (!stepFigureOutMode()) goto not_ready;
+      if (!stepWaitForMediaDevice()) goto not_ready;
+
+      goto ready;
+
+    not_ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "not ready");
+        return;
+      }
+
+    reinitializing:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "reinitializing");
+        setState(IMediaDevice::State_Reinitializing);
+        return;
+      }
+
+    ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "ready");
+        setState(IMediaDevice::State_Active);
+        return;
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::stepMediaReinitializationShutdown()
+    {
+      if (!media_) goto no_media_to_shutdown;
+
+      if (media_->isShuttingDown()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "waiting for media shutdown to reinialize");
+        return false;
+      }
+
+      if (media_->isShutdown()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media shutdown");
+        media_.reset();
+        return true;
+      }
+
+    no_media_to_shutdown:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no media to shutdown");
+      }
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::stepDiscoverModes()
+    {
+      if (!deviceModesPromise_) {
+        deviceModesPromise_ = IMediaDevices::enumerateDefaultModes(deviceID_);
+
+        if (!deviceModesPromise_) {
+          setError(UseHTTP::HTTPStatusCode_ExpectationFailed, (String("unable to discover modes for an audio media device: ") + deviceID_).c_str());
+          cancel();
+          return false;
+        }
+        deviceModesPromise_->thenWeak(thisWeak_.lock());
+      }
+
+      if (!deviceModesPromise_->isSettled()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "waiting for device modes to be known");
+        return false;
+      }
+
+      if (deviceModesPromise_->isRejected()) {
+        setError(deviceModesPromise_);
+        cancel();
+        return false;
+      }
+
+      auto settingsList = deviceModesPromise_->value();
+
+      if (!settingsList) {
+        setError(UseHTTP::HTTPStatusCode_ExpectationFailed, (String("no modes found for audio media device: ") + deviceID_).c_str());
+        cancel();
+        return false;
+      }
+
+      ZS_EVENTING_3(x, i, Debug, MediaDeviceCaptureAudioStepModesFound, ol, MediaEngine, Step,
+        puid, id, id_,
+        string, deviceId, deviceID_,
+        size_t, totalModes, settingsList->size());
+
+      // copy modes to shared pointer list of settings
+      for (auto iter = settingsList->begin(); iter != settingsList->end(); ++iter)
+      {
+        deviceModes_.push_back(make_shared<UseSettings>(*iter));
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::stepFigureOutMode()
+    {
+      {
+        if (recheckMode_) goto mode_needed;
+        if (!media_) goto mode_needed;
+        if (pendingSubscribers_.size() > 0) goto mode_needed;
+        return true;
+      }
+
+    mode_needed:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "figure out mode");
+
+        recheckMode_ = false;
+
+        TrackConstraintsList allConstraints;
+
+        for (auto iter = pendingSubscribers_.begin(); iter != pendingSubscribers_.end(); ++iter)
+        {
+          auto &info = (*iter);
+          allConstraints.push_back(info.constraints_);
+        }
+
+        for (auto iter = subscribers_->begin(); iter != subscribers_->end(); ++iter) {
+          auto &subscriber = (*iter).second;
+          allConstraints.push_back(subscriber->getConstraints());
+        }
+
+        auto found = obtainBestMode(allConstraints, deviceModes_);
+
+        bool changed = false;
+
+        MediaSubscriberMapPtr replacement(make_shared<MediaSubscriberMap>());
+        for (auto iter = subscribers_->begin(); iter != subscribers_->end(); ++iter) {
+          auto &subscriber = (*iter).second;
+          if (subscriber->isShutdown()) {
+            changed = true;
+            continue;
+          }
+          (*replacement)[(*iter).first] = subscriber;
+        }
+
+        if (found) {
+          for (auto iter = pendingSubscribers_.begin(); iter != pendingSubscribers_.end(); ++iter) {
+            auto &info = (*iter);
+            auto subscriber = MediaSubscriber::create(getAssociatedMessageQueue(), thisWeak_.lock(), info.constraints_, info.delegate_);
+            info.promise_->resolve(IMediaDeviceCapturePtr(subscriber));
+            subscriber->notifyStateChanged(currentState_);
+            changed = true;
+            (*replacement)[subscriber->getID()] = subscriber;
+          }
+        } else {
+          for (auto iter = pendingSubscribers_.begin(); iter != pendingSubscribers_.end(); ++iter) {
+            auto &info = (*iter);
+            info.promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Conflict, "over constrained"));
+          }
+        }
+        pendingSubscribers_.clear();
+
+        if (changed) {
+          subscribers_ = replacement;
+          if (media_) {
+            media_->notifySubscribersChanged(subscribers_);
+          }
+        }
+
+        if (subscribers_->size() < 1) {
+          found = UseSettingsPtr();
+
+          auto engine = mediaEngine_.lock();
+          if (engine) {
+            engine->notifyDeviceIsIdleOrShutdownStateChanged();
+          }
+        }
+
+        if (found) {
+          if (found == requiredSettings_) {
+            ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "optimal device mode has not changed");
+            return true;
+          }
+        }
+
+        if (isReady()) {
+          setState(IMediaDevice::State_Reinitializing);
+        }
+
+        requiredSettings_ = found;
+        if (media_) {
+          media_->shutdown();
+        }
+      }
+      return false;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::stepWaitForMediaDevice()
+    {
+      if (media_->isShutdown()) {
+        media_.reset();
+      }
+
+      if (!media_) {
+        if (!requiredSettings_) {
+          ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no media device mode required");
+          return false;
+        }
+        media_ = Media::create(getAssociatedMessageQueue(), thisWeak_.lock(), deviceID_, requiredSettings_);
+        media_->notifySubscribersChanged(subscribers_);
+      }
+
+      if (!media_->isReady()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media device is not ready");
+        return false;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media device is ready");
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::setState(States state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, MediaDeviceCaptureAudioSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, IMediaDevice::toString(state), string, oldState, IMediaDevice::toString(currentState_));
+
+      currentState_ = state;
+
+      for (auto iter = subscribers_->begin(); iter != subscribers_->end(); ++iter) {
+        auto &subscriber = (*iter).second;
+        subscriber->notifyStateChanged(currentState_);
+      }
+
+//      MediaEnginePtr pThis = mThisWeak.lock();
+//      if (pThis) {
+//        mSubscriptions.delegate()->onMediaEngineStateChanged(pThis, currentState_);
+//      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, MediaDeviceCaptureAudioSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, MediaDeviceCaptureAudioSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::Media
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    const char *MediaDeviceCaptureAudio::Media::toString(MediaStates state)
+    {
+      switch (state)
+      {
+        case MediaState_Pending:        return "pending";
+        case MediaState_Ready:          return "ready";
+        case MediaState_ShuttingDown:   return "shutting down";
+        case MediaState_Shutdown:       return "shutdown";
+      }
+      return "UNKNOWN";
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureAudio::Media::Media(
+                                          const make_private &,
+                                          IMessageQueuePtr queue,
+                                          UseOuterPtr outer,
+                                          const String &deviceID,
+                                          UseSettingsPtr settings
+                                          ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      outer_(outer),
+      deviceID_(deviceID),
+      settings_(settings),
+      trace_(MediaChannelTrace::create(id_))
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceCaptureAudioMediaCreate, ol, MediaEngine, Start, puid, id, id_, string, deviceID, deviceID_);
+
+      trace_->mKind = IMediaStreamTrackTypes::Kind_Audio;
+      trace_->mSettings = settings;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::Media::init()
+    {
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureAudio::Media::~Media()
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceCaptureAudioMediaDestroy, ol, MediaEngine, Stop, puid, id, id_, string, deviceID, deviceID_);
+
+      thisWeak_.reset();
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureAudio::MediaPtr MediaDeviceCaptureAudio::Media::create(
+                                                                             IMessageQueuePtr queue,
+                                                                             UseOuterPtr outer,
+                                                                             const String &deviceID,
+                                                                             UseSettingsPtr settings
+                                                                             )
+    {
+      auto pThis(make_shared<Media>(make_private{}, queue, outer, deviceID, settings));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::Media => (for MediaDeviceCaptureAudio)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::Media::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureAudioMediaShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      auto pThis = thisWeak_.lock();
+      postClosure([pThis] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->cancel();
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::Media::isReady() const
+    {
+      AutoRecursiveLock lock(*this);
+      return MediaState_Ready == currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::Media::isShuttingDown() const
+    {
+      AutoRecursiveLock lock(*this);
+      return MediaState_ShuttingDown == currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::Media::isShutdown() const
+    {
+      AutoRecursiveLock lock(*this);
+      return MediaState_Shutdown == currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::Media::notifySubscribersChanged(MediaSubscriberMapPtr subscribers)
+    {
+      AutoRecursiveLock lock(*this);
+      subscribers_ = subscribers;
+    }
+
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::Media => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::Media::onWake()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureAudioMediaWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::Media => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::Media::cancel()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureAudioMediaCancel, ol, MediaEngine, Cancel, puid, id, id_);
+
+      if (isShutdown()) return;
+
+      setState(MediaState_ShuttingDown);
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+#define TODO 1
+#define TODO 2
+      }
+
+      setState(MediaState_Shutdown);
+
+#define TODO 1
+#define TODO 2
+
+      auto outer = outer_.lock();
+      if (outer) {
+        outer->notifyMediaStateChanged();
+      }
+
+      gracefulShutdownReference_.reset();
+      outer_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::Media::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaDeviceCaptureAudioMediaStep, ol, MediaEngine, Step, puid, id, id_);
+
+#define TODO 1
+#define TODO 2
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, MediaDeviceCaptureAudioMediaStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      // if (!stepDoSomething()) goto return;
+
+      goto ready;
+
+    ready:
+      {
+        setState(MediaState_Ready);
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::Media::setState(MediaStates state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, MediaDeviceCaptureAudioMediaSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, toString(state), string, oldState, toString(currentState_));
+
+      currentState_ = state;
+
+      if (MediaState_Ready == state) {
+        auto outer = outer_.lock();
+        if (outer) {
+          outer->notifyMediaStateChanged();
+        }
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::Media::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::Media::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, MediaDeviceCaptureAudioMediaSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, MediaDeviceCaptureAudioMediaSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+
+      auto pThis = thisWeak_.lock();
+      if (pThis) {
+        auto outer = outer_.lock();
+        if (outer) {
+          outer->notifyMediaFailure(pThis, lastError_, lastErrorReason_);
+        }
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::Media::internalNotifySubscribersOfFrame(AudioFramePtr frame)
+    {
+      MediaSubscriberMapPtr subscribers;
+
+      ZS_EVENTING_1(x, e, Insane, MediaDeviceCaptureAudioMediaNotifySubscribersOfFrame, ol, MediaEngine, InternalEvent, puid, id, id_);
+
+      {
+        AutoRecursiveLock lock(*this);
+        subscribers = subscribers_;
+      }
+
+      if (!subscribers) return;
+
+      for (auto iter = subscribers->begin(); iter != subscribers->end(); ++iter)
+      {
+        auto &subscriber = (*iter).second;
+        subscriber->notifyFrame(trace_, frame);
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::MediaSubscriber
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureAudio::MediaSubscriber::MediaSubscriber(
+                                                              const make_private &,
+                                                              IMessageQueuePtr queue,
+                                                              UseOuterPtr outer,
+                                                              TrackConstraintsPtr constraints,
+                                                              IMediaDeviceCaptureDelegatePtr delegate
+                                                              ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      outer_(outer),
+      constraints_(constraints),
+      notifyDelegate_(delegate_),
+      delegate_(IMediaDeviceCaptureDelegateProxy::createWeak(delegate)),
+      traceHelper_(id_)
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceCaptureAudioMediaSubscriberCreate, ol, MediaEngine, Start, puid, id, id_, puid, outerId, outer->getID());
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::MediaSubscriber::init()
+    {
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureAudio::MediaSubscriber::~MediaSubscriber()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureAudioMediaSubscriberDestroy, ol, MediaEngine, Stop, puid, id, id_);
+
+      thisWeak_.reset();
+      cancel();
+    }
+
+    MediaDeviceCaptureAudio::MediaSubscriberPtr MediaDeviceCaptureAudio::MediaSubscriber::create(
+                                                                                                 IMessageQueuePtr queue,
+                                                                                                 UseOuterPtr outer,
+                                                                                                 TrackConstraintsPtr constraints,
+                                                                                                 IMediaDeviceCaptureDelegatePtr delegate
+                                                                                                 )
+    {
+      auto pThis(make_shared<MediaSubscriber>(make_private{}, queue, outer, constraints, delegate));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => (for MediaDeviceCaptureAudio)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::MediaSubscriber::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureAudioMediaSubscriberShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      outer_.reset();
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureAudio::MediaSubscriber::isShutdown() const
+    {
+      return IMediaDevice::State_Shutdown == getState();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::MediaSubscriber::notifyStateChanged(States state)
+    {
+      auto pThis = thisWeak_.lock();
+
+      postClosure([pThis, state] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->setState(state);
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => (for Media)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::MediaSubscriber::notifyFrame(
+                                                               ImmutableMediaChannelTracePtr trace,
+                                                               AudioFramePtr frame
+                                                               )
+    {
+      IMediaDeviceCaptureDelegatePtr delegate;
+
+      {
+        AutoRecursiveLock lock(*this);
+        delegate = notifyDelegate_.lock();
+      }
+
+      if (!delegate) return;
+      delegate->notifyMediaDeviceCaptureAudioFrame(traceHelper_.trace(trace), frame);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => IMediaDevice
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::MediaSubscriber::cancel()
+    {
+      AutoRecursiveLock lock(*this);
+
+      setState(IMediaDevice::State_ShuttingDown);
+
+      setState(IMediaDevice::State_Shutdown);
+
+      auto outer = outer_.lock();
+      if (outer) {
+        outer->notifySusbcriberGone();
+      }
+      outer_.reset();
+
+      delegate_.reset();
+      notifyDelegate_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    IMediaDevice::States MediaDeviceCaptureAudio::MediaSubscriber::getState() const
+    {
+      AutoRecursiveLock lock(*this);
+      return lastReportedState_;
+    }
+
+    //---------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => IMediaDeviceCapture
+    #pragma mark
+
+    //---------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => IMediaDeviceCaptureAudio
+    #pragma mark
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureAudio::MediaSubscriber::setState(States state)
+    {
+      if (state == lastReportedState_) return;
+      if (IMediaDevice::State_Shutdown == lastReportedState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, MediaDeviceCaptureAudioMediaSubscriberSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, IMediaDevice::toString(state), string, oldState, IMediaDevice::toString(lastReportedState_));
+
+      lastReportedState_ = state;
+
+      auto pThis = thisWeak_.lock();
+      if (!pThis) return;
+      if (!delegate_) return;
+
+      try {
+        delegate_->onMediaDeviceCaptureStateChanged(pThis, state);
+      } catch (const IMediaDeviceCaptureDelegateProxy::Exceptions::DelegateGone &) {
+        delegate_.reset();
+      }
+    }
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureAudioFactory
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaDeviceCaptureAudioFactory &IMediaDeviceCaptureAudioFactory::singleton()
+    {
+      return MediaDeviceCaptureAudioFactory::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureAudioPtr IMediaDeviceCaptureAudioFactory::create(
+                                                                       UseMediaEnginePtr mediaEngine,
+                                                                       const String &deviceID
+                                                                       )
+    {
+      if (this) {}
+      return internal::MediaDeviceCaptureAudio::create(mediaEngine, deviceID);
+    }
+
+  } // internal namespace
+}
diff --git a/ortc/cpp/ortc_MediaDeviceCaptureVideo.cpp b/ortc/cpp/ortc_MediaDeviceCaptureVideo.cpp
new file mode 100644
index 00000000..b62f6572
--- /dev/null
+++ b/ortc/cpp/ortc_MediaDeviceCaptureVideo.cpp
@@ -0,0 +1,1283 @@
+/*
+
+ Copyright (c) 2017, Hookflash Inc. / Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_MediaDeviceCaptureVideo.h>
+#include <ortc/internal/ortc_MediaEngine.h>
+//#include <ortc/internal/ortc_MediaStreamTrack.h>
+//#include <ortc/internal/ortc_MediaDeviceCaptureVideo.h>
+//#include <ortc/internal/ortc_MediaDeviceCaptureVideo.h>
+//#include <ortc/internal/ortc_MediaDeviceRenderVideo.h>
+////#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
+////#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
+////#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
+////#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
+//#include <ortc/internal/ortc_RTPPacket.h>
+//#include <ortc/internal/ortc_RTCPPacket.h>
+#include <ortc/internal/ortc_ORTC.h>
+#include <ortc/internal/ortc_StatsReport.h>
+#include <ortc/internal/ortc.events.h>
+#include <ortc/internal/platform.h>
+
+#include <ortc/IStatsReport.h>
+//
+//#include <ortc/IHelper.h>
+#include <ortc/services/IHTTP.h>
+//
+#include <zsLib/ISettings.h>
+//#include <zsLib/Singleton.h>
+//#include <zsLib/Log.h>
+//#include <zsLib/XML.h>
+//#include <zsLib/SafeInt.h>
+//
+//#include <cryptopp/sha.h>
+//
+//#include <webrtc/base/event_tracer.h>
+
+#if 0
+#include <limits>
+#include <float.h>
+#include <math.h>
+
+#include <webrtc/rtc_base/timeutils.h>
+#include <webrtc/call/rtc_event_log.h>
+#include <webrtc/voice_engine/include/voe_codec.h>
+#include <webrtc/voice_engine/include/voe_rtp_rtcp.h>
+#include <webrtc/voice_engine/include/voe_network.h>
+#include <webrtc/voice_engine/include/voe_hardware.h>
+#include <webrtc/system_wrappers/include/cpu_info.h>
+#include <webrtc/voice_engine/include/voe_audio_processing.h>
+#include <webrtc/modules/video_capture/video_capture_factory.h>
+#include <webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h>
+#ifdef WINRT
+#include <third_party/h264_winrt/h264_winrt_factory.h>
+#endif
+#endif //0
+
+#ifdef _DEBUG
+#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
+#else
+#define ASSERT(x)
+#endif //_DEBUG
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+
+  namespace internal
+  {
+    ZS_DECLARE_CLASS_PTR(MediaDeviceCaptureVideoSettingsDefaults);
+    ZS_DECLARE_TYPEDEF_PTR(IStatsReportForInternal, UseStatsReport);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo (helpers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideoSettingsDefaults
+    #pragma mark
+
+    class MediaDeviceCaptureVideoSettingsDefaults : public ISettingsApplyDefaultsDelegate
+    {
+    public:
+      //-----------------------------------------------------------------------
+      ~MediaDeviceCaptureVideoSettingsDefaults()
+      {
+        ISettings::removeDefaults(*this);
+      }
+
+      //-----------------------------------------------------------------------
+      static MediaDeviceCaptureVideoSettingsDefaultsPtr singleton()
+      {
+        static SingletonLazySharedPtr<MediaDeviceCaptureVideoSettingsDefaults> singleton(create());
+        return singleton.singleton();
+      }
+
+      //-----------------------------------------------------------------------
+      static MediaDeviceCaptureVideoSettingsDefaultsPtr create()
+      {
+        auto pThis(make_shared<MediaDeviceCaptureVideoSettingsDefaults>());
+        ISettings::installDefaults(pThis);
+        return pThis;
+      }
+
+      //-----------------------------------------------------------------------
+      virtual void notifySettingsApplyDefaults() override
+      {
+      }
+      
+    };
+
+    //-------------------------------------------------------------------------
+    void installMediaDeviceCaptureVideoSettingsDefaults()
+    {
+      MediaDeviceCaptureVideoSettingsDefaults::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureVideoForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaDeviceCaptureVideoForMediaEngine::ForMediaEnginePtr IMediaDeviceCaptureVideoForMediaEngine::create(
+                                                                                                             UseMediaEnginePtr mediaEngine,
+                                                                                                             const String &deviceID
+                                                                                                             )
+    {
+      return internal::IMediaDeviceCaptureVideoFactory::singleton().create(mediaEngine, deviceID);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureVideo::MediaDeviceCaptureVideo(
+                                                     const make_private &,
+                                                     IMessageQueuePtr queue,
+                                                     UseMediaEnginePtr mediaEngine,
+                                                     const String &deviceID
+                                                     ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      mediaEngine_(mediaEngine),
+      deviceID_(deviceID),
+      subscribers_(make_shared<MediaSubscriberMap>())
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceCaptureVideoCreate, ol, MediaEngine, Start, puid, id, id_, string, deviceID, deviceID_);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::init()
+    {
+      AutoRecursiveLock lock(*this);
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureVideo::~MediaDeviceCaptureVideo()
+    {
+      if (isNoop()) return;
+
+      thisWeak_.reset();
+
+      cancel();
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureVideoDestroy, ol, MediaEngine, Stop, puid, id, id_);
+    }
+
+    //-----------------------------------------------------------------------
+    MediaDeviceCaptureVideoPtr MediaDeviceCaptureVideo::create(
+                                                               UseMediaEnginePtr mediaEngine,
+                                                               const String &deviceID
+                                                               )
+    {
+      auto pThis(make_shared<MediaDeviceCaptureVideo>(make_private{}, IORTCForInternal::queueMediaDevices(), mediaEngine, deviceID));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureVideoPtr MediaDeviceCaptureVideo::convert(ForMediaEnginePtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaDeviceCaptureVideo, object);
+    }
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo => (for Media)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::notifyMediaStateChanged()
+    {
+      ZS_EVENTING_1(x, i, Debug, MediaDeviceCaptureVideoNotifyMediaStateChanged, ol, MediaEngine, Event, puid, id, id_);
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::notifyMediaFailure(
+                                                     MediaPtr media,
+                                                     WORD errorCode,
+                                                     const char *inReason
+                                                     )
+    {
+      ZS_EVENTING_2(x, e, Debug, MediaDeviceCaptureVideoNotifyMediaFailure, ol, MediaEngine, Event, puid, id, id_, puid, mediaId, media->getID());
+
+      auto pThis = thisWeak_.lock();
+      String reason(inReason);
+      postClosure([pThis, media, errorCode, reason] {
+        AutoRecursiveLock lock(*pThis);
+
+        if (media != pThis->media_) return;
+
+        pThis->setError(errorCode, reason);
+        pThis->cancel();
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo => (for MediaSubscribers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::notifySusbcriberGone()
+    {
+      ZS_EVENTING_1(x, i, Debug, MediaDeviceCaptureVideoNotifySubscriberGone, ol, MediaEngine, Event, puid, id, id_);
+
+      recheckMode_ = true;
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo => IMediaDeviceForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::isDeviceIdle()
+    {
+      AutoRecursiveLock lock(*this);
+
+      if (isShutdown()) return true;
+
+      if (pendingSubscribers_.size() > 0) return false;
+      if (subscribers_->size() > 0) return false;
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureVideoShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureVideo::States MediaDeviceCaptureVideo::getState() const
+    {
+      AutoRecursiveLock lock(*this);
+      return currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo => IMediaDeviceCaptureForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::mediaDeviceCaptureSubscribe(
+                                                              MediaDeviceCapturePromisePtr promise,
+                                                              MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                              TrackConstraintsPtr constraints,
+                                                              IMediaDeviceCaptureDelegatePtr delegate
+                                                              )
+    {    
+      auto pThis = thisWeak_.lock();
+
+      PendingSubscriber info;
+      info.promise_ = promise;
+      info.repaceExistingDeviceObjectID_ = repaceExistingDeviceObjectID;
+      info.constraints_ = constraints;
+      info.delegate_ = delegate;
+
+      postClosure([pThis, info] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->pendingSubscribers_.push_back(info);
+        pThis->step();
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo => IMediaDeviceCaptureVideoForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::onWake()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaDeviceCaptureVideoOnWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo => IPromiseSettledDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::onPromiseSettled(PromisePtr promise)
+    {
+      ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoOnPromiseSettled, ol, MediaEngine, Event, puid, id, id_, puid, promiseId, promise->getID());
+
+      AutoRecursiveLock lock(*this);
+
+      if (deviceModesPromise_) {
+        if (deviceModesPromise_->getID() == promise->getID()) {
+          if (promise->isRejected()) {
+            setError(promise);
+            cancel();
+            return;
+          }
+        }
+      }
+
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::cancel()
+    {
+      //.......................................................................
+      // try to gracefully shutdown
+
+      if (isShutdown()) return;
+
+      setState(IMediaDevice::State_ShuttingDown);
+
+      deviceModesPromise_.reset();
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+        ZS_EVENTING_2(x, i, Debug, MediaDeviceCaptureVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "graceful");
+
+        // perform any graceful asynchronous shutdown processes needed and
+        // re-attempt shutdown again later if needed.
+
+        if (!stepShutdownPendingRequests()) return;
+        if (!stepShutdownSubscribers()) return;
+        if (!stepShutdownMedia()) return;
+      }
+
+      //.......................................................................
+      // final cleanup (hard shutdown)
+
+      setState(IMediaDevice::State_Shutdown);
+
+      stepShutdownPendingRequests();
+      stepShutdownSubscribers();
+      stepShutdownMedia();
+
+      auto engine = mediaEngine_.lock();
+      if (engine) {
+        engine->notifyDeviceIsIdleOrShutdownStateChanged();
+      }
+
+      // make sure to cleanup any final reference to self
+      gracefulShutdownReference_.reset();
+
+      mediaEngine_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::stepShutdownPendingRequests()
+    {
+      ZS_EVENTING_2(x, i, Debug, MediaDeviceCaptureVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "pending requests");
+
+      for (auto iter_doNotUse = pendingSubscribers_.begin(); iter_doNotUse != pendingSubscribers_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto pending = (*current).promise_;
+
+        pending->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+        pendingSubscribers_.erase(current);
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::stepShutdownSubscribers()
+    {
+      if (subscribers_->size() < 1) return true;
+
+      ZS_EVENTING_2(x, i, Debug, MediaDeviceCaptureVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "subscribers");
+
+      for (auto iter_doNotUse = subscribers_->begin(); iter_doNotUse != subscribers_->end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto subscriber = (*current).second;
+
+        subscriber->shutdown();
+      }
+
+      // empty the subscriber list
+      subscribers_ = make_shared<MediaSubscriberMap>();
+
+      if (media_) {
+        media_->notifySubscribersChanged(subscribers_);
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::stepShutdownMedia()
+    {
+      ZS_EVENTING_2(x, i, Debug, MediaDeviceCaptureVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media");
+
+      if (!media_) return true;
+
+      media_->shutdown();
+      bool shutdown = media_->isShutdown();
+      if (shutdown) {
+        media_.reset();
+      }
+      return shutdown;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaDeviceCaptureVideoStep, ol, MediaEngine, Step, puid, id, id_);
+
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, MediaDeviceCaptureVideoStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      if (!stepMediaReinitializationShutdown()) goto reinitializing;
+      if (!stepDiscoverModes()) goto not_ready;
+      if (!stepFigureOutMode()) goto not_ready;
+      if (!stepWaitForMediaDevice()) goto not_ready;
+
+      goto ready;
+
+    not_ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "not ready");
+        return;
+      }
+
+    reinitializing:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "reinitializing");
+        setState(IMediaDevice::State_Reinitializing);
+        return;
+      }
+
+    ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "ready");
+        setState(IMediaDevice::State_Active);
+        return;
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::stepMediaReinitializationShutdown()
+    {
+      if (!media_) goto no_media_to_shutdown;
+
+      if (media_->isShuttingDown()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "waiting for media shutdown to reinialize");
+        return false;
+      }
+
+      if (media_->isShutdown()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media shutdown");
+        media_.reset();
+        return true;
+      }
+
+    no_media_to_shutdown:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no media to shutdown");
+      }
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::stepDiscoverModes()
+    {
+      if (!deviceModesPromise_) {
+        deviceModesPromise_ = IMediaDevices::enumerateDefaultModes(deviceID_);
+
+        if (!deviceModesPromise_) {
+          setError(UseHTTP::HTTPStatusCode_ExpectationFailed, (String("unable to discover modes for an video media device: ") + deviceID_).c_str());
+          cancel();
+          return false;
+        }
+        deviceModesPromise_->thenWeak(thisWeak_.lock());
+      }
+
+      if (!deviceModesPromise_->isSettled()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "waiting for device modes to be known");
+        return false;
+      }
+
+      if (deviceModesPromise_->isRejected()) {
+        setError(deviceModesPromise_);
+        cancel();
+        return false;
+      }
+
+      auto settingsList = deviceModesPromise_->value();
+
+      if (!settingsList) {
+        setError(UseHTTP::HTTPStatusCode_ExpectationFailed, (String("no modes found for video media device: ") + deviceID_).c_str());
+        cancel();
+        return false;
+      }
+
+      ZS_EVENTING_3(x, i, Debug, MediaDeviceCaptureVideoStepModesFound, ol, MediaEngine, Step,
+        puid, id, id_,
+        string, deviceId, deviceID_,
+        size_t, totalModes, settingsList->size());
+
+      // copy modes to shared pointer list of settings
+      for (auto iter = settingsList->begin(); iter != settingsList->end(); ++iter)
+      {
+        deviceModes_.push_back(make_shared<UseSettings>(*iter));
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::stepFigureOutMode()
+    {
+      {
+        if (recheckMode_) goto mode_needed;
+        if (!media_) goto mode_needed;
+        if (pendingSubscribers_.size() > 0) goto mode_needed;
+        return true;
+      }
+
+    mode_needed:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "figure out mode");
+
+        recheckMode_ = false;
+
+        TrackConstraintsList allConstraints;
+
+        for (auto iter = pendingSubscribers_.begin(); iter != pendingSubscribers_.end(); ++iter)
+        {
+          auto &info = (*iter);
+          allConstraints.push_back(info.constraints_);
+        }
+
+        for (auto iter = subscribers_->begin(); iter != subscribers_->end(); ++iter) {
+          auto &subscriber = (*iter).second;
+          allConstraints.push_back(subscriber->getConstraints());
+        }
+
+        auto found = obtainBestMode(allConstraints, deviceModes_);
+
+        bool changed = false;
+
+        MediaSubscriberMapPtr replacement(make_shared<MediaSubscriberMap>());
+        for (auto iter = subscribers_->begin(); iter != subscribers_->end(); ++iter) {
+          auto &subscriber = (*iter).second;
+          if (subscriber->isShutdown()) {
+            changed = true;
+            continue;
+          }
+          (*replacement)[(*iter).first] = subscriber;
+        }
+
+        if (found) {
+          for (auto iter = pendingSubscribers_.begin(); iter != pendingSubscribers_.end(); ++iter) {
+            auto &info = (*iter);
+            auto subscriber = MediaSubscriber::create(getAssociatedMessageQueue(), thisWeak_.lock(), info.constraints_, info.delegate_);
+            info.promise_->resolve(IMediaDeviceCapturePtr(subscriber));
+            subscriber->notifyStateChanged(currentState_);
+            changed = true;
+            (*replacement)[subscriber->getID()] = subscriber;
+          }
+        } else {
+          for (auto iter = pendingSubscribers_.begin(); iter != pendingSubscribers_.end(); ++iter) {
+            auto &info = (*iter);
+            info.promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Conflict, "over constrained"));
+          }
+        }
+        pendingSubscribers_.clear();
+
+        if (changed) {
+          subscribers_ = replacement;
+          if (media_) {
+            media_->notifySubscribersChanged(subscribers_);
+          }
+        }
+
+        if (subscribers_->size() < 1) {
+          found = UseSettingsPtr();
+
+          auto engine = mediaEngine_.lock();
+          if (engine) {
+            engine->notifyDeviceIsIdleOrShutdownStateChanged();
+          }
+        }
+
+        if (found) {
+          if (found == requiredSettings_) {
+            ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "optimal device mode has not changed");
+            return true;
+          }
+        }
+
+        if (isReady()) {
+          setState(IMediaDevice::State_Reinitializing);
+        }
+
+        requiredSettings_ = found;
+        if (media_) {
+          media_->shutdown();
+        }
+      }
+      return false;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::stepWaitForMediaDevice()
+    {
+      if (media_->isShutdown()) {
+        media_.reset();
+      }
+
+      if (!media_) {
+        if (!requiredSettings_) {
+          ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no media device mode required");
+          return false;
+        }
+        media_ = Media::create(getAssociatedMessageQueue(), thisWeak_.lock(), deviceID_, requiredSettings_);
+        media_->notifySubscribersChanged(subscribers_);
+      }
+
+      if (!media_->isReady()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media device is not ready");
+        return false;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, MediaDeviceCaptureVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media device is ready");
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::setState(States state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, MediaDeviceCaptureVideoSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, IMediaDevice::toString(state), string, oldState, IMediaDevice::toString(currentState_));
+
+      currentState_ = state;
+
+      for (auto iter = subscribers_->begin(); iter != subscribers_->end(); ++iter) {
+        auto &subscriber = (*iter).second;
+        subscriber->notifyStateChanged(currentState_);
+      }
+
+//      MediaEnginePtr pThis = mThisWeak.lock();
+//      if (pThis) {
+//        mSubscriptions.delegate()->onMediaEngineStateChanged(pThis, currentState_);
+//      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, MediaDeviceCaptureVideoSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, MediaDeviceCaptureVideoSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::Media
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    const char *MediaDeviceCaptureVideo::Media::toString(MediaStates state)
+    {
+      switch (state)
+      {
+        case MediaState_Pending:        return "pending";
+        case MediaState_Ready:          return "ready";
+        case MediaState_ShuttingDown:   return "shutting down";
+        case MediaState_Shutdown:       return "shutdown";
+      }
+      return "UNKNOWN";
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureVideo::Media::Media(
+                                          const make_private &,
+                                          IMessageQueuePtr queue,
+                                          UseOuterPtr outer,
+                                          const String &deviceID,
+                                          UseSettingsPtr settings
+                                          ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      outer_(outer),
+      deviceID_(deviceID),
+      settings_(settings),
+      trace_(MediaChannelTrace::create(id_))
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceCaptureVideoMediaCreate, ol, MediaEngine, Start, puid, id, id_, string, deviceID, deviceID_);
+
+      trace_->mKind = IMediaStreamTrackTypes::Kind_Video;
+      trace_->mSettings = settings_;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::Media::init()
+    {
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureVideo::Media::~Media()
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceCaptureVideoMediaDestroy, ol, MediaEngine, Stop, puid, id, id_, string, deviceID, deviceID_);
+
+      thisWeak_.reset();
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureVideo::MediaPtr MediaDeviceCaptureVideo::Media::create(
+                                                                             IMessageQueuePtr queue,
+                                                                             UseOuterPtr outer,
+                                                                             const String &deviceID,
+                                                                             UseSettingsPtr settings
+                                                                             )
+    {
+      auto pThis(make_shared<Media>(make_private{}, queue, outer, deviceID, settings));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::Media => (for MediaDeviceCaptureVideo)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::Media::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureVideoMediaShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      auto pThis = thisWeak_.lock();
+      postClosure([pThis] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->cancel();
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::Media::isReady() const
+    {
+      AutoRecursiveLock lock(*this);
+      return MediaState_Ready == currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::Media::isShuttingDown() const
+    {
+      AutoRecursiveLock lock(*this);
+      return MediaState_ShuttingDown == currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::Media::isShutdown() const
+    {
+      AutoRecursiveLock lock(*this);
+      return MediaState_Shutdown == currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::Media::notifySubscribersChanged(MediaSubscriberMapPtr subscribers)
+    {
+      AutoRecursiveLock lock(*this);
+      subscribers_ = subscribers;
+    }
+
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::Media => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::Media::onWake()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureVideoMediaWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::Media => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::Media::cancel()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureVideoMediaCancel, ol, MediaEngine, Cancel, puid, id, id_);
+
+      if (isShutdown()) return;
+
+      setState(MediaState_ShuttingDown);
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+#define TODO 1
+#define TODO 2
+      }
+
+      setState(MediaState_Shutdown);
+
+#define TODO 1
+#define TODO 2
+
+      auto outer = outer_.lock();
+      if (outer) {
+        outer->notifyMediaStateChanged();
+      }
+
+      gracefulShutdownReference_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::Media::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaDeviceCaptureVideoMediaStep, ol, MediaEngine, Step, puid, id, id_);
+
+#define TODO 1
+#define TODO 2
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, MediaDeviceCaptureVideoMediaStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      // if (!stepDoSomething()) goto return;
+
+      goto ready;
+
+    ready:
+      {
+        setState(MediaState_Ready);
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::Media::setState(MediaStates state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, MediaDeviceCaptureVideoMediaSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, toString(state), string, oldState, toString(currentState_));
+
+      currentState_ = state;
+
+      if (MediaState_Ready == state) {
+        auto outer = outer_.lock();
+        if (outer) {
+          outer->notifyMediaStateChanged();
+        }
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::Media::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::Media::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, MediaDeviceCaptureVideoMediaSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, MediaDeviceCaptureVideoMediaSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+
+      auto pThis = thisWeak_.lock();
+      if (pThis) {
+        auto outer = outer_.lock();
+        if (outer) {
+          outer->notifyMediaFailure(pThis, lastError_, lastErrorReason_);
+        }
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::Media::internalNotifySubscribersOfFrame(VideoFramePtr frame)
+    {
+      MediaSubscriberMapPtr subscribers;
+
+      ZS_EVENTING_1(x, e, Insane, MediaDeviceCaptureVideoMediaNotifySubscribersOfFrame, ol, MediaEngine, InternalEvent, puid, id, id_);
+
+      {
+        AutoRecursiveLock lock(*this);
+        subscribers = subscribers_;
+      }
+
+      if (!subscribers) return;
+
+      for (auto iter = subscribers->begin(); iter != subscribers->end(); ++iter)
+      {
+        auto &subscriber = (*iter).second;
+        subscriber->notifyFrame(trace_, frame);
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::MediaSubscriber
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureVideo::MediaSubscriber::MediaSubscriber(
+                                                              const make_private &,
+                                                              IMessageQueuePtr queue,
+                                                              UseOuterPtr outer,
+                                                              TrackConstraintsPtr constraints,
+                                                              IMediaDeviceCaptureDelegatePtr delegate
+                                                              ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      outer_(outer),
+      constraints_(constraints),
+      notifyDelegate_(delegate_),
+      delegate_(IMediaDeviceCaptureDelegateProxy::createWeak(delegate)),
+      traceHelper_(id_)
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceCaptureVideoMediaSubscriberCreate, ol, MediaEngine, Start, puid, id, id_, puid, outerId, outer->getID());
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::MediaSubscriber::init()
+    {
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureVideo::MediaSubscriber::~MediaSubscriber()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureVideoMediaSubscriberDestroy, ol, MediaEngine, Stop, puid, id, id_);
+
+      thisWeak_.reset();
+      cancel();
+    }
+
+    MediaDeviceCaptureVideo::MediaSubscriberPtr MediaDeviceCaptureVideo::MediaSubscriber::create(
+                                                                                                 IMessageQueuePtr queue,
+                                                                                                 UseOuterPtr outer,
+                                                                                                 TrackConstraintsPtr constraints,
+                                                                                                 IMediaDeviceCaptureDelegatePtr delegate
+                                                                                                 )
+    {
+      auto pThis(make_shared<MediaSubscriber>(make_private{}, queue, outer, constraints, delegate));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => (for MediaDeviceCaptureVideo)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::MediaSubscriber::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceCaptureVideoMediaSubscriberShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceCaptureVideo::MediaSubscriber::isShutdown() const
+    {
+      return IMediaDevice::State_Shutdown == getState();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::MediaSubscriber::notifyStateChanged(States state)
+    {
+      auto pThis = thisWeak_.lock();
+
+      postClosure([pThis, state] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->setState(state);
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => (for Media)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::MediaSubscriber::notifyFrame(
+                                                               ImmutableMediaChannelTracePtr trace,
+                                                               VideoFramePtr frame
+                                                               )
+    {
+      IMediaDeviceCaptureDelegatePtr delegate;
+
+      {
+        AutoRecursiveLock lock(*this);
+        delegate = notifyDelegate_.lock();
+      }
+
+      if (!delegate) return;
+      delegate->notifyMediaDeviceCaptureVideoFrame(traceHelper_.trace(trace), frame);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => IMediaDevice
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::MediaSubscriber::cancel()
+    {
+      AutoRecursiveLock lock(*this);
+
+      setState(IMediaDevice::State_ShuttingDown);
+
+      setState(IMediaDevice::State_Shutdown);
+
+      auto outer = outer_.lock();
+      if (outer) {
+        outer->notifySusbcriberGone();
+      }
+
+      delegate_.reset();
+      notifyDelegate_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    IMediaDevice::States MediaDeviceCaptureVideo::MediaSubscriber::getState() const
+    {
+      AutoRecursiveLock lock(*this);
+      return lastReportedState_;
+    }
+
+    //---------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => IMediaDeviceCapture
+    #pragma mark
+
+    //---------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => IMediaDeviceCaptureVideo
+    #pragma mark
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceCaptureVideo::MediaSubscriber::setState(States state)
+    {
+      if (state == lastReportedState_) return;
+      if (IMediaDevice::State_Shutdown == lastReportedState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, MediaDeviceCaptureVideoMediaSubscriberSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, IMediaDevice::toString(state), string, oldState, IMediaDevice::toString(lastReportedState_));
+
+      lastReportedState_ = state;
+
+      auto pThis = thisWeak_.lock();
+      if (!pThis) return;
+      if (!delegate_) return;
+
+      try {
+        delegate_->onMediaDeviceCaptureStateChanged(pThis, state);
+      } catch (const IMediaDeviceCaptureDelegateProxy::Exceptions::DelegateGone &) {
+        delegate_.reset();
+      }
+    }
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureVideoFactory
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaDeviceCaptureVideoFactory &IMediaDeviceCaptureVideoFactory::singleton()
+    {
+      return MediaDeviceCaptureVideoFactory::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceCaptureVideoPtr IMediaDeviceCaptureVideoFactory::create(
+                                                                       UseMediaEnginePtr mediaEngine,
+                                                                       const String &deviceID
+                                                                       )
+    {
+      if (this) {}
+      return internal::MediaDeviceCaptureVideo::create(mediaEngine, deviceID);
+    }
+
+  } // internal namespace
+}
diff --git a/ortc/cpp/ortc_MediaDeviceRenderAudio.cpp b/ortc/cpp/ortc_MediaDeviceRenderAudio.cpp
new file mode 100644
index 00000000..ad549d98
--- /dev/null
+++ b/ortc/cpp/ortc_MediaDeviceRenderAudio.cpp
@@ -0,0 +1,1250 @@
+/*
+
+ Copyright (c) 2017, Hookflash Inc. / Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_MediaDeviceRenderAudio.h>
+#include <ortc/internal/ortc_MediaEngine.h>
+#include <ortc/internal/ortc_ORTC.h>
+#include <ortc/internal/ortc_StatsReport.h>
+#include <ortc/internal/ortc.events.h>
+#include <ortc/internal/platform.h>
+
+#include <ortc/IStatsReport.h>
+
+#include <ortc/services/IHTTP.h>
+
+#include <zsLib/ISettings.h>
+
+#ifdef _DEBUG
+#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
+#else
+#define ASSERT(x)
+#endif //_DEBUG
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+
+  namespace internal
+  {
+    ZS_DECLARE_CLASS_PTR(MediaDeviceRenderAudioSettingsDefaults);
+    ZS_DECLARE_TYPEDEF_PTR(IStatsReportForInternal, UseStatsReport);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudioSettingsDefaults
+    #pragma mark
+
+    class MediaDeviceRenderAudioSettingsDefaults : public ISettingsApplyDefaultsDelegate
+    {
+    public:
+      //-----------------------------------------------------------------------
+      ~MediaDeviceRenderAudioSettingsDefaults()
+      {
+        ISettings::removeDefaults(*this);
+      }
+
+      //-----------------------------------------------------------------------
+      static MediaDeviceRenderAudioSettingsDefaultsPtr singleton()
+      {
+        static SingletonLazySharedPtr<MediaDeviceRenderAudioSettingsDefaults> singleton(create());
+        return singleton.singleton();
+      }
+
+      //-----------------------------------------------------------------------
+      static MediaDeviceRenderAudioSettingsDefaultsPtr create()
+      {
+        auto pThis(make_shared<MediaDeviceRenderAudioSettingsDefaults>());
+        ISettings::installDefaults(pThis);
+        return pThis;
+      }
+
+      //-----------------------------------------------------------------------
+      virtual void notifySettingsApplyDefaults() override
+      {
+      }
+      
+    };
+
+    //-------------------------------------------------------------------------
+    void installMediaDeviceRenderAudioSettingsDefaults()
+    {
+      MediaDeviceRenderAudioSettingsDefaults::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceRenderAudioForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaDeviceRenderAudioForMediaEngine::ForMediaEnginePtr IMediaDeviceRenderAudioForMediaEngine::create(
+                                                                                                             UseMediaEnginePtr mediaEngine,
+                                                                                                             const String &deviceID
+                                                                                                             )
+    {
+      return internal::IMediaDeviceRenderAudioFactory::singleton().create(mediaEngine, deviceID);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudio::MediaDeviceRenderAudio(
+                                                     const make_private &,
+                                                     IMessageQueuePtr queue,
+                                                     UseMediaEnginePtr mediaEngine,
+                                                     const String &deviceID
+                                                     ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      mediaEngine_(mediaEngine),
+      deviceID_(deviceID),
+      subscribers_(make_shared<MediaSubscriberMap>())
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceRenderAudioCreate, ol, MediaEngine, Start, puid, id, id_, string, deviceID, deviceID_);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::init()
+    {
+      AutoRecursiveLock lock(*this);
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudio::~MediaDeviceRenderAudio()
+    {
+      if (isNoop()) return;
+
+      thisWeak_.reset();
+
+      cancel();
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceRenderAudioDestroy, ol, MediaEngine, Stop, puid, id, id_);
+    }
+
+    //-----------------------------------------------------------------------
+    MediaDeviceRenderAudioPtr MediaDeviceRenderAudio::create(
+                                                               UseMediaEnginePtr mediaEngine,
+                                                               const String &deviceID
+                                                               )
+    {
+      auto pThis(make_shared<MediaDeviceRenderAudio>(make_private{}, IORTCForInternal::queueMediaDevices(), mediaEngine, deviceID));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudioPtr MediaDeviceRenderAudio::convert(ForMediaEnginePtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaDeviceRenderAudio, object);
+    }
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio => (for Media)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::notifyMediaStateChanged()
+    {
+      ZS_EVENTING_1(x, i, Debug, MediaDeviceRenderAudioNotifyMediaStateChanged, ol, MediaEngine, Event, puid, id, id_);
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::notifyMediaFailure(
+                                                     MediaPtr media,
+                                                     WORD errorCode,
+                                                     const char *inReason
+                                                     )
+    {
+      ZS_EVENTING_2(x, e, Debug, MediaDeviceRenderAudioNotifyMediaFailure, ol, MediaEngine, Event, puid, id, id_, puid, mediaId, media->getID());
+
+      auto pThis = thisWeak_.lock();
+      String reason(inReason);
+      postClosure([pThis, media, errorCode, reason] {
+        AutoRecursiveLock lock(*pThis);
+
+        if (media != pThis->media_) return;
+
+        pThis->setError(errorCode, reason);
+        pThis->cancel();
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio => (for MediaSubscribers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::notifySusbcriberGone()
+    {
+      ZS_EVENTING_1(x, i, Debug, MediaDeviceRenderAudioNotifySubscriberGone, ol, MediaEngine, Event, puid, id, id_);
+
+      recheckMode_ = true;
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::notifyAudioFrame(
+                                                  ImmutableMediaChannelTracePtr trace,
+                                                  AudioFramePtr frame
+                                                  )
+    {
+      MediaPtr media;
+
+      {
+        AutoRecursiveLock lock(*this);
+        media = media_;
+      }
+
+      if (!media) return;
+
+      media->notifyAudioFrame(trace, frame);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio => IMediaDeviceForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::isDeviceIdle()
+    {
+      AutoRecursiveLock lock(*this);
+
+      if (isShutdown()) return true;
+
+      if (pendingSubscribers_.size() > 0) return false;
+      if (subscribers_->size() > 0) return false;
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceRenderAudioShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudio::States MediaDeviceRenderAudio::getState() const
+    {
+      AutoRecursiveLock lock(*this);
+      return currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio => IMediaDeviceRenderForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::mediaDeviceRenderSubscribe(
+                                                              MediaDeviceRenderPromisePtr promise,
+                                                              MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                              TrackConstraintsPtr constraints,
+                                                              IMediaDeviceRenderDelegatePtr delegate
+                                                              )
+    {    
+      auto pThis = thisWeak_.lock();
+
+      PendingSubscriber info;
+      info.promise_ = promise;
+      info.repaceExistingDeviceObjectID_ = repaceExistingDeviceObjectID;
+      info.constraints_ = constraints;
+      info.delegate_ = delegate;
+
+      postClosure([pThis, info] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->pendingSubscribers_.push_back(info);
+        pThis->step();
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio => IMediaDeviceRenderAudioForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::onWake()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaDeviceRenderAudioOnWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio => IPromiseSettledDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::onPromiseSettled(PromisePtr promise)
+    {
+      ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioOnPromiseSettled, ol, MediaEngine, Event, puid, id, id_, puid, promiseId, promise->getID());
+
+      AutoRecursiveLock lock(*this);
+
+      if (deviceModesPromise_) {
+        if (deviceModesPromise_->getID() == promise->getID()) {
+          if (promise->isRejected()) {
+            setError(promise);
+            cancel();
+            return;
+          }
+        }
+      }
+
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::cancel()
+    {
+      //.......................................................................
+      // try to gracefully shutdown
+
+      if (isShutdown()) return;
+
+      setState(IMediaDevice::State_ShuttingDown);
+
+      deviceModesPromise_.reset();
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+        ZS_EVENTING_2(x, i, Debug, MediaDeviceRenderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "graceful");
+
+        // perform any graceful asynchronous shutdown processes needed and
+        // re-attempt shutdown again later if needed.
+
+        if (!stepShutdownPendingRequests()) return;
+        if (!stepShutdownSubscribers()) return;
+        if (!stepShutdownMedia()) return;
+      }
+
+      //.......................................................................
+      // final cleanup (hard shutdown)
+
+      setState(IMediaDevice::State_Shutdown);
+
+      stepShutdownPendingRequests();
+      stepShutdownSubscribers();
+      stepShutdownMedia();
+
+      auto engine = mediaEngine_.lock();
+      if (engine) {
+        engine->notifyDeviceIsIdleOrShutdownStateChanged();
+      }
+
+      // make sure to cleanup any final reference to self
+      gracefulShutdownReference_.reset();
+
+      mediaEngine_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::stepShutdownPendingRequests()
+    {
+      ZS_EVENTING_2(x, i, Debug, MediaDeviceRenderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "pending requests");
+
+      for (auto iter_doNotUse = pendingSubscribers_.begin(); iter_doNotUse != pendingSubscribers_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto pending = (*current).promise_;
+
+        pending->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+        pendingSubscribers_.erase(current);
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::stepShutdownSubscribers()
+    {
+      if (subscribers_->size() < 1) return true;
+
+      ZS_EVENTING_2(x, i, Debug, MediaDeviceRenderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "subscribers");
+
+      for (auto iter_doNotUse = subscribers_->begin(); iter_doNotUse != subscribers_->end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto subscriber = (*current).second;
+
+        subscriber->shutdown();
+      }
+
+      // empty the subscriber list
+      subscribers_ = make_shared<MediaSubscriberMap>();
+
+      if (media_) {
+        media_->notifySubscribersChanged(subscribers_);
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::stepShutdownMedia()
+    {
+      ZS_EVENTING_2(x, i, Debug, MediaDeviceRenderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media");
+
+      if (!media_) return true;
+
+      media_->shutdown();
+      bool shutdown = media_->isShutdown();
+      if (shutdown) {
+        media_.reset();
+      }
+      return shutdown;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaDeviceRenderAudioStep, ol, MediaEngine, Step, puid, id, id_);
+
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, MediaDeviceRenderAudioStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      if (!stepMediaReinitializationShutdown()) goto reinitializing;
+      if (!stepDiscoverModes()) goto not_ready;
+      if (!stepFigureOutMode()) goto not_ready;
+      if (!stepWaitForMediaDevice()) goto not_ready;
+
+      goto ready;
+
+    not_ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "not ready");
+        return;
+      }
+
+    reinitializing:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "reinitializing");
+        setState(IMediaDevice::State_Reinitializing);
+        return;
+      }
+
+    ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "ready");
+        setState(IMediaDevice::State_Active);
+        return;
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::stepMediaReinitializationShutdown()
+    {
+      if (!media_) goto no_media_to_shutdown;
+
+      if (media_->isShuttingDown()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "waiting for media shutdown to reinialize");
+        return false;
+      }
+
+      if (media_->isShutdown()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media shutdown");
+        media_.reset();
+        return true;
+      }
+
+    no_media_to_shutdown:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no media to shutdown");
+      }
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::stepDiscoverModes()
+    {
+      if (!deviceModesPromise_) {
+        deviceModesPromise_ = IMediaDevices::enumerateDefaultModes(deviceID_);
+
+        if (!deviceModesPromise_) {
+          setError(UseHTTP::HTTPStatusCode_ExpectationFailed, (String("unable to discover modes for an audio media device: ") + deviceID_).c_str());
+          cancel();
+          return false;
+        }
+        deviceModesPromise_->thenWeak(thisWeak_.lock());
+      }
+
+      if (!deviceModesPromise_->isSettled()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "waiting for device modes to be known");
+        return false;
+      }
+
+      if (deviceModesPromise_->isRejected()) {
+        setError(deviceModesPromise_);
+        cancel();
+        return false;
+      }
+
+      auto settingsList = deviceModesPromise_->value();
+
+      if (!settingsList) {
+        setError(UseHTTP::HTTPStatusCode_ExpectationFailed, (String("no modes found for audio media device: ") + deviceID_).c_str());
+        cancel();
+        return false;
+      }
+
+      ZS_EVENTING_3(x, i, Debug, MediaDeviceRenderAudioStepModesFound, ol, MediaEngine, Step,
+        puid, id, id_,
+        string, deviceId, deviceID_,
+        size_t, totalModes, settingsList->size());
+
+      // copy modes to shared pointer list of settings
+      for (auto iter = settingsList->begin(); iter != settingsList->end(); ++iter)
+      {
+        deviceModes_.push_back(make_shared<UseSettings>(*iter));
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::stepFigureOutMode()
+    {
+      {
+        if (recheckMode_) goto mode_needed;
+        if (!media_) goto mode_needed;
+        if (pendingSubscribers_.size() > 0) goto mode_needed;
+        return true;
+      }
+
+    mode_needed:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "figure out mode");
+
+        recheckMode_ = false;
+
+        TrackConstraintsList allConstraints;
+
+        for (auto iter = pendingSubscribers_.begin(); iter != pendingSubscribers_.end(); ++iter)
+        {
+          auto &info = (*iter);
+          allConstraints.push_back(info.constraints_);
+        }
+
+        for (auto iter = subscribers_->begin(); iter != subscribers_->end(); ++iter) {
+          auto &subscriber = (*iter).second;
+          allConstraints.push_back(subscriber->getConstraints());
+        }
+
+        auto found = obtainBestMode(allConstraints, deviceModes_);
+
+        bool changed = false;
+
+        MediaSubscriberMapPtr replacement(make_shared<MediaSubscriberMap>());
+        for (auto iter = subscribers_->begin(); iter != subscribers_->end(); ++iter) {
+          auto &subscriber = (*iter).second;
+          if (subscriber->isShutdown()) {
+            changed = true;
+            continue;
+          }
+          (*replacement)[(*iter).first] = subscriber;
+        }
+
+        if (found) {
+          for (auto iter = pendingSubscribers_.begin(); iter != pendingSubscribers_.end(); ++iter) {
+            auto &info = (*iter);
+            auto subscriber = MediaSubscriber::create(getAssociatedMessageQueue(), thisWeak_.lock(), info.constraints_, info.delegate_);
+            info.promise_->resolve(IMediaDeviceRenderPtr(subscriber));
+            subscriber->notifyStateChanged(currentState_);
+            changed = true;
+            (*replacement)[subscriber->getID()] = subscriber;
+          }
+        } else {
+          for (auto iter = pendingSubscribers_.begin(); iter != pendingSubscribers_.end(); ++iter) {
+            auto &info = (*iter);
+            info.promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Conflict, "over constrained"));
+          }
+        }
+        pendingSubscribers_.clear();
+
+        if (changed) {
+          subscribers_ = replacement;
+          if (media_) {
+            media_->notifySubscribersChanged(subscribers_);
+          }
+        }
+
+        if (subscribers_->size() < 1) {
+          found = UseSettingsPtr();
+
+          auto engine = mediaEngine_.lock();
+          if (engine) {
+            engine->notifyDeviceIsIdleOrShutdownStateChanged();
+          }
+        }
+
+        if (found) {
+          if (found == requiredSettings_) {
+            ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "optimal device mode has not changed");
+            return true;
+          }
+        }
+
+        if (isReady()) {
+          setState(IMediaDevice::State_Reinitializing);
+        }
+
+        requiredSettings_ = found;
+        if (media_) {
+          media_->shutdown();
+        }
+      }
+      return false;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::stepWaitForMediaDevice()
+    {
+      if (media_->isShutdown()) {
+        media_.reset();
+      }
+
+      if (!media_) {
+        if (!requiredSettings_) {
+          ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no media device mode required");
+          return false;
+        }
+        media_ = Media::create(getAssociatedMessageQueue(), thisWeak_.lock(), deviceID_, requiredSettings_);
+        media_->notifySubscribersChanged(subscribers_);
+      }
+
+      if (!media_->isReady()) {
+        ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media device is not ready");
+        return false;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, MediaDeviceRenderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "media device is ready");
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::setState(States state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, MediaDeviceRenderAudioSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, IMediaDevice::toString(state), string, oldState, IMediaDevice::toString(currentState_));
+
+      currentState_ = state;
+
+      for (auto iter = subscribers_->begin(); iter != subscribers_->end(); ++iter) {
+        auto &subscriber = (*iter).second;
+        subscriber->notifyStateChanged(currentState_);
+      }
+
+//      MediaEnginePtr pThis = mThisWeak.lock();
+//      if (pThis) {
+//        mSubscriptions.delegate()->onMediaEngineStateChanged(pThis, currentState_);
+//      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, MediaDeviceRenderAudioSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, MediaDeviceRenderAudioSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::Media
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    const char *MediaDeviceRenderAudio::Media::toString(MediaStates state)
+    {
+      switch (state)
+      {
+        case MediaState_Pending:        return "pending";
+        case MediaState_Ready:          return "ready";
+        case MediaState_ShuttingDown:   return "shutting down";
+        case MediaState_Shutdown:       return "shutdown";
+      }
+      return "UNKNOWN";
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudio::Media::Media(
+                                          const make_private &,
+                                          IMessageQueuePtr queue,
+                                          UseOuterPtr outer,
+                                          const String &deviceID,
+                                          UseSettingsPtr settings
+                                          ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      outer_(outer),
+      deviceID_(deviceID),
+      settings_(settings)
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceRenderAudioMediaCreate, ol, MediaEngine, Start, puid, id, id_, string, deviceID, deviceID_);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::Media::init()
+    {
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudio::Media::~Media()
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceRenderAudioMediaDestroy, ol, MediaEngine, Stop, puid, id, id_, string, deviceID, deviceID_);
+
+      thisWeak_.reset();
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudio::MediaPtr MediaDeviceRenderAudio::Media::create(
+                                                                             IMessageQueuePtr queue,
+                                                                             UseOuterPtr outer,
+                                                                             const String &deviceID,
+                                                                             UseSettingsPtr settings
+                                                                             )
+    {
+      auto pThis(make_shared<Media>(make_private{}, queue, outer, deviceID, settings));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::Media => (for MediaDeviceRenderAudio)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::Media::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceRenderAudioMediaShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      auto pThis = thisWeak_.lock();
+      postClosure([pThis] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->cancel();
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::Media::isReady() const
+    {
+      AutoRecursiveLock lock(*this);
+      return MediaState_Ready == currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::Media::isShuttingDown() const
+    {
+      AutoRecursiveLock lock(*this);
+      return MediaState_ShuttingDown == currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::Media::isShutdown() const
+    {
+      AutoRecursiveLock lock(*this);
+      return MediaState_Shutdown == currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::Media::notifySubscribersChanged(MediaSubscriberMapPtr subscribers)
+    {
+      AutoRecursiveLock lock(*this);
+      subscribers_ = subscribers;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::Media::notifyAudioFrame(
+                                                         ImmutableMediaChannelTracePtr trace,
+                                                         AudioFramePtr frame
+                                                         )
+    {
+#define TODO 1
+#define TODO 2
+    }
+
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::Media => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::Media::onWake()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceRenderAudioMediaWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::Media => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::Media::cancel()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceRenderAudioMediaCancel, ol, MediaEngine, Cancel, puid, id, id_);
+
+      if (isShutdown()) return;
+
+      setState(MediaState_ShuttingDown);
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+#define TODO 1
+#define TODO 2
+      }
+
+      setState(MediaState_Shutdown);
+
+#define TODO 1
+#define TODO 2
+
+      auto outer = outer_.lock();
+      if (outer) {
+        outer->notifyMediaStateChanged();
+      }
+
+      gracefulShutdownReference_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::Media::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaDeviceRenderAudioMediaStep, ol, MediaEngine, Step, puid, id, id_);
+
+#define TODO 1
+#define TODO 2
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, MediaDeviceRenderAudioMediaStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      // if (!stepDoSomething()) return;
+
+      goto ready;
+
+    ready:
+      {
+        setState(MediaState_Ready);
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::Media::setState(MediaStates state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, MediaDeviceRenderAudioMediaSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, toString(state), string, oldState, toString(currentState_));
+
+      currentState_ = state;
+
+      if (MediaState_Ready == state) {
+        auto outer = outer_.lock();
+        if (outer) {
+          outer->notifyMediaStateChanged();
+        }
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::Media::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::Media::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, MediaDeviceRenderAudioMediaSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, MediaDeviceRenderAudioMediaSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+
+      auto pThis = thisWeak_.lock();
+      if (pThis) {
+        auto outer = outer_.lock();
+        if (outer) {
+          outer->notifyMediaFailure(pThis, lastError_, lastErrorReason_);
+        }
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::MediaSubscriber
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudio::MediaSubscriber::MediaSubscriber(
+                                                              const make_private &,
+                                                              IMessageQueuePtr queue,
+                                                              UseOuterPtr outer,
+                                                              TrackConstraintsPtr constraints,
+                                                              IMediaDeviceRenderDelegatePtr delegate
+                                                              ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      outer_(outer),
+      constraints_(constraints),
+      notifyDelegate_(delegate_),
+      delegate_(IMediaDeviceRenderDelegateProxy::createWeak(delegate)),
+      traceHelper_(id_)
+    {
+      ZS_EVENTING_2(x, i, Detail, MediaDeviceRenderAudioMediaSubscriberCreate, ol, MediaEngine, Start, puid, id, id_, puid, outerId, outer->getID());
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::MediaSubscriber::init()
+    {
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudio::MediaSubscriber::~MediaSubscriber()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceRenderAudioMediaSubscriberDestroy, ol, MediaEngine, Stop, puid, id, id_);
+
+      thisWeak_.reset();
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudio::MediaSubscriberPtr MediaDeviceRenderAudio::MediaSubscriber::create(
+                                                                                               IMessageQueuePtr queue,
+                                                                                               UseOuterPtr outer,
+                                                                                               TrackConstraintsPtr constraints,
+                                                                                               IMediaDeviceRenderDelegatePtr delegate
+                                                                                               )
+    {
+      auto pThis(make_shared<MediaSubscriber>(make_private{}, queue, outer, constraints, delegate));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::MediaSubscriber => (for MediaDeviceRenderAudio)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::MediaSubscriber::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaDeviceRenderAudioMediaSubscriberShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      cancel();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaDeviceRenderAudio::MediaSubscriber::isShutdown() const
+    {
+      return IMediaDevice::State_Shutdown == getState();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::MediaSubscriber::notifyStateChanged(States state)
+    {
+      auto pThis = thisWeak_.lock();
+
+      postClosure([pThis, state] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->setState(state);
+      });
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::MediaSubscriber => (for Media)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::MediaSubscriber => IMediaDeviceRender
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::MediaSubscriber => IMediaDeviceRenderAudio
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::MediaSubscriber::notifyAudioFrame(
+                                                                   ImmutableMediaChannelTracePtr trace,
+                                                                   AudioFramePtr frame
+                                                                   )
+    {
+      auto outer = outer_.lock();
+      if (!outer) return;
+
+      outer->notifyAudioFrame(traceHelper_.trace(trace), frame);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::MediaSubscriber => IMediaDevice
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::MediaSubscriber::cancel()
+    {
+      AutoRecursiveLock lock(*this);
+
+      setState(IMediaDevice::State_ShuttingDown);
+
+      setState(IMediaDevice::State_Shutdown);
+
+      auto outer = outer_.lock();
+      if (outer) {
+        outer->notifySusbcriberGone();
+      }
+
+      delegate_.reset();
+      notifyDelegate_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    IMediaDevice::States MediaDeviceRenderAudio::MediaSubscriber::getState() const
+    {
+      AutoRecursiveLock lock(*this);
+      return lastReportedState_;
+    }
+
+    //---------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::MediaSubscriber => IMediaDeviceRender
+    #pragma mark
+
+    //---------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::MediaSubscriber => IMediaDeviceRenderAudio
+    #pragma mark
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio::MediaSubscriber => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaDeviceRenderAudio::MediaSubscriber::setState(States state)
+    {
+      if (state == lastReportedState_) return;
+      if (IMediaDevice::State_Shutdown == lastReportedState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, MediaDeviceRenderAudioMediaSubscriberSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, IMediaDevice::toString(state), string, oldState, IMediaDevice::toString(lastReportedState_));
+
+      lastReportedState_ = state;
+
+      auto pThis = thisWeak_.lock();
+      if (!pThis) return;
+      if (!delegate_) return;
+
+      try {
+        delegate_->onMediaDeviceRenderStateChanged(pThis, state);
+      } catch (const IMediaDeviceRenderDelegateProxy::Exceptions::DelegateGone &) {
+        delegate_.reset();
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceRenderAudioFactory
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaDeviceRenderAudioFactory &IMediaDeviceRenderAudioFactory::singleton()
+    {
+      return MediaDeviceRenderAudioFactory::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaDeviceRenderAudioPtr IMediaDeviceRenderAudioFactory::create(
+                                                                       UseMediaEnginePtr mediaEngine,
+                                                                       const String &deviceID
+                                                                       )
+    {
+      if (this) {}
+      return internal::MediaDeviceRenderAudio::create(mediaEngine, deviceID);
+    }
+
+  } // internal namespace
+}
diff --git a/ortc/cpp/ortc_MediaDevices.cpp b/ortc/cpp/ortc_MediaDevices.cpp
index c0e02a92..187ca8f0 100644
--- a/ortc/cpp/ortc_MediaDevices.cpp
+++ b/ortc/cpp/ortc_MediaDevices.cpp
@@ -1,6 +1,6 @@
 /*
 
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
+ Copyright (c) 2017, Hookflash Inc. / Optical Tone Ltd.
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_MediaDevices.h>
 #include <ortc/internal/ortc_MediaStreamTrack.h>
 #include <ortc/internal/ortc_Helper.h>
@@ -43,6 +45,7 @@
 #include <zsLib/ISettings.h>
 #include <zsLib/Numeric.h>
 #include <zsLib/Stringize.h>
+#include <zsLib/eventing/Log.h>
 #include <zsLib/Log.h>
 #include <zsLib/XML.h>
 
@@ -58,7 +61,7 @@
 #endif //_DEBUG
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_mediadevices) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_devices) }
 
 namespace ortc
 {
@@ -164,7 +167,8 @@ namespace ortc
                                IMessageQueuePtr queue
                                ) :
       MessageQueueAssociator(queue),
-      SharedRecursiveLock(SharedRecursiveLock::create())
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create())
     {
       ZS_LOG_DETAIL(debug("created"))
     }
@@ -263,11 +267,27 @@ namespace ortc
       }
 
       IMediaDevicesAsyncDelegateProxy::create(pThis)->onEnumerateDevices(promise);
-
       return promise;
     }
 
 
+    //-------------------------------------------------------------------------
+    IMediaDevicesTypes::PromiseWithSettingsListPtr MediaDevices::enumerateDefaultModes(const char *deviceID)
+    {
+      PromiseWithSettingsListPtr promise = PromiseWithSettingsList::create(IORTCForInternal::queueDelegate());
+
+      MediaDevicesPtr pThis(MediaDevices::singleton());
+
+      if (!pThis) {
+        ZS_LOG_WARNING(Basic, slog("media devices singleton is gone"))
+        promise->reject();
+        return promise;
+      }
+
+      IMediaDevicesAsyncDelegateProxy::create(pThis)->onEnumerateDefaultModes(promise, deviceID);
+      return promise;
+    }
+
     //-------------------------------------------------------------------------
     IMediaDevicesTypes::PromiseWithMediaStreamTrackListPtr MediaDevices::getUserMedia(const Constraints &constraints)
     {
@@ -295,8 +315,6 @@ namespace ortc
 
       auto pThis = singleton();
       if (!pThis) {
-        ZS_DECLARE_STRUCT_PTR(BogusSubscription)
-
         struct BogusSubscription : public IMediaDevicesSubscription {
           virtual PUID getID() const override {return mID;}
           virtual void cancel() override {}
@@ -377,7 +395,7 @@ namespace ortc
 
       DeviceListPtr value(std::make_shared<DeviceList>());
 
-      webrtc::VideoCaptureModule::DeviceInfo* info = webrtc::VideoCaptureFactory::CreateDeviceInfo(0);
+      webrtc::VideoCaptureModule::DeviceInfo* info = webrtc::VideoCaptureFactory::CreateDeviceInfo();
       if (!info) {
         promise->reject();
         return;
@@ -398,15 +416,20 @@ namespace ortc
       }
       delete info;
 
-      webrtc::AudioDeviceModule* audioDevice =
-        webrtc::AudioDeviceModuleImpl::Create(1, webrtc::AudioDeviceModule::kWindowsWasapiAudio);
+      webrtc::AudioDeviceModule::AudioLayer audioLayer;
+#ifdef WINRT
+      audioLayer = webrtc::AudioDeviceModule::kWindowsWasapiAudio;
+#else
+      audioLayer = webrtc::AudioDeviceModule::kPlatformDefaultAudio;
+#endif
+
+      rtc::scoped_refptr<webrtc::AudioDeviceModule> audioDevice =
+        webrtc::AudioDeviceModuleImpl::Create(1, audioLayer);
       if (!audioDevice) {
         promise->reject();
         return;
       }
 
-      audioDevice->AddRef();
-
       audioDevice->Init();
 
       int numMics = audioDevice->RecordingDevices();
@@ -440,6 +463,18 @@ namespace ortc
       promise->resolve(value);
     }
 
+    //-------------------------------------------------------------------------
+    void MediaDevices::onEnumerateDefaultModes(
+                                               PromiseWithSettingsListPtr promise,
+                                               const char *deviceID
+                                               )
+    {
+      AutoRecursiveLock lock(*this);
+#define TODO_ENUMERATE_MODES 1
+#define TODO_ENUMERATE_MODES 2
+      promise->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_NotImplemented, "method not implemented"));
+    }
+
     //-------------------------------------------------------------------------
     void MediaDevices::onGetUserMedia(PromiseWithMediaStreamTrackListPtr promise, ConstraintsPtr constraints)
     {
@@ -449,22 +484,20 @@ namespace ortc
 
       if (constraints->mVideo)
       {
-        MediaStreamTrackPtr videoTrack = IMediaStreamTrackFactory::singleton().create(
+        auto videoTrack = IMediaStreamTrackFactory::singleton().createForMediaDevices(
                                                                                       IMediaStreamTrackTypes::Kinds::Kind_Video,
-                                                                                      false,
-                                                                                      constraints->mVideo
+                                                                                      *constraints->mVideo
                                                                                       );
-        value->push_back(videoTrack);
+        value->push_back(MediaStreamTrack::convert(videoTrack));
       }
 
       if (constraints->mAudio)
       {
-        MediaStreamTrackPtr audioTrack = IMediaStreamTrackFactory::singleton().create(
+        auto audioTrack = IMediaStreamTrackFactory::singleton().createForMediaDevices(
                                                                                       IMediaStreamTrackTypes::Kinds::Kind_Audio,
-                                                                                      false,
-                                                                                      constraints->mAudio
+                                                                                      *constraints->mAudio
                                                                                       );
-        value->push_back(audioTrack);
+        value->push_back(MediaStreamTrack::convert(audioTrack));
       }
 
       promise->resolve(value);
@@ -708,6 +741,13 @@ namespace ortc
       return internal::MediaDevices::enumerateDevices();
     }
 
+    //-------------------------------------------------------------------------
+    IMediaDevicesTypes::PromiseWithSettingsListPtr IMediaDevicesFactory::enumerateDefaultModes(const char *deviceID)
+    {
+      if (this) {}
+      return internal::MediaDevices::enumerateDefaultModes(deviceID);
+    }
+
     //-------------------------------------------------------------------------
     IMediaDevicesTypes::PromiseWithMediaStreamTrackListPtr IMediaDevicesFactory::getUserMedia(const Constraints &constraints)
     {
@@ -850,6 +890,7 @@ namespace ortc
     IHelper::adoptElementValue(elem, "sampleSize", mSampleSize);
     IHelper::adoptElementValue(elem, "echoCancellation", mEchoCancellation);
     IHelper::adoptElementValue(elem, "latency", mLatency);
+    IHelper::adoptElementValue(elem, "channelCount", mChannelCount);
     IHelper::adoptElementValue(elem, "deviceId", mDeviceID);
     IHelper::adoptElementValue(elem, "groupId", mGroupID);
 
@@ -872,6 +913,7 @@ namespace ortc
     IHelper::debugAppend(resultEl, "sample rate", mSampleRate);
     IHelper::debugAppend(resultEl, "echo cancellation", mEchoCancellation);
     IHelper::debugAppend(resultEl, "latency", mLatency);
+    IHelper::debugAppend(resultEl, "channel count", mChannelCount);
     IHelper::debugAppend(resultEl, "device id", mDeviceID);
     IHelper::debugAppend(resultEl, "group id", mGroupID);
 
@@ -902,6 +944,8 @@ namespace ortc
     hasher->update(":");
     hasher->update(mLatency);
     hasher->update(":");
+    hasher->update(mChannelCount);
+    hasher->update(":");
     hasher->update(mDeviceID);
     hasher->update(":");
     hasher->update(mGroupID);
@@ -1018,7 +1062,7 @@ namespace ortc
     for (auto iter = begin(); iter != end(); ++iter)
     {
       auto &track = (*iter);
-      IHelper::debugAppend(resultEl, IMediaStreamTrack::toDebug(track));
+      ZS_EVENTING_TRACE_OBJECT_PTR(Trace, track, "media stream track list debug");
     }
 
     return resultEl;
@@ -1143,6 +1187,12 @@ namespace ortc
     return internal::IMediaDevicesFactory::singleton().enumerateDevices();
   }
 
+  //---------------------------------------------------------------------------
+  IMediaDevices::PromiseWithSettingsListPtr IMediaDevices::enumerateDefaultModes(const char *deviceID)
+  {
+    return internal::IMediaDevicesFactory::singleton().enumerateDefaultModes(deviceID);
+  }
+
   //---------------------------------------------------------------------------
   IMediaDevicesTypes::PromiseWithMediaStreamTrackListPtr IMediaDevices::getUserMedia(const Constraints &constraints)
   {
diff --git a/ortc/cpp/ortc_MediaEngine.cpp b/ortc/cpp/ortc_MediaEngine.cpp
new file mode 100644
index 00000000..f93e35d5
--- /dev/null
+++ b/ortc/cpp/ortc_MediaEngine.cpp
@@ -0,0 +1,2051 @@
+/*
+
+ Copyright (c) 2017, Hookflash Inc. / Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_MediaEngine.h>
+#include <ortc/internal/ortc_MediaStreamTrack.h>
+#include <ortc/internal/ortc_ORTC.h>
+#include <ortc/internal/ortc_StatsReport.h>
+#include <ortc/internal/ortc.events.h>
+#include <ortc/internal/platform.h>
+
+#include <ortc/RTPPacket.h>
+#include <ortc/RTCPPacket.h>
+#include <ortc/IStatsReport.h>
+#include <ortc/IHelper.h>
+
+#include <zsLib/ISettings.h>
+#include <zsLib/Singleton.h>
+#include <zsLib/Log.h>
+#include <zsLib/XML.h>
+#include <zsLib/SafeInt.h>
+
+#include <cryptopp/sha.h>
+
+#include <webrtc/rtc_base/event_tracer.h>
+
+#if 0
+#include <limits>
+#include <float.h>
+#include <math.h>
+
+#include <webrtc/rtc_base/timeutils.h>
+#include <webrtc/call/rtc_event_log.h>
+#include <webrtc/voice_engine/include/voe_codec.h>
+#include <webrtc/voice_engine/include/voe_rtp_rtcp.h>
+#include <webrtc/voice_engine/include/voe_network.h>
+#include <webrtc/voice_engine/include/voe_hardware.h>
+#include <webrtc/system_wrappers/include/cpu_info.h>
+#include <webrtc/voice_engine/include/voe_audio_processing.h>
+#include <webrtc/modules/video_capture/video_capture_factory.h>
+#include <webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h>
+#ifdef WINRT
+#include <third_party/h264_winrt/h264_winrt_factory.h>
+#endif
+#endif //0
+
+#ifdef _DEBUG
+#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
+#else
+#define ASSERT(x)
+#endif //_DEBUG
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+
+  namespace internal
+  {
+    ZS_DECLARE_CLASS_PTR(MediaEngineSettingsDefaults);
+    ZS_DECLARE_TYPEDEF_PTR(IStatsReportForInternal, UseStatsReport);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark (helpers)
+    #pragma mark
+
+    // foreward declaration
+    void webrtcTrace(Log::Severity severity, Log::Level level, const char *message);
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngineSettingsDefaults
+    #pragma mark
+
+    class MediaEngineSettingsDefaults : public ISettingsApplyDefaultsDelegate
+    {
+    public:
+      //-----------------------------------------------------------------------
+      ~MediaEngineSettingsDefaults()
+      {
+        ISettings::removeDefaults(*this);
+      }
+
+      //-----------------------------------------------------------------------
+      static MediaEngineSettingsDefaultsPtr singleton()
+      {
+        static SingletonLazySharedPtr<MediaEngineSettingsDefaults> singleton(create());
+        return singleton.singleton();
+      }
+
+      //-----------------------------------------------------------------------
+      static MediaEngineSettingsDefaultsPtr create()
+      {
+        auto pThis(make_shared<MediaEngineSettingsDefaults>());
+        ISettings::installDefaults(pThis);
+        return pThis;
+      }
+
+      //-----------------------------------------------------------------------
+      virtual void notifySettingsApplyDefaults() override
+      {
+      }
+      
+    };
+
+    //-------------------------------------------------------------------------
+    void installMediaEngineSettingsDefaults()
+    {
+      MediaEngineSettingsDefaults::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForORTC
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void IMediaEngineForORTC::setLogLevel(Log::Level level)
+    {
+      IMediaEngineFactory::singleton().setLogLevel(level);
+    }
+
+    //-------------------------------------------------------------------------
+    void IMediaEngineForORTC::ntpServerTime(const Milliseconds &value)
+    {
+      IMediaEngineFactory::singleton().ntpServerTime(value);
+    }
+
+    //-------------------------------------------------------------------------
+    void IMediaEngineForORTC::startMediaTracing()
+    {
+      IMediaEngineFactory::singleton().startMediaTracing();
+    }
+
+    //-------------------------------------------------------------------------
+    void IMediaEngineForORTC::stopMediaTracing()
+    {
+      IMediaEngineFactory::singleton().stopMediaTracing();
+    }
+
+    //-------------------------------------------------------------------------
+    bool IMediaEngineForORTC::isMediaTracing()
+    {
+      return IMediaEngineFactory::singleton().isMediaTracing();
+    }
+
+    //-------------------------------------------------------------------------
+    bool IMediaEngineForORTC::saveMediaTrace(String filename)
+    {
+      return IMediaEngineFactory::singleton().saveMediaTrace(filename);
+    }
+
+    //-------------------------------------------------------------------------
+    bool IMediaEngineForORTC::saveMediaTrace(String host, int port)
+    {
+      return IMediaEngineFactory::singleton().saveMediaTrace(host, port);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForMediaDeviceCapture
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaDeviceCapture::MediaDeviceCapturePromisePtr IMediaEngineForMediaDeviceCapture::createMediaDeviceCapture(
+                                                                                                                  MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                                                                  Kinds kind,
+                                                                                                                  const TrackConstraints &constraints,
+                                                                                                                  IMediaDeviceCaptureDelegatePtr delegate
+                                                                                                                  )
+    {
+      return internal::IMediaEngineFactory::singleton().createMediaDeviceCapture(repaceExistingDeviceObjectID, kind, constraints, delegate);
+    }
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForMediaDeviceRender
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaEngineForMediaDeviceRender::MediaDeviceRenderPromisePtr IMediaEngineForMediaDeviceRender::createMediaDeviceRender(
+                                                                                                                            MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                                                                            const TrackConstraints &constraints,
+                                                                                                                            IMediaDeviceRenderDelegatePtr delegate
+                                                                                                                            )
+    {
+      return internal::IMediaEngineFactory::singleton().createMediaDeviceRender(repaceExistingDeviceObjectID, constraints, delegate);
+    }
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForMediaDeviceRenderAudio
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTP
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPDecode
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPDecoderAudio
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaEngineForRTPDecoderAudio::PromiseWithRTPDecoderAudioPtr IMediaEngineForRTPDecoderAudio::createRTPDecoderAudio(
+                                                                                                                        const Parameters &parameters,
+                                                                                                                        IRTPDecoderDelegatePtr delegate
+                                                                                                                        )
+    {
+      return internal::IMediaEngineFactory::singleton().createRTPDecoderAudio(parameters, delegate);
+    }
+        //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPDecoderVideo
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaEngineForRTPDecoderVideo::PromiseWithRTPDecoderVideoPtr IMediaEngineForRTPDecoderVideo::createRTPDecoderVideo(
+                                                                                                                        const Parameters &parameters,
+                                                                                                                        IRTPDecoderDelegatePtr delegate
+                                                                                                                        )
+    {
+      return internal::IMediaEngineFactory::singleton().createRTPDecoderVideo(parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPEncoderAudio
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaEngineForRTPEncoderAudio::PromiseWithRTPEncoderAudioPtr IMediaEngineForRTPEncoderAudio::createRTPEncoderAudio(
+                                                                                                                        const Parameters &parameters,
+                                                                                                                        IRTPEncoderDelegatePtr delegate
+                                                                                                                        )
+    {
+      return internal::IMediaEngineFactory::singleton().createRTPEncoderAudio(parameters, delegate);
+    }
+        //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPEncoderVideo
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaEngineForRTPEncoderVideo::PromiseWithRTPEncoderVideoPtr IMediaEngineForRTPEncoderVideo::createRTPEncoderVideo(
+                                                                                                                        const Parameters &parameters,
+                                                                                                                        IRTPEncoderDelegatePtr delegate
+                                                                                                                        )
+    {
+      return internal::IMediaEngineFactory::singleton().createRTPEncoderVideo(parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine
+    #pragma mark
+    
+    //---------------------------------------------------------------------------
+    const char *MediaEngine::toString(States state)
+    {
+      switch (state) {
+        case State_Pending:       return "pending";
+        case State_WakingUp:      return "waking up";
+        case State_Ready:         return "ready";
+        case State_GoingToSleep:  return "going to sleep";
+        case State_Sleeping:      return "sleeping";
+        case State_ShuttingDown:  return "shutting down";
+        case State_Shutdown:      return "shutdown";
+      }
+      return "UNDEFINED";
+    }
+    
+    //-------------------------------------------------------------------------
+    MediaEngine::MediaEngine(
+                             const make_private &,
+                             IMessageQueuePtr queue
+                             ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      traceCallback_(new WebRtcTraceCallback()),
+      logSink_(new WebRtcLogSink())
+    {
+      ZS_EVENTING_1(x, i, Detail, MediaEngineCreate, ol, MediaEngine, Start, puid, id, id_);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::init()
+    {
+      webrtc::Trace::CreateTrace();
+      webrtc::Trace::SetTraceCallback(traceCallback_.get());
+
+      auto level = IORTCForInternal::webrtcLogLevel();
+      if (level.hasValue()) {
+        internalSetLogLevel(level);
+      }
+
+#if defined(WINRT)
+      webrtc::SetupEventTracer(&GetCategoryGroupEnabled, &AddTraceEvent);
+#endif
+
+      AutoRecursiveLock lock(*this);
+
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEngine::~MediaEngine()
+    {
+      if (isNoop()) return;
+
+      webrtc::Trace::SetTraceCallback(nullptr);
+      webrtc::Trace::ReturnTrace();
+
+      thisWeak_.reset();
+
+      cancel();
+      ZS_EVENTING_1(x, i, Detail, MediaEngineDestroy, ol, MediaEngine, Stop, puid, id, id_);
+    }
+
+    //-----------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::singleton()
+    {
+      static SingletonLazySharedPtr<MediaEngine> singleton(create());
+      return singleton.singleton();
+    }
+
+    //-----------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::create()
+    {
+      auto pThis(make_shared<MediaEngine>(make_private{}, IORTCForInternal::queueBlockingMediaStartStopThread()));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForORTCPtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForMediaDeviceCapturePtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForMediaDeviceCaptureAudioPtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForMediaDeviceCaptureVideoPtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForMediaDeviceRenderPtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForMediaDeviceRenderAudioPtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForRTPPtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+    
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForRTPDecodePtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForRTPDecodeAudioPtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForRTPDecodeVideoPtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForRTPEncodePtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForRTPEncodeAudioPtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr MediaEngine::convert(ForRTPEncodeVideoPtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(MediaEngine, object);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForORTC
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::internalSetLogLevel(Log::Level level)
+    {
+      webrtc::TraceLevel traceLevel{ webrtc::kTraceAll };
+      rtc::LoggingSeverity rtcLevel{ rtc::LS_INFO };
+
+      switch (level)
+      {
+      case Log::Level::None:    rtcLevel = rtc::LS_NONE; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceNone); break;
+      case Log::Level::Basic:   rtcLevel = rtc::LS_ERROR; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceCritical | webrtc::kTraceError); break;
+      case Log::Level::Detail:  rtcLevel = rtc::LS_WARNING; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceWarning | webrtc::kTraceError | webrtc::kTraceCritical); break;
+      case Log::Level::Debug:   rtcLevel = rtc::LS_INFO; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceDefault); break;
+      case Log::Level::Trace:   rtcLevel = rtc::LS_VERBOSE; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceDefault | webrtc::kTraceModuleCall | webrtc::kTraceTimer | webrtc::kTraceDebug); break;
+      case Log::Level::Insane:  rtcLevel = rtc::LS_SENSITIVE; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceAll); break;
+      }
+
+      rtc::LogMessage::RemoveLogToStream(logSink_.get());
+      rtc::LogMessage::AddLogToStream(logSink_.get(), rtcLevel);
+
+      webrtc::Trace::set_level_filter(traceLevel);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::internalNTPServerTime(const Milliseconds &value)
+    {
+#define TODO 1
+#define TODO 2
+#if 0
+      rtc::SyncWithNtp(value.count());
+#endif //0
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::internalStartMediaTracing()
+    {
+      //traceLog_.EnableTraceInternalStorage();
+      //traceLog_.StartTracing();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::internalStopMediaTracing()
+    {
+      //traceLog_.StopTracing();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::internalIsMediaTracing()
+    {
+      //return traceLog_.IsTracing();
+      return false;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::internalSaveMediaTrace(String filename)
+    {
+      //return traceLog_.Save(filename);
+      return false;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::internalSaveMediaTrace(String host, int port)
+    {
+      //return traceLog_.Save(host, port);
+      return false;
+    }
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForMediaDevice
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::notifyDeviceIsIdleOrShutdownStateChanged()
+    {
+      checkForIdleDevices_ = true;
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForMediaDeviceCapture
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    MediaEngine::MediaDeviceCapturePromisePtr MediaEngine::innerCreateMediaDeviceCapture(
+                                                                                         MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                                         Kinds kind,
+                                                                                         const TrackConstraints &constraints,
+                                                                                         IMediaDeviceCaptureDelegatePtr delegate
+                                                                                         )
+    {    
+      auto pThis = thisWeak_.lock();
+
+      PendingForMediaDeviceCapture info;
+      info.repaceExistingDeviceObjectID_ = repaceExistingDeviceObjectID;
+      info.kind_ = kind;
+      info.promise_ = MediaDeviceCapturePromise::create(IORTCForInternal::queueDelegate());
+      info.constraints_ = TrackConstraints::create(constraints);
+      info.delegate_ = delegate;
+
+      postClosure([pThis, info] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->pendingForMediaDeviceCaptures_.push_back(info);
+        pThis->step();
+      });
+
+      return info.promise_;
+    }
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForMediaDeviceCaptureAudio
+    #pragma mark
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForMediaDeviceCaptureVideo
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForMediaDeviceRender
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    MediaEngine::MediaDeviceRenderPromisePtr MediaEngine::innerCreateMediaDeviceRender(
+                                                                                       MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                                       const TrackConstraints &constraints,
+                                                                                       IMediaDeviceRenderDelegatePtr delegate
+                                                                                       )
+    {    
+      auto pThis = thisWeak_.lock();
+
+      PendingForMediaDeviceRenderInfo info;
+      info.repaceExistingDeviceObjectID_ = repaceExistingDeviceObjectID;
+      info.promise_ = MediaDeviceRenderPromise::create(IORTCForInternal::queueDelegate());
+      info.constraints_ = TrackConstraints::create(constraints);
+      info.delegate_ = delegate;
+
+      postClosure([pThis, info] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->pendingForMediaDeviceRenders_.push_back(info);
+        pThis->step();
+      });
+
+      return info.promise_;
+    }
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForMediaDeviceRenderAudio
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForRTP
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::notifyRTPShutdownStateChanged()
+    {
+      checkForShutdownRTP_ = true;
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForRTPDecoder
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForRTPDecoderAudio
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    MediaEngine::PromiseWithRTPDecoderAudioPtr MediaEngine::innerCreateRTPDecoderAudio(
+                                                                                       const Parameters &parameters,
+                                                                                       IRTPDecoderDelegatePtr delegate
+                                                                                       )
+    {
+      auto pThis = thisWeak_.lock();
+
+      PendingForRTPDecodeAudio info;
+      info.promise_ = PromiseWithRTPDecoderAudio::create(IORTCForInternal::queueDelegate());
+      info.parameters_ = make_shared<Parameters>(parameters);
+      info.delegate_ = delegate;
+
+      postClosure([pThis, info] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->pendingForRTPDecodeAudios_.push_back(info);
+        pThis->step();
+      });
+
+      return info.promise_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForRTPDecoderVideo
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    MediaEngine::PromiseWithRTPDecoderVideoPtr MediaEngine::innerCreateRTPDecoderVideo(
+                                                                                       const Parameters &parameters,
+                                                                                       IRTPDecoderDelegatePtr delegate
+                                                                                       )
+    {
+      auto pThis = thisWeak_.lock();
+
+      PendingForRTPDecodeVideo info;
+      info.promise_ = PromiseWithRTPDecoderVideo::create(IORTCForInternal::queueDelegate());
+      info.parameters_ = make_shared<Parameters>(parameters);
+      info.delegate_ = delegate;
+
+      postClosure([pThis, info] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->pendingForRTPDecodeVideos_.push_back(info);
+        pThis->step();
+      });
+
+      return info.promise_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForRTPEncoder
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForRTPEncoderAudio
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    MediaEngine::PromiseWithRTPEncoderAudioPtr MediaEngine::innerCreateRTPEncoderAudio(
+                                                                                       const Parameters &parameters,
+                                                                                       IRTPEncoderDelegatePtr delegate
+                                                                                       )
+    {
+      auto pThis = thisWeak_.lock();
+
+      PendingForRTPEncodeAudio info;
+      info.promise_ = PromiseWithRTPEncoderAudio::create(IORTCForInternal::queueDelegate());
+      info.parameters_ = make_shared<Parameters>(parameters);
+      info.delegate_ = delegate;
+
+      postClosure([pThis, info] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->pendingForRTPEncodeAudios_.push_back(info);
+        pThis->step();
+      });
+
+      return info.promise_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaEngineForRTPEncoderVideo
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    MediaEngine::PromiseWithRTPEncoderVideoPtr MediaEngine::innerCreateRTPEncoderVideo(
+                                                                                       const Parameters &parameters,
+                                                                                       IRTPEncoderDelegatePtr delegate
+                                                                                       )
+    {
+      auto pThis = thisWeak_.lock();
+
+      PendingForRTPEncodeVideo info;
+      info.promise_ = PromiseWithRTPEncoderVideo::create(IORTCForInternal::queueDelegate());
+      info.parameters_ = make_shared<Parameters>(parameters);
+      info.delegate_ = delegate;
+
+      postClosure([pThis, info] {
+        AutoRecursiveLock lock(*pThis);
+        pThis->pendingForRTPEncodeVideos_.push_back(info);
+        pThis->step();
+      });
+
+      return info.promise_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IMediaDevicesDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::onMediaDevicesChanged()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaEngineOnMediaDevicesChanged, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      refreshDevicesList_ = true;
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::onWake()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaEngineOnWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => ITimerDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::onTimer(ITimerPtr timer)
+    {
+      ZS_EVENTING_2(x, i, Trace, MediaEngineOnTimer, ol, MediaEngine, Event, puid, id, id_, puid, timerId, timer->getID());
+
+      AutoRecursiveLock lock(*this);
+      // NOTE: ADD IF NEEDED...
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => IPromiseSettledDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::onPromiseSettled(PromisePtr promise)
+    {
+      ZS_EVENTING_2(x, i, Trace, MediaEngineOnPromiseSettled, ol, MediaEngine, Event, puid, id, id_, puid, promiseId, promise->getID());
+
+      AutoRecursiveLock lock(*this);
+      auto found = pendingPromises_.find(promise->getID());
+      if (found != pendingPromises_.end()) {
+        pendingPromises_.erase(found);
+
+        if (promise->isRejected()) {
+          setError(promise);
+          cancel();
+          return;
+        }
+      }
+
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => webrtc::SetupEventTracer
+    #pragma mark
+
+#if defined(WINRT)
+    //-------------------------------------------------------------------------
+    const unsigned char *MediaEngine::GetCategoryGroupEnabled(const char *categoryGroup)
+    {
+      return reinterpret_cast<const unsigned char*>("webrtc");
+    }
+
+    //-------------------------------------------------------------------------
+    void __cdecl MediaEngine::AddTraceEvent(
+                                            char phase,
+                                            const unsigned char *categoryGroupEnabled,
+                                            const char *name,
+                                            uint64_t id,
+                                            int numArgs,
+                                            const char **argNames,
+                                            const unsigned char *argTypes,
+                                            const uint64_t *argValues,
+                                            unsigned char flags
+                                            )
+    {
+      auto engine = MediaEngine::singleton();
+      if (engine) {
+        engine->internalAddTraceEvent(phase, categoryGroupEnabled, name, id,
+          numArgs, argNames, argTypes, argValues, flags);
+      }
+    }
+#endif //defined(WINRT)
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine => (internal)
+    #pragma mark
+
+#if defined(WINRT)
+    //-------------------------------------------------------------------------
+    void MediaEngine::internalAddTraceEvent(
+                                            char phase,
+                                            const unsigned char *categoryGroupEnabled,
+                                            const char *name,
+                                            uint64_t id,
+                                            int numArgs,
+                                            const char **argNames,
+                                            const unsigned char *argTypes,
+                                            const uint64_t *argValues,
+                                            unsigned char flags
+                                            )
+    {
+      traceLog_.Add(phase, categoryGroupEnabled, name, id, numArgs, argNames, argTypes, argValues, flags);
+    }
+#endif //defined(WINRT)
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::cancel()
+    {
+      //.......................................................................
+      // try to gracefully shutdown
+
+      if (isShutdown()) return;
+
+      setState(State_ShuttingDown);
+
+      if (devicesSubscription_) {
+        devicesSubscription_->cancel();
+        devicesSubscription_.reset();
+      }
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+        // perform any graceful asynchronous shutdown processes needed and
+        // re-attempt shutdown again later if needed.
+
+        if (!stepPendingPromises()) return;
+
+        if (!stepShutdownPendingRequests()) return;
+        if (!stepShutdownDevicesAndRTP()) return;
+
+#define TODO_IMPLEMENT_MEDIA_GRACEFUL_SHUTDOWN 1
+#define TODO_IMPLEMENT_MEDIA_GRACEFUL_SHUTDOWN 2
+        //        return;
+      }
+
+      //.......................................................................
+      // final cleanup (hard shutdown)
+
+      setState(State_Shutdown);
+      stepShutdownDevicesAndRTP();
+
+#define TODO_IMPLEMENT_MEDIA_HARD_SHUTDOWN 1
+#define TODO_IMPLEMENT_MEDIA_HARD_SHUTDOWN 2
+
+      // make sure to cleanup any final reference to self
+      gracefulShutdownReference_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepShutdownPendingRequests()
+    {
+      for (auto iter_doNotUse = pendingForMediaDeviceCaptures_.begin(); iter_doNotUse != pendingForMediaDeviceCaptures_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto pending = (*current).promise_;
+
+        pending->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+        pendingForMediaDeviceCaptures_.erase(current);
+      }
+
+      for (auto iter_doNotUse = pendingForMediaDeviceRenders_.begin(); iter_doNotUse != pendingForMediaDeviceRenders_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto pending = (*current).promise_;
+
+        pending->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+        pendingForMediaDeviceRenders_.erase(current);
+      }
+
+      for (auto iter_doNotUse = pendingForRTPDecodeAudios_.begin(); iter_doNotUse != pendingForRTPDecodeAudios_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto pending = (*current).promise_;
+
+        pending->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+        pendingForRTPDecodeAudios_.erase(current);
+      }
+
+      for (auto iter_doNotUse = pendingForRTPDecodeVideos_.begin(); iter_doNotUse != pendingForRTPDecodeVideos_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto pending = (*current).promise_;
+
+        pending->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+        pendingForRTPDecodeVideos_.erase(current);
+      }
+
+      for (auto iter_doNotUse = pendingForRTPEncodeAudios_.begin(); iter_doNotUse != pendingForRTPEncodeAudios_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto pending = (*current).promise_;
+
+        pending->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+        pendingForRTPEncodeAudios_.erase(current);
+      }
+
+      for (auto iter_doNotUse = pendingForRTPEncodeVideos_.begin(); iter_doNotUse != pendingForRTPEncodeVideos_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto pending = (*current).promise_;
+
+        pending->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+        pendingForRTPEncodeVideos_.erase(current);
+      }
+
+      if (pendingForMediaDeviceCaptures_.size() > 0) return false;
+      if (pendingForMediaDeviceRenders_.size() > 0) return false;
+      if (pendingForRTPDecodeAudios_.size() > 0) return false;
+      if (pendingForRTPDecodeVideos_.size() > 0) return false;
+      if (pendingForRTPEncodeAudios_.size() > 0) return false;
+      if (pendingForRTPEncodeVideos_.size() > 0) return false;
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepShutdownDevicesAndRTP()
+    {
+      for (auto iter_doNotUse = captureDevices_.begin(); iter_doNotUse != captureDevices_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto device = (*current).second;
+
+        device->shutdown();
+        if (!device->isShutdown()) continue;
+
+        captureDevices_.erase(current);
+      }
+
+      for (auto iter_doNotUse = renderDevices_.begin(); iter_doNotUse != renderDevices_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto device = (*current).second;
+
+        device->shutdown();
+        if (!device->isShutdown()) continue;
+
+        renderDevices_.erase(current);
+      }
+
+      for (auto iter_doNotUse = rtpEncoders_.begin(); iter_doNotUse != rtpEncoders_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto encoder = (*current).second;
+
+        encoder->shutdown();
+        if (!encoder->isShutdown()) continue;
+
+        rtpEncoders_.erase(current);
+      }
+
+      for (auto iter_doNotUse = rtpDecoders_.begin(); iter_doNotUse != rtpDecoders_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto decoder = (*current).second;
+
+        decoder->shutdown();
+        if (!decoder->isShutdown()) continue;
+
+        rtpDecoders_.erase(current);
+      }
+
+      if (captureDevices_.size() > 0) return false;
+      if (renderDevices_.size() > 0) return false;
+
+      if (rtpEncoders_.size() > 0) return false;
+      if (rtpDecoders_.size() > 0) return false;
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, MediaEngineStep, ol, MediaEngine, Step, puid, id, id_);
+
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, MediaEngineStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      if (!stepPendingPromises()) return;
+      if (!stepRefreshDeviceList()) goto not_ready;
+
+      if ((isPending()) ||
+          (isReady()) ||
+          (isSleeping())) {
+        stepFixState();
+      }
+
+      if (isGoingToSleep()) {
+        if (!stepGoingToSleep1()) goto not_ready;
+      }
+
+      if (isSleeping()) {
+        goto sleeping;
+      }
+
+      if (isWakingUp()) {
+        if (!stepWakeUp1()) goto not_ready;
+      }
+
+      if (!stepReady1()) return;
+
+      if (!stepShutdownDevices()) return;
+      if (!stepShutdownRTP()) return;
+      if (!stepStartPendingDevices()) return;
+      if (!stepStartPendingRTP()) return;
+
+      goto ready;
+
+    not_ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "not ready");
+        return;
+      }
+
+    sleeping:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "sleeping");
+        setState(State_Sleeping);
+        return;
+      }
+
+    ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "ready");
+        setState(State_Ready);
+        return;
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepPendingPromises()
+    {
+      if (pendingPromises_.size() > 0) {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "promises are still pending");
+        return false;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no promises are pending");
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepRefreshDeviceList()
+    {
+      if (!devicesSubscription_) {
+        devicesSubscription_ = UseMediaDevices::subscribe(thisWeak_.lock());
+      }
+
+      if ((!refreshDevicesList_) &&
+          (!devicesListPromise_)) {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "refresh device list skipped (no change notified)");
+        return true;
+      }
+
+      if (devicesListPromise_) {
+        if (!devicesListPromise_->isSettled()) {
+          ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "refresh device list still pending");
+          return true;
+        }
+
+        if (devicesListPromise_->isRejected()) {
+          devicesListPromise_.reset();
+          ZS_EVENTING_2(x, w, Debug, MediaEngineStepWarningMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "refresh device list failed");
+          return true;
+        }
+
+        auto deviceList = devicesListPromise_->value();
+        mediaDevices_ = deviceList;
+      }
+
+      if (!refreshDevicesList_) {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "refresh device list completed");
+        return true;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "refresh device list");
+
+      refreshDevicesList_ = false;
+
+      devicesListPromise_ = UseMediaDevices::enumerateDevices();
+      if (!devicesListPromise_) {
+        ZS_EVENTING_2(x, w, Debug, MediaEngineStepWarningMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "failed to enumerate devices");
+        return true;
+      }
+
+      devicesListPromise_->thenWeak(thisWeak_.lock());
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::stepFixState()
+    {
+      ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "fix state");
+
+      {
+        if (pendingForMediaDeviceCaptures_.size() > 0) goto need_media;
+        if (pendingForMediaDeviceRenders_.size() > 0) goto need_media;
+        if (pendingForRTPDecodeAudios_.size() > 0) goto need_media;
+        if (pendingForRTPDecodeVideos_.size() > 0) goto need_media;
+        if (pendingForRTPEncodeAudios_.size() > 0) goto need_media;
+        if (pendingForRTPEncodeVideos_.size() > 0) goto need_media;
+
+        if (captureDevices_.size() > 0) goto need_media;
+        if (renderDevices_.size() > 0) goto need_media;
+
+        if (rtpEncoders_.size() > 0) goto need_media;
+        if (rtpDecoders_.size() > 0) goto need_media;
+
+        goto sleep_now;
+      }
+
+    need_media:
+      {
+        setState(State_WakingUp);
+        return;
+      }
+
+    sleep_now:
+      {
+        setState(State_GoingToSleep);
+        return;
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepWakeUp1()
+    {
+      if (completedWakeUp1_) {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "wake up 1 already completed");
+        return true;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "wake up 1");
+
+      performAsync(std::bind(&MediaEngine::onStepWakeUp1, this, std::placeholders::_1));
+      return false;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::onStepWakeUp1(PromisePtr promise)
+    {
+      // NOT in a lock
+
+      completedWakeUp1_ = true;
+      promise->resolve();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepGoingToSleep1()
+    {
+      if (completedGoingToSleep1_) {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "going to sleep 1 already completed");
+        return false;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "going to sleep 1");
+
+      performAsync(std::bind(&MediaEngine::onStepGoingToSleep1, this, std::placeholders::_1));
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::onStepGoingToSleep1(PromisePtr promise)
+    {
+      // NOT in a lock
+      completedGoingToSleep1_ = true;
+      promise->resolve();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepShutdownDevices()
+    {
+      if (!((checkForIdleDevices_) || (shuttingDownIdleDevices_))) {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no devices have reported being idle and no devices are in the middle of shutting down");
+        return true;
+      }
+
+      checkForIdleDevices_ = false;
+      shuttingDownIdleDevices_ = false;
+
+      for (auto iter_doNotUse = captureDevices_.begin(); iter_doNotUse != captureDevices_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto &deviceID = (*current).first;
+        auto &device = (*current).second;
+        if (device->isShutdown()) {
+          ZS_EVENTING_3(x, i, Debug, MediaEngineStepShutdownDevice, ol, MediaEngine, Step, puid, id, id_, string, deviceId, deviceID, string, message, "capture device is reported shutdown");
+          captureDevices_.erase(current);
+          continue;
+        }
+
+        if (device->isDeviceIdle()) {
+          ZS_EVENTING_3(x, i, Debug, MediaEngineStepShutdownDevice, ol, MediaEngine, Step, puid, id, id_, string, deviceId, deviceID, string, message, "capture device is idle (requesting shutdown)");
+          device->shutdown();
+          shuttingDownIdleDevices_ = true;
+        }
+      }
+
+      for (auto iter_doNotUse = renderDevices_.begin(); iter_doNotUse != renderDevices_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto &deviceID = (*current).first;
+        auto &device = (*current).second;
+        if (device->isShutdown()) {
+          ZS_EVENTING_3(x, i, Debug, MediaEngineStepShutdownDevice, ol, MediaEngine, Step, puid, id, id_, string, deviceId, deviceID, string, message, "render device is reported shutdown");
+          renderDevices_.erase(current);
+          continue;
+        }
+
+        if (device->isDeviceIdle()) {
+          ZS_EVENTING_3(x, i, Debug, MediaEngineStepShutdownDevice, ol, MediaEngine, Step, puid, id, id_, string, deviceId, deviceID, string, message, "render device is idle (requesting shutdown)");
+          device->shutdown();
+          shuttingDownIdleDevices_ = true;
+        }
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepShutdownRTP()
+    {
+      if (!checkForShutdownRTP_) {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no rtp notified being shutting down");
+        return true;
+      }
+
+      checkForShutdownRTP_ = false;
+
+      for (auto iter_doNotUse = rtpDecoders_.begin(); iter_doNotUse != rtpDecoders_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto decoder = (*current).second;
+
+        if (!decoder->isShutdown()) continue;
+        rtpDecoders_.erase(current);
+      }
+
+      for (auto iter_doNotUse = rtpEncoders_.begin(); iter_doNotUse != rtpEncoders_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto encoder = (*current).second;
+
+        if (!encoder->isShutdown()) continue;
+        rtpEncoders_.erase(current);
+      }
+
+      ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "rtp shutting down");
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    static void getExactDeviceIDs(
+                                  const MediaEngine::TrackConstraints &constraints,
+                                  MediaEngine::StringList &outValues
+                                  )
+    {
+      constraints.mDeviceID.exact(outValues);
+      for (auto iter = constraints.mAdvanced.begin(); iter != constraints.mAdvanced.end(); ++iter) {
+        (*iter)->mDeviceID.exact(outValues);
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    static void getIdealDeviceIDs(
+                                  const MediaEngine::TrackConstraints &constraints,
+                                  MediaEngine::StringList &outValues
+                                  )
+    {
+      constraints.mDeviceID.ideal(outValues);
+      for (auto iter = constraints.mAdvanced.begin(); iter != constraints.mAdvanced.end(); ++iter) {
+        (*iter)->mDeviceID.ideal(outValues);
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    static void getExactGroupIDs(
+                                  const MediaEngine::TrackConstraints &constraints,
+                                  MediaEngine::StringList &outValues
+                                  )
+    {
+      constraints.mGroupID.exact(outValues);
+      for (auto iter = constraints.mAdvanced.begin(); iter != constraints.mAdvanced.end(); ++iter) {
+        (*iter)->mGroupID.exact(outValues);
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    static void getIdealGroupIDs(
+                                  const MediaEngine::TrackConstraints &constraints,
+                                  MediaEngine::StringList &outValues
+                                  )
+    {
+      constraints.mGroupID.ideal(outValues);
+      for (auto iter = constraints.mAdvanced.begin(); iter != constraints.mAdvanced.end(); ++iter) {
+        (*iter)->mGroupID.ideal(outValues);
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    static bool doesListContain(const MediaEngine::StringList &values, const String &value)
+    {
+      for (auto iter = values.begin(); iter != values.end(); ++iter) {
+        if (value == (*iter)) return true;
+      }
+      return false;
+    }
+
+    //-------------------------------------------------------------------------
+    static bool findDevice(
+                           bool capture,
+                           MediaEngine::Kinds kind,
+                           const MediaEngine::DeviceList &devices,
+                           const MediaEngine::TrackConstraints &constraints,
+                           String &outUseDeviceID,
+                           String &outUseGroupID
+                           )
+    {
+      MediaEngine::StringList exactDeviceIDs;
+      MediaEngine::StringList idealDeviceIDs;
+
+      MediaEngine::StringList exactGroupIDs;
+      MediaEngine::StringList idealGroupIDs;
+
+      getExactDeviceIDs(constraints, exactDeviceIDs);
+      getIdealDeviceIDs(constraints, idealDeviceIDs);
+
+      getExactGroupIDs(constraints, exactGroupIDs);
+      getIdealGroupIDs(constraints, idealGroupIDs);
+
+      for (auto iterDeviceList = devices.begin(); iterDeviceList != devices.end(); ++iterDeviceList) {
+        auto &device = (*iterDeviceList);
+
+        if (capture) {
+          switch (kind) {
+            case IMediaStreamTrackTypes::Kind_Audio: if (IMediaDevicesTypes::DeviceKind_AudioInput != device.mKind) continue;
+            case IMediaStreamTrackTypes::Kind_Video: if (IMediaDevicesTypes::DeviceKind_VideoInput != device.mKind) continue;
+          }
+        }
+        if (exactDeviceIDs.size() > 0) {
+          if (!doesListContain(exactDeviceIDs, device.mDeviceID)) continue;
+          if (exactGroupIDs.size() > 0) {
+            if (!doesListContain(exactGroupIDs, device.mGroupID)) continue;
+          }
+          outUseDeviceID = device.mDeviceID;
+          outUseGroupID = device.mGroupID;
+          return true;
+        }
+
+        if (exactGroupIDs.size() > 0) {
+          if (!doesListContain(exactGroupIDs, device.mGroupID)) continue;
+          outUseDeviceID = device.mDeviceID;
+          outUseGroupID = device.mGroupID;
+          return true;
+        }
+
+        if (outUseDeviceID.hasData()) continue;
+
+        if (idealDeviceIDs.size() > 0) {
+          if (!doesListContain(idealDeviceIDs, device.mDeviceID)) continue;
+          if (idealGroupIDs.size() > 0) {
+            if (!doesListContain(idealGroupIDs, device.mGroupID)) continue;
+          }
+          outUseDeviceID = device.mDeviceID;
+          outUseGroupID = device.mGroupID;
+          continue;
+        }
+
+        if (idealGroupIDs.size() > 0) {
+          if (!doesListContain(idealGroupIDs, device.mGroupID)) continue;
+          outUseDeviceID = device.mDeviceID;
+          outUseGroupID = device.mGroupID;
+          continue;
+        }
+
+        outUseDeviceID = device.mDeviceID;
+        outUseGroupID = device.mGroupID;
+      }
+      return outUseDeviceID.hasData();
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepStartPendingDevices()
+    {
+      if ((checkForIdleDevices_) || (shuttingDownIdleDevices_) || (devicesListPromise_)) {
+        ZS_EVENTING_2(x, i, Trace, MediaEngineStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "start pending devices step skipped (cannot start devices while device list is being obtained or when shutting down existing devices)");
+        return true;
+      }
+
+      for (auto iter_doNotUse = pendingForMediaDeviceCaptures_.begin(); iter_doNotUse != pendingForMediaDeviceCaptures_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto &info = (*current);
+
+        if (!mediaDevices_) {
+          info.promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_NoContent, "no media devices were found connected"));
+          pendingForMediaDeviceCaptures_.erase(current);
+          continue;
+        }
+
+        String useDeviceID;
+        String useGroupID;
+
+        if (!findDevice(true, info.kind_, *mediaDevices_, *info.constraints_, useDeviceID, useGroupID)) {
+          info.promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_NotFound, "media capture device was not found"));
+          pendingForMediaDeviceCaptures_.erase(current);
+          continue;
+        }
+
+        UseMediaDeviceCapturePtr useDevice;
+
+        auto found = captureDevices_.find(useDeviceID);
+        if (found == captureDevices_.end()) {
+          switch (info.kind_) {
+            case IMediaStreamTrackTypes::Kind_Audio: useDevice = UseMediaDeviceCaptureAudio::create(thisWeak_.lock(), useDeviceID); break;
+            case IMediaStreamTrackTypes::Kind_Video: useDevice = UseMediaDeviceCaptureVideo::create(thisWeak_.lock(), useDeviceID); break;
+          }
+          captureDevices_[useDeviceID] = useDevice;
+        } else {
+          useDevice = (*found).second;
+        }
+
+        useDevice->mediaDeviceCaptureSubscribe(info.promise_, info.repaceExistingDeviceObjectID_, info.constraints_, info.delegate_);
+        pendingForMediaDeviceCaptures_.erase(current);
+      }
+
+      for (auto iter_doNotUse = pendingForMediaDeviceRenders_.begin(); iter_doNotUse != pendingForMediaDeviceRenders_.end(); )
+      {
+        auto current = iter_doNotUse;
+        ++iter_doNotUse;
+
+        auto &info = (*current);
+
+        if (!mediaDevices_) {
+          info.promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_NoContent, "no media devices were found connected"));
+          pendingForMediaDeviceRenders_.erase(current);
+          continue;
+        }
+
+        String useDeviceID;
+        String useGroupID;
+
+        if (!findDevice(false, IMediaStreamTrackTypes::Kind_Audio, *mediaDevices_, *info.constraints_, useDeviceID, useGroupID)) {
+          info.promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_NotFound, "media render device was not found"));
+          pendingForMediaDeviceRenders_.erase(current);
+          continue;
+        }
+
+        UseMediaDeviceRenderPtr useDevice;
+
+        auto found = renderDevices_.find(useDeviceID);
+        if (found == renderDevices_.end()) {
+          useDevice = UseMediaDeviceRenderAudio::create(thisWeak_.lock(), useDeviceID);
+          renderDevices_[useDeviceID] = useDevice;
+        } else {
+          useDevice = (*found).second;
+        }
+
+        useDevice->mediaDeviceRenderSubscribe(info.promise_, info.repaceExistingDeviceObjectID_, info.constraints_, info.delegate_);
+        pendingForMediaDeviceRenders_.erase(current);
+      }
+        
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepReady1()
+    {
+      //...............................
+
+      bool shouldDoThis = false;
+      if (shouldDoThis) {
+        performAsync(std::bind(&MediaEngine::onReady1, this, std::placeholders::_1));
+      }
+
+      //...............................
+
+      bool shouldDoThisOtherThing = false;
+      if (shouldDoThisOtherThing) {
+        auto pThis = thisWeak_.lock();
+        performAsyncClosure([pThis] { /* pThis->doSomethingThatCantFail(); */ });
+      }
+
+      //...............................
+
+      bool shouldDoSomethingElseToo = false;
+      if (shouldDoSomethingElseToo) {
+
+        struct SomeResult : public Any
+        {
+          int someResult_ {};
+        };
+
+        auto pThis = thisWeak_.lock();
+        auto promise = Promise::create(getAssociatedMessageQueue());
+
+        /* perform some step that should not be in a lock */
+        performAsyncClosure(promise, [pThis, promise] {
+          /* not in a lock */
+
+          bool didFail = false;
+          if (didFail)
+          {
+            promise->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Conflict, "I didn't like this value"));
+          }
+
+          auto result = make_shared<SomeResult>();
+          result->someResult_ = -1;
+          promise->resolve(result);
+        });
+
+        /* complete the step here */
+        promise->thenClosure([promise, pThis] {
+          /* because this is locked no other step will be performed at this time */
+          AutoRecursiveLock lock(*pThis);
+
+          if (pThis->isShuttingDown() || pThis->isShutdown()) {
+            ZS_EVENTING_2(x, w, Debug, MediaEngineStepWarningMessage, ol, MediaEngine, Step, puid, id, pThis->id_, string, message, "will not perform this additional step if shutting down");
+            return;
+          }
+
+          /* ... continue here ... */
+
+          if (promise->isRejected()) {
+            pThis->setError(promise);
+            pThis->cancel();
+            return;
+          }
+
+          auto result = promise->value<SomeResult>();
+          if (!result) {
+          }
+        });
+
+      }
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool MediaEngine::stepStartPendingRTP()
+    {
+      {
+        for (auto iter = pendingForRTPDecodeAudios_.begin(); iter != pendingForRTPDecodeAudios_.end(); ++iter)
+        {
+          auto &info = (*iter);
+
+          auto result = UseRTPDecoderAudio::create(info.promise_, thisWeak_.lock(), info.parameters_, info.delegate_);
+          rtpDecoders_[result->getID()] = result;
+        }
+        pendingForRTPDecodeAudios_.clear();
+      }
+      {
+        for (auto iter = pendingForRTPDecodeVideos_.begin(); iter != pendingForRTPDecodeVideos_.end(); ++iter)
+        {
+          auto &info = (*iter);
+
+          auto result = UseRTPDecoderVideo::create(info.promise_, thisWeak_.lock(), info.parameters_, info.delegate_);
+          rtpDecoders_[result->getID()] = result;
+        }
+        pendingForRTPDecodeVideos_.clear();
+      }
+      {
+        for (auto iter = pendingForRTPEncodeAudios_.begin(); iter != pendingForRTPEncodeAudios_.end(); ++iter)
+        {
+          auto &info = (*iter);
+
+          auto result = UseRTPEncoderAudio::create(info.promise_, thisWeak_.lock(), info.parameters_, info.delegate_);
+          rtpEncoders_[result->getID()] = result;
+        }
+        pendingForRTPEncodeAudios_.clear();
+      }
+      {
+        for (auto iter = pendingForRTPEncodeVideos_.begin(); iter != pendingForRTPEncodeVideos_.end(); ++iter)
+        {
+          auto &info = (*iter);
+
+          auto result = UseRTPEncoderVideo::create(info.promise_, thisWeak_.lock(), info.parameters_, info.delegate_);
+          rtpEncoders_[result->getID()] = result;
+        }
+        pendingForRTPEncodeVideos_.clear();
+      }
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::onReady1(PromisePtr promise)
+    {
+      // NOT in a lock
+      promise->resolve();
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::performAsync(std::function<void(PromisePtr)> func)
+    {
+      auto pThis = thisWeak_.lock();
+
+      auto promise = Promise::create(getAssociatedMessageQueue());
+      promise->thenWeak(pThis);
+
+      pendingPromises_[promise->getID()] = promise;
+      postClosure([func, promise] { func(promise); });
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::setState(States state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, MediaEngineSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, toString(state), string, oldState, toString(currentState_));
+
+      currentState_ = state;
+
+      // reset wakup states
+      completedWakeUp1_ = false;
+
+      // reset going to sleep states
+      completedGoingToSleep1_ = false;
+
+//      MediaEnginePtr pThis = mThisWeak.lock();
+//      if (pThis) {
+//        mSubscriptions.delegate()->onMediaEngineStateChanged(pThis, currentState_);
+//      }
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, MediaEngineSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, MediaEngineSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine::WebRtcTraceCallback
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::WebRtcTraceCallback::Print(webrtc::TraceLevel trace, const char* message, int length)
+    {
+      static const size_t stripLength = 34;
+
+      Log::Severity severity {Log::Severity::Informational};
+      Log::Level level {Log::Level::Basic};
+
+      switch (trace)
+      {
+        case webrtc::kTraceNone:        level = Log::Level::None; break;
+        case webrtc::kTraceStateInfo:   level = Log::Level::Debug; break;
+        case webrtc::kTraceCritical:    severity = Log::Severity::Fatal; level = Log::Level::Basic; break;
+        case webrtc::kTraceError:       severity = Log::Severity::Error; level = Log::Level::Basic; break;
+        case webrtc::kTraceWarning:     severity = Log::Severity::Warning; level = Log::Level::Detail; break;
+        case webrtc::kTraceApiCall:     level = Log::Level::Debug; break;
+        case webrtc::kTraceDefault:     level = Log::Level::Debug; break;
+        case webrtc::kTraceModuleCall:  level = Log::Level::Trace; break;
+        case webrtc::kTraceMemory:      level = Log::Level::Trace; break;
+        case webrtc::kTraceTimer:       level = Log::Level::Trace; break;
+        case webrtc::kTraceStream:      level = Log::Level::Insane; break;
+        case webrtc::kTraceDebug:       level = Log::Level::Insane; break;
+        case webrtc::kTraceInfo:        level = Log::Level::Insane; break;
+        case webrtc::kTraceTerseInfo:   level = Log::Level::Insane; break;
+        case webrtc::kTraceAll:         level = Log::Level::Insane; break;
+      }
+
+      // Skip past boilerplate prefix text
+      if (length < stripLength) {
+        std::string msg(message, length);
+        webrtcTrace(Log::Severity::Error, Log::Level::Basic, (std::string("Malformed webrtc log message: ") + msg).c_str());
+      } else {
+        std::string msg(message + (stripLength-1), length - stripLength);
+        webrtcTrace(severity, level, msg.c_str());
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine::WebRtcTraceCallback
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void MediaEngine::WebRtcLogSink::OnLogMessage(const std::string& message)
+    {
+      if (message.length() < 1) return;
+
+      bool hasEOL = ('\n' == message[message.length() - 1]);
+     
+      std::string msg(message.c_str(), message.length() - (hasEOL ? 1 : 0));
+
+      webrtcTrace(Log::Severity::Informational, Log::Level::Basic, msg.c_str());
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineFactory
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IMediaEngineFactory &IMediaEngineFactory::singleton()
+    {
+      return MediaEngineFactory::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    MediaEnginePtr IMediaEngineFactory::create()
+    {
+      if (this) {}
+      return internal::MediaEngine::create();
+    }
+
+    //-------------------------------------------------------------------------
+    void IMediaEngineFactory::setLogLevel(Log::Level level)
+    {
+      if (this) {}
+      internal::MediaEngine::setLogLevel(level);
+    }
+
+    //-------------------------------------------------------------------------
+    void IMediaEngineFactory::ntpServerTime(const Milliseconds &value)
+    {
+      if (this) {}
+      internal::MediaEngine::ntpServerTime(value);
+    }
+
+    //-------------------------------------------------------------------------
+    void IMediaEngineFactory::startMediaTracing()
+    {
+      if (this) {}
+      return internal::MediaEngine::startMediaTracing();
+    }
+
+    //-------------------------------------------------------------------------
+    void IMediaEngineFactory::stopMediaTracing()
+    {
+      if (this) {}
+      internal::MediaEngine::stopMediaTracing();
+    }
+
+    //-------------------------------------------------------------------------
+    bool IMediaEngineFactory::isMediaTracing()
+    {
+      if (this) {}
+      return internal::MediaEngine::isMediaTracing();
+    }
+
+    //-------------------------------------------------------------------------
+    bool IMediaEngineFactory::saveMediaTrace(String filename)
+    {
+      if (this) {}
+      return internal::MediaEngine::saveMediaTrace(filename);
+    }
+
+    //-------------------------------------------------------------------------
+    bool IMediaEngineFactory::saveMediaTrace(String host, int port)
+    {
+      if (this) {}
+      return internal::MediaEngine::saveMediaTrace(host, port);
+    }
+
+    //-------------------------------------------------------------------------
+    IMediaEngineFactory::MediaDeviceCapturePromisePtr IMediaEngineFactory::createMediaDeviceCapture(
+                                                                                                    MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                                                    Kinds kind,
+                                                                                                    const TrackConstraints &constraints,
+                                                                                                    IMediaDeviceCaptureDelegatePtr delegate
+                                                                                                    )
+    {
+      if (this) {}
+      return internal::MediaEngine::createMediaDeviceCapture(repaceExistingDeviceObjectID, kind, constraints, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    IMediaEngineFactory::MediaDeviceRenderPromisePtr IMediaEngineFactory::createMediaDeviceRender(
+                                                                                                  MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                                                  const TrackConstraints &constraints,
+                                                                                                  IMediaDeviceRenderDelegatePtr delegate
+                                                                                                  )
+    {
+      if (this) {}
+      return internal::MediaEngine::createMediaDeviceRender(repaceExistingDeviceObjectID, constraints, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    IMediaEngineFactory::PromiseWithRTPDecoderAudioPtr IMediaEngineFactory::createRTPDecoderAudio(
+                                                                                                  const Parameters &parameters,
+                                                                                                  IRTPDecoderDelegatePtr delegate
+                                                                                                  )
+    {
+      if (this) {}
+      return internal::MediaEngine::createRTPDecoderAudio(parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    IMediaEngineFactory::PromiseWithRTPDecoderVideoPtr IMediaEngineFactory::createRTPDecoderVideo(
+                                                                                                  const Parameters &parameters,
+                                                                                                  IRTPDecoderDelegatePtr delegate
+                                                                                                  )
+    {
+      if (this) {}
+      return internal::MediaEngine::createRTPDecoderVideo(parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    IMediaEngineFactory::PromiseWithRTPEncoderAudioPtr IMediaEngineFactory::createRTPEncoderAudio(
+                                                                                                  const Parameters &parameters,
+                                                                                                  IRTPEncoderDelegatePtr delegate
+                                                                                                  )
+    {
+      if (this) {}
+      return internal::MediaEngine::createRTPEncoderAudio(parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    IMediaEngineFactory::PromiseWithRTPEncoderVideoPtr IMediaEngineFactory::createRTPEncoderVideo(
+                                                                                                  const Parameters &parameters,
+                                                                                                  IRTPEncoderDelegatePtr delegate
+                                                                                                  )
+    {
+      if (this) {}
+      return internal::MediaEngine::createRTPEncoderVideo(parameters, delegate);
+    }
+
+
+  } // internal namespace
+}
diff --git a/ortc/cpp/ortc_MediaStreamTrack.cpp b/ortc/cpp/ortc_MediaStreamTrack.cpp
index 96329246..d5708cf3 100644
--- a/ortc/cpp/ortc_MediaStreamTrack.cpp
+++ b/ortc/cpp/ortc_MediaStreamTrack.cpp
@@ -1,6 +1,6 @@
 /*
 
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
+ Copyright (c) 2017, Hookflash Inc. / Optical Tone Ltd.
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -29,20 +29,17 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_MediaStreamTrack.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
-#include <ortc/internal/ortc_RTPSender.h>
-#include <ortc/internal/ortc_RTPSenderChannel.h>
-#include <ortc/internal/ortc_RTPSenderChannelAudio.h>
-#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
-#include <ortc/internal/ortc_RTPReceiver.h>
-#include <ortc/internal/ortc_RTPReceiverChannel.h>
-#include <ortc/internal/ortc_RTPReceiverChannelAudio.h>
-#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
 #include <ortc/internal/ortc_Helper.h>
 #include <ortc/internal/ortc_ORTC.h>
 #include <ortc/internal/ortc_StatsReport.h>
 #include <ortc/internal/platform.h>
+#include <ortc/internal/ortc_IMediaStreamTrackMonitor.h>
+#include <ortc/internal/ortc.events.h>
+#include <ortc/internal/ortc.stats.events.h>
 
 #include <ortc/IHelper.h>
 
@@ -69,7 +66,7 @@
 #endif //_DEBUG
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_mediastreamtrack) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_stream_track) }
 
 namespace ortc
 {
@@ -142,8 +139,23 @@ namespace ortc
     {
       MediaStreamTrackSettingsDefaults::singleton();
     }
-
-
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrack
+    #pragma mark
+  
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForMediaStreamTrackChannel
+    #pragma mark
+  
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -153,11 +165,43 @@ namespace ortc
     #pragma mark
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr IMediaStreamTrackForRTPReceiver::create(Kinds kind)
+    IMediaStreamTrackForRTPReceiver::ForReceiverPtr IMediaStreamTrackForRTPReceiver::createForReceiver(IMediaStreamTrackTypes::Kinds kind)
     {
-      return internal::IMediaStreamTrackFactory::singleton().create(kind);
+      return IMediaStreamTrackFactory::singleton().createForReceiver(kind);
     }
 
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForRTPReceiverChannel
+    #pragma mark
+  
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForRTPSender
+    #pragma mark
+  
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForRTPSenderChannel
+    #pragma mark
+  
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForMediaStream
+    #pragma mark
+
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -166,22 +210,48 @@ namespace ortc
     #pragma mark MediaStreamTrack
     #pragma mark
 
+
+    //-------------------------------------------------------------------------
+    const char *MediaStreamTrack::toString(MediaStreamTrackTypes type)
+    {
+      switch (type) {
+        case MediaStreamTrackType_Capture:   return "capture";
+        case MediaStreamTrackType_Receiver:  return "receiver";
+        case MediaStreamTrackType_Selector:  return "selector";
+      }
+      return "UNDEFINED";
+    }
+
+    //-------------------------------------------------------------------------
+    MediaStreamTrack::MediaStreamTrackTypes MediaStreamTrack::toMediaStreamTrackType(const char *inputStr)
+    {
+      String str(inputStr);
+      for (MediaStreamTrack::MediaStreamTrackTypes index = MediaStreamTrack::MediaStreamTrackType_First; index <= MediaStreamTrack::MediaStreamTrackType_Last; index = static_cast<MediaStreamTrack::MediaStreamTrackTypes>(static_cast<std::underlying_type<MediaStreamTrack::MediaStreamTrackTypes>::type>(index) + 1)) {
+        if (0 == str.compareNoCase(MediaStreamTrack::toString(index))) return index;
+      }
+      ORTC_THROW_INVALID_PARAMETERS("Invalid parameter value: " + str)
+      return MediaStreamTrack::MediaStreamTrackType_First;
+    }
+
     //-------------------------------------------------------------------------
     MediaStreamTrack::MediaStreamTrack(
                                        const make_private &,
-                                       IMessageQueuePtr queue,
-                                       Kinds kind,
-                                       bool remote,
-                                       TrackConstraintsPtr constraints
+                                       const MediaStreamTrackArguments &args
                                        ) :
-      MessageQueueAssociator(queue),
+      MessageQueueAssociator(args.queue_),
       SharedRecursiveLock(SharedRecursiveLock::create()),
-      mTrackID(String(IMediaStreamTrackTypes::toString(kind)) + "_label_" + string(zsLib::createUUID())),
-      mKind(kind),
-      mRemote(remote),
-      mConstraints(constraints)
+      subscriptions_(decltype(subscriptions_)::create()),
+      trackId_(String(IMediaStreamTrackTypes::toString(args.kind_)) + "_label_" + string(zsLib::createUUID())),
+      kind_(args.kind_),
+      type_(args.type_),
+      constraints_(args.constraints_)
     {
-      ZS_LOG_DETAIL(debug("created"))
+      ZS_EVENTING_4(x, i, Detail, MediaStreamTrackCreate, ol, MediaEngine, Start, 
+        puid, id, id_,
+        string, traceId, trackId_,
+        string, kind, IMediaStreamTrackTypes::toString(kind_),
+        string, type, MediaStreamTrack::toString(type_)
+      );
     }
 
     //-------------------------------------------------------------------------
@@ -189,13 +259,12 @@ namespace ortc
     {
       AutoRecursiveLock lock(*this);
 
-      mStatsTimer = ITimer::create(mThisWeak.lock(), Seconds(1));
-
-      mCapabilities = make_shared<Capabilities>();
-      mSettings = make_shared<TrackSettings>();
+      statsTimer_ = ITimer::create(thisWeak_.lock(), Seconds(1));
 
+      capabilities_ = make_shared<Capabilities>();
+      settings_ = make_shared<Settings>();
 
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
     }
 
     //-------------------------------------------------------------------------
@@ -203,108 +272,86 @@ namespace ortc
     {
       if (isNoop()) return;
 
-      ZS_LOG_DETAIL(log("destroyed"))
-      mThisWeak.reset();
+      ZS_EVENTING_1(x, i, Detail, MediaStreamTrackDestroy, ol, MediaEngine, Stop, puid, id, id_);
 
-      cancel();
-    }
+      thisWeak_.reset();
 
-    //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::create(
-                                                 Kinds kind,
-                                                 bool remote,
-                                                 TrackConstraintsPtr constraints
-                                                 )
-    {
-      MediaStreamTrackPtr pThis(make_shared<MediaStreamTrack>(make_private{}, IORTCForInternal::queueORTC(), kind, remote, constraints));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
+      cancel();
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(IMediaStreamTrackPtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ortc::IMediaStreamTrackPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
-    //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForSenderPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
-    }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForSenderChannelPtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(internal::IMediaStreamTrackPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForSenderChannelMediaBasePtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ForMediaStreamPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForSenderChannelAudioPtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ForMediaStreamTrackChannelPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForSenderChannelVideoPtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ForMediaStreamTrackSubscriberPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForReceiverPtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ForMediaStreamTrackSubscriberMediaPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForReceiverChannelPtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ForMediaStreamTrackSubscriberRTPPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForReceiverChannelMediaBasePtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ForMediaDevicesPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForReceiverChannelAudioPtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ForReceiverPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForReceiverChannelVideoPtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ForReceiverChannelPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForMediaDevicesPtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ForSenderPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForMediaEnginePtr object)
+    MediaStreamTrackPtr MediaStreamTrack::convert(ForSenderChannelPtr object)
     {
       return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
     }
 
-    //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::convert(ForMediaStreamPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(MediaStreamTrack, object);
-    }
 
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -324,12 +371,13 @@ namespace ortc
 
       if ((isShutdown()) ||
           (isShuttingDown())) {
-        ZS_LOG_WARNING(Debug, log("can not fetch stats while shutdown / shutting down"));
+        ZS_EVENTING_2(x, w, Debug, MediaStreamTrackWarning, ol, RtpPacket, Info, puid, id, id_, string, message, "can not fetch stats while shutdown / shutting down");
+
         return PromiseWithStatsReport::createRejected(IORTCForInternal::queueDelegate());
       }
 
       PromiseWithStatsReportPtr promise = PromiseWithStatsReport::create(IORTCForInternal::queueDelegate());
-      IMediaStreamTrackAsyncDelegateProxy::create(mThisWeak.lock())->onResolveStatsPromise(promise, stats);
+      IMediaStreamTrackAsyncDelegateProxy::create(thisWeak_.lock())->onResolveStatsPromise(promise, stats);
       return promise;
     }
 
@@ -342,26 +390,46 @@ namespace ortc
     #pragma mark
     
     //-------------------------------------------------------------------------
-    ElementPtr MediaStreamTrack::toDebug(MediaStreamTrackPtr object)
-    {
-      if (!object) return ElementPtr();
-      return object->toDebug();
+    void MediaStreamTrack::trace(
+                                 const char *func,
+                                 const char *message
+                                 ) const
+    {
+      ZS_EVENTING_17(x, i, Basic, MediaStreamTrackTrace, ol, MediaEngine, Info,
+        puid, id, id_,
+        string, func, func,
+        string, message, message,
+        bool, gracefulShutdownReference, (bool)gracefulShutdownReference_,
+        string, currentState, ortc::IMediaStreamTrackTypes::toString(currentState_),
+        word, lastError, lastError_,
+        string, lastErrorReason, lastErrorReason_,
+        string, trackId, trackId_,
+        string, label, label_,
+        string, kind, ortc::IMediaStreamTrackTypes::toString(kind_),
+        bool, enabled, enabled_,
+        bool, muted, muted_,
+        string, type, MediaStreamTrack::toString(type_),
+        string, deviceId, deviceId_,
+        size_t, subscribers, subscribers_ ? subscribers_->size() : 0,
+        size_t, channels, channels_ ? channels_->size() : 0,
+        puid, statsTimer, statsTimer_ ? statsTimer_->getID() : 0
+      );
     }
 
     //-------------------------------------------------------------------------
     IMediaStreamTrackSubscriptionPtr MediaStreamTrack::subscribe(IMediaStreamTrackDelegatePtr originalDelegate)
     {
-      ZS_LOG_DETAIL(slog("subscribing to media stream track"))
+      ZS_EVENTING_1(x, i, Detail, MediaStreamTrackSubscribe, ol, MediaEngine, Info, puid, id, id_);
 
       AutoRecursiveLock lock(*this);
       if (!originalDelegate) return IMediaStreamTrackSubscriptionPtr();
 
-      IMediaStreamTrackSubscriptionPtr subscription = mSubscriptions.subscribe(originalDelegate, IORTCForInternal::queueDelegate());
+      IMediaStreamTrackSubscriptionPtr subscription = subscriptions_.subscribe(originalDelegate, IORTCForInternal::queueDelegate());
 
-      IMediaStreamTrackDelegatePtr delegate = mSubscriptions.delegate(subscription, true);
+      IMediaStreamTrackDelegatePtr delegate = subscriptions_.delegate(subscription, true);
 
       if (delegate) {
-        auto pThis = mThisWeak.lock();
+        auto pThis = thisWeak_.lock();
 
 #define TODO_DO_WE_NEED_TO_TELL_ABOUT_ANY_MISSED_EVENTS 1
 #define TODO_DO_WE_NEED_TO_TELL_ABOUT_ANY_MISSED_EVENTS 2
@@ -371,7 +439,7 @@ namespace ortc
       }
 
       if (isShutdown()) {
-        mSubscriptions.clear();
+        subscriptions_.clear();
       }
 
       return subscription;
@@ -380,13 +448,13 @@ namespace ortc
     //-------------------------------------------------------------------------
     IMediaStreamTrackTypes::Kinds MediaStreamTrack::kind() const
     {
-      return mKind;
+      return kind_;
     }
 
     //-------------------------------------------------------------------------
     String MediaStreamTrack::id() const
     {
-      return mTrackID;
+      return trackId_;
     }
 
     //-------------------------------------------------------------------------
@@ -394,63 +462,59 @@ namespace ortc
     {
       AutoRecursiveLock lock(*this);
 
-      return mDeviceID;
+      return deviceId_;
     }
 
+
     //-------------------------------------------------------------------------
     String MediaStreamTrack::label() const
     {
-#define TODO 1
-#define TODO 2
-      return String();
+      return label_;
     }
 
     //-------------------------------------------------------------------------
     bool MediaStreamTrack::enabled() const
     {
-#define TODO 1
-#define TODO 2
-      return false;
+      AutoRecursiveLock lock(*this);
+      return enabled_;
     }
 
     //-------------------------------------------------------------------------
     void MediaStreamTrack::enabled(bool enabled)
     {
-#define TODO 1
-#define TODO 2
+      AutoRecursiveLock lock(*this);
+      enabled_ = enabled;
     }
 
     //-------------------------------------------------------------------------
     bool MediaStreamTrack::muted() const
     {
-#define TODO 1
-#define TODO 2
-      return false;
+      AutoRecursiveLock lock(*this);
+      return muted_;
     }
 
     //-------------------------------------------------------------------------
     void MediaStreamTrack::muted(bool muted)
     {
-#define TODO 1
-#define TODO 2
+      AutoRecursiveLock lock(*this);
+      muted_ = muted;
     }
 
     //-------------------------------------------------------------------------
     bool MediaStreamTrack::remote() const
     {
-      return mRemote; // no lock needed
+      return type_ == MediaStreamTrackType_Receiver;
     }
 
     //-------------------------------------------------------------------------
     IMediaStreamTrackTypes::States MediaStreamTrack::readyState() const
     {
-#define TODO 1
-#define TODO 2
-      return State_First;
+      AutoRecursiveLock lock(*this);
+      return currentState_;
     }
 
     //-------------------------------------------------------------------------
-    IMediaStreamTrackPtr MediaStreamTrack::clone() const
+    ortc::IMediaStreamTrackPtr MediaStreamTrack::clone() const
     {
 #define TODO 1
 #define TODO 2
@@ -461,28 +525,28 @@ namespace ortc
     void MediaStreamTrack::stop()
     {
       AutoRecursiveLock lock(*this);
-      if (mDeviceResource)
-        mDeviceResource->stop();
+#define TODO 1
+#define TODO 2
     }
 
     //-------------------------------------------------------------------------
     IMediaStreamTrackTypes::CapabilitiesPtr MediaStreamTrack::getCapabilities() const
     {
-      return mCapabilities;
+      return capabilities_;
     }
 
     //-------------------------------------------------------------------------
     IMediaStreamTrackTypes::TrackConstraintsPtr MediaStreamTrack::getConstraints() const
     {
       AutoRecursiveLock lock(*this);
-      return mConstraints;
+      return constraints_;
     }
 
     //-------------------------------------------------------------------------
     IMediaStreamTrackTypes::SettingsPtr MediaStreamTrack::getSettings() const
     {
       AutoRecursiveLock lock(*this);
-      return mSettings;
+      return settings_;
     }
 
     //-------------------------------------------------------------------------
@@ -492,71 +556,49 @@ namespace ortc
 
       auto constraints = TrackConstraints::create(inConstraints);
 
-      IMediaStreamTrackAsyncDelegateProxy::create(mThisWeak.lock())->onApplyConstraints(promise, constraints);
+      IMediaStreamTrackAsyncDelegateProxy::create(thisWeak_.lock())->onApplyConstraints(promise, constraints);
 
       return promise;
     }
 
     //-------------------------------------------------------------------------
-    void MediaStreamTrack::setVideoRenderCallback(IMediaStreamTrackRenderCallbackPtr callback)
-    {
-      AutoRecursiveLock lock(*this);
-
-      mVideoRendererCallback = callback;
-      if (mDeviceResource)
-        mDeviceResource->setVideoRenderCallback(callback);
-    }
-
-    //-------------------------------------------------------------------------
-    void MediaStreamTrack::setH264Rendering(bool h264Rendering)
+    IMediaStreamTrackMediaSubscriptionPtr MediaStreamTrack::subscribeMedia(IMediaStreamTrackSyncMediaDelegatePtr delegate)
     {
-      AutoRecursiveLock lock(*this);
-
-      mH264Rendering = h264Rendering;
+      return IMediaStreamTrackMediaSubscriptionPtr();
     }
 
     //-------------------------------------------------------------------------
-    bool MediaStreamTrack::isH264Rendering()
+    IMediaStreamTrackMediaSubscriptionPtr MediaStreamTrack::subscribeMedia(IMediaStreamTrackAsyncMediaDelegatePtr delegate)
     {
-      AutoRecursiveLock lock(*this);
-
-      return mH264Rendering;
+      return IMediaStreamTrackMediaSubscriptionPtr();
     }
 
+    
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSender
+    #pragma mark MediaStreamTrack => internal::IMediaStreamTrack
     #pragma mark
 
-    //-------------------------------------------------------------------------
-    void MediaStreamTrack::setSender(IRTPSenderPtr sender)
-    {
-      AutoRecursiveLock lock(*this);
-
-      mSender = RTPSender::convert(sender);
-    }
-
-    //-------------------------------------------------------------------------
-    void MediaStreamTrack::notifyAttachSenderChannel(RTPSenderChannelPtr channel)
-    {
-      IMediaStreamTrackAsyncDelegateProxy::create(mThisWeak.lock())->onAttachSenderChannel(channel);
-    }
 
     //-------------------------------------------------------------------------
-    void MediaStreamTrack::notifyDetachSenderChannel(RTPSenderChannelPtr channel)
+    IMediaStreamTrackRTPSubscriptionPtr MediaStreamTrack::subscribeRTP(
+                                                                       const Parameters &rtpEncodingParams,
+                                                                       IMediaStreamTrackRTPDelegatePtr delegate
+                                                                       )
     {
-      IMediaStreamTrackAsyncDelegateProxy::create(mThisWeak.lock())->onDetachSenderChannel(channel);
+      return IMediaStreamTrackRTPSubscriptionPtr();
     }
 
+    
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSenderChannel
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForSettings
     #pragma mark
 
     //-------------------------------------------------------------------------
@@ -564,51 +606,36 @@ namespace ortc
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSenderChannelMediaBase
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStream
     #pragma mark
 
     //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSenderChannelAudio
-    #pragma mark
+    bool MediaStreamTrack::isEnded() const
+    {
+      AutoRecursiveLock lock(*this);
+      return isShutdown();
+    }
 
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSenderChannelVideo
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStreamTrackChannel
     #pragma mark
 
+    
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiver
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStreamTrackSubscriber
     #pragma mark
-
-    //-------------------------------------------------------------------------
-    MediaStreamTrackPtr MediaStreamTrack::create(Kinds kind)
-    {
-      return create(kind, true, TrackConstraintsPtr());
-    }
-
-    //-------------------------------------------------------------------------
-    void MediaStreamTrack::setReceiver(IRTPReceiverPtr receiver)
-    {
-      AutoRecursiveLock lock(*this);
-
-      mReceiver = RTPReceiver::convert(receiver);
-    }
-
+    
     //-------------------------------------------------------------------------
-    void MediaStreamTrack::notifyActiveReceiverChannel(RTPReceiverChannelPtr inChannel)
+    void MediaStreamTrack::notifySubscriberCancelled(UseSubscriberPtr subscriber)
     {
-      IMediaStreamTrackAsyncDelegateProxy::create(mThisWeak.lock())->onSetActiveReceiverChannel(inChannel);
     }
 
     //-------------------------------------------------------------------------
@@ -616,39 +643,57 @@ namespace ortc
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiverChannel
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStreamTrackSubscriberMedia
     #pragma mark
-
+    
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiverChannelMediaBase
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStreamTrackSubscriberRTP
     #pragma mark
 
+    
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiverChannelAudio
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaDevices
     #pragma mark
 
+
+    //-------------------------------------------------------------------------
+    MediaStreamTrack::ForMediaDevicesPtr MediaStreamTrack::createForMediaDevices(
+                                                                                 IMediaStreamTrackTypes::Kinds kind,
+                                                                                 const TrackConstraints &constraints
+                                                                                 )
+    {
+      MediaStreamTrackArguments args;
+      args.queue_ = IORTCForInternal::queueORTC();
+      args.kind_ = kind;
+      args.type_ = MediaStreamTrackType_Capture;
+      args.constraints_ = make_shared<TrackConstraints>(constraints);
+
+      MediaStreamTrackPtr pThis(make_shared<MediaStreamTrack>(make_private{}, args));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiverChannelVideo
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStreamTrackSelector
     #pragma mark
 
     //-------------------------------------------------------------------------
-    void MediaStreamTrack::renderVideoFrame(VideoFramePtr videoFrame)
+    MediaStreamTrack::ForMediaDevicesPtr MediaStreamTrack::createForMediaStreamTrackSelector(IMediaStreamTrackTypes::Kinds kind)
     {
-      AutoRecursiveLock lock(*this);
-
-      if (mDeviceResource) mDeviceResource->renderVideoFrame(videoFrame);
+      return ForMediaDevicesPtr();
     }
 
     //-------------------------------------------------------------------------
@@ -656,23 +701,21 @@ namespace ortc
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaEngine
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiver
     #pragma mark
 
     //-------------------------------------------------------------------------
-    void MediaStreamTrack::sendCapturedVideoFrame(VideoFramePtr videoFrame)
+    MediaStreamTrack::ForReceiverPtr MediaStreamTrack::createForReceiver(IMediaStreamTrackTypes::Kinds kind)
     {
-      UseSenderChannelPtr channel;
-
-      {
-        AutoRecursiveLock lock(*this);
+      MediaStreamTrackArguments args;
+      args.queue_ = IORTCForInternal::queueORTC();
+      args.kind_ = kind;
+      args.type_ = MediaStreamTrackType_Receiver;
 
-        channel = mSenderChannel.lock();
-      }
-
-      if (!channel) return;
-
-      channel->sendVideoFrame(videoFrame);
+      MediaStreamTrackPtr pThis(make_shared<MediaStreamTrack>(make_private{}, args));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
     }
 
     //-------------------------------------------------------------------------
@@ -680,7 +723,7 @@ namespace ortc
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaDevices
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiverChannel
     #pragma mark
 
     //-------------------------------------------------------------------------
@@ -688,7 +731,7 @@ namespace ortc
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaEngine
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSender
     #pragma mark
 
     //-------------------------------------------------------------------------
@@ -696,16 +739,9 @@ namespace ortc
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStream
+    #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSenderChannel
     #pragma mark
 
-    //-------------------------------------------------------------------------
-    bool MediaStreamTrack::isEnded() const
-    {
-      AutoRecursiveLock lock(*this);
-      return isShutdown();
-    }
-
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -717,7 +753,7 @@ namespace ortc
     //-------------------------------------------------------------------------
     void MediaStreamTrack::onWake()
     {
-      ZS_LOG_DEBUG(log("wake"))
+      ZS_EVENTING_1(x, i, Debug, MediaStreamTrackOnWake, ol, MediaEngine, InternalEvent, puid, id, id_);
 
       AutoRecursiveLock lock(*this);
       step();
@@ -734,14 +770,13 @@ namespace ortc
     //-------------------------------------------------------------------------
     void MediaStreamTrack::onTimer(ITimerPtr timer)
     {
-      ZS_LOG_TRACE(log("timer") + ZS_PARAM("timer id", timer->getID()))
+      ZS_EVENTING_2(x, i, Debug, MediaStreamTrackOnTimer, ol, MediaEngine, InternalEvent,
+        puid, id, id_,
+        puid, timerId, timer->getID()
+      );
 
       AutoRecursiveLock lock(*this);
-
-      if (mStatsTimer) {
-        if (mDeviceResource && timer->getID() == mStatsTimer->getID()) {
-          mDeviceResource->setFrameCount();
-        }
+      if (statsTimer_) {
       }
     }
 
@@ -756,7 +791,10 @@ namespace ortc
     //-------------------------------------------------------------------------
     void MediaStreamTrack::onPromiseSettled(PromisePtr promise)
     {
-      ZS_LOG_DEBUG(log("promise settled") + ZS_PARAM("promise", promise->getID()))
+      ZS_EVENTING_2(x, i, Debug, MediaStreamTrackOnPromiseSettled, ol, MediaEngine, InternalEvent,
+        puid, id, id_,
+        puid, promiseId, promise->getID()
+      );
 
       AutoRecursiveLock lock(*this);
       step();
@@ -774,9 +812,6 @@ namespace ortc
     void MediaStreamTrack::onResolveStatsPromise(IStatsProvider::PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats)
     {
       AutoRecursiveLock lock(*this);
-
-      if (mDeviceResource)
-        mDeviceResource->requestStats(promise, stats);
     }
 
     //-------------------------------------------------------------------------
@@ -786,55 +821,6 @@ namespace ortc
                                               )
     {
       AutoRecursiveLock lock(*this);
-        
-      if (mDeviceResource)
-        mDeviceResource->updateConstraints(promise, constraints);
-    }
-
-    //-------------------------------------------------------------------------
-    void MediaStreamTrack::onSetActiveReceiverChannel(UseReceiverChannelPtr channel)
-    {
-      AutoRecursiveLock lock(*this);
-
-      if (!channel) {
-        ZS_LOG_DEBUG(log("active receiver channel is being removed"))
-#define TODO 1
-#define TODO 2
-        return;
-      }
-
-      ZS_LOG_DEBUG(log("setting to active receiver channel") + ZS_PARAM("channel", channel->getID()))
-
-      mReceiverChannel = channel;
-
-#define TODO 1
-#define TODO 2
-    }
-
-    //-------------------------------------------------------------------------
-    void MediaStreamTrack::onAttachSenderChannel(UseSenderChannelPtr channel)
-    {
-      ZS_LOG_DEBUG(log("attaching sender channel") + ZS_PARAM("channel", channel->getID()))
-
-      AutoRecursiveLock lock(*this);
-
-      mSenderChannel = channel;
-
-#define TODO 1
-#define TODO 2
-    }
-    
-    //-------------------------------------------------------------------------
-    void MediaStreamTrack::onDetachSenderChannel(UseSenderChannelPtr channel)
-    {
-      ZS_LOG_DEBUG(log("detaching sender channel") + ZS_PARAM("channel", channel->getID()))
-
-      AutoRecursiveLock lock(*this);
-
-      mSenderChannel.reset();
-
-#define TODO 1
-#define TODO 2
     }
 
     //-------------------------------------------------------------------------
@@ -845,70 +831,28 @@ namespace ortc
     #pragma mark MediaStreamTrack => (internal)
     #pragma mark
 
-    //-------------------------------------------------------------------------
-    Log::Params MediaStreamTrack::log(const char *message) const
-    {
-      ElementPtr objectEl = Element::create("ortc::MediaStreamTrack");
-      IHelper::debugAppend(objectEl, "id", mID);
-      return Log::Params(message, objectEl);
-    }
-
-    //-------------------------------------------------------------------------
-    Log::Params MediaStreamTrack::slog(const char *message)
-    {
-      ElementPtr objectEl = Element::create("ortc::MediaStreamTrack");
-      return Log::Params(message, objectEl);
-    }
-
-    //-------------------------------------------------------------------------
-    Log::Params MediaStreamTrack::debug(const char *message) const
-    {
-      return Log::Params(message, toDebug());
-    }
-
-    //-------------------------------------------------------------------------
-    ElementPtr MediaStreamTrack::toDebug() const
-    {
-      AutoRecursiveLock lock(*this);
-
-      ElementPtr resultEl = Element::create("ortc::MediaStreamTrack");
-
-      IHelper::debugAppend(resultEl, "id", mID);
-
-      IHelper::debugAppend(resultEl, "graceful shutdown", (bool)mGracefulShutdownReference);
-
-      IHelper::debugAppend(resultEl, "subscribers", mSubscriptions.size());
-
-      IHelper::debugAppend(resultEl, "state", toString(mCurrentState));
-
-      IHelper::debugAppend(resultEl, "error", mLastError);
-      IHelper::debugAppend(resultEl, "error reason", mLastErrorReason);
-
-      return resultEl;
-    }
-
     //-------------------------------------------------------------------------
     bool MediaStreamTrack::isShuttingDown() const
     {
-      if (mGracefulShutdownReference) return true;
-      return State_Ended == mCurrentState;
+      if (gracefulShutdownReference_) return true;
+      return State_Ended == currentState_;
     }
 
     //-------------------------------------------------------------------------
     bool MediaStreamTrack::isShutdown() const
     {
-      if (mGracefulShutdownReference) return false;
-      return State_Ended == mCurrentState;
+      if (gracefulShutdownReference_) return false;
+      return State_Ended == currentState_;
     }
 
     //-------------------------------------------------------------------------
     void MediaStreamTrack::step()
     {
-      ZS_LOG_DEBUG(debug("step"))
+      ZS_EVENTING_1(x, i, Debug, MediaStreamTrackStep, ol, MediaEngine, Step, puid, id, id_);
 
       if ((isShuttingDown()) ||
           (isShutdown())) {
-        ZS_LOG_DEBUG(debug("step forwarding to cancel"))
+        ZS_EVENTING_2(x, i, Debug, MediaStreamTrackStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "step forwarding to cancel");
         cancel();
         return;
       }
@@ -922,63 +866,25 @@ namespace ortc
 
     not_ready:
       {
-        ZS_LOG_TRACE(debug("not ready"))
+        ZS_EVENTING_2(x, i, Debug, MediaStreamTrackStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "not ready");
         return;
       }
 
     ready:
       {
-        ZS_LOG_TRACE(log("ready"))
+        ZS_EVENTING_2(x, i, Debug, MediaStreamTrackStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "ready");
       }
     }
 
     //-------------------------------------------------------------------------
     bool MediaStreamTrack::stepDevicePromise()
     {
-      if (mDeviceResourceLifetimeHolderPromise) {
-        ZS_LOG_TRACE(log("already setup device promise"))
-          return true;
-      }
-
-      mDeviceResourceLifetimeHolderPromise = UseMediaEngine::setupDevice(mThisWeak.lock());
-
-      mDeviceResourceLifetimeHolderPromise->thenWeak(mThisWeak.lock());
-
       return true;
     }
 
     //-------------------------------------------------------------------------
     bool MediaStreamTrack::stepSetupDevice()
     {
-      if (mDeviceResource) {
-        ZS_LOG_TRACE(log("already setup device resource"))
-        return true;
-      }
-
-      if (!mDeviceResourceLifetimeHolderPromise->isSettled()) {
-        ZS_LOG_TRACE(log("waiting for setup device promise to be set up"))
-        return false;
-      }
-
-      if (mDeviceResourceLifetimeHolderPromise->isRejected()) {
-        ZS_LOG_WARNING(Debug, log("media engine rejected device setup"))
-        cancel();
-        return false;
-      }
-
-      mDeviceResource = ZS_DYNAMIC_PTR_CAST(UseDeviceResource, mDeviceResourceLifetimeHolderPromise->value());
-
-      if (!mDeviceResource) {
-        ZS_LOG_WARNING(Detail, log("failed to initialize device resource"))
-        cancel();
-        return false;
-      }
-
-      if (mVideoRendererCallback)
-        mDeviceResource->setVideoRenderCallback(mVideoRendererCallback);
-
-      ZS_LOG_DEBUG(log("media device is setup") + ZS_PARAM("device", mDeviceResource->getID()))
-
       return true;
     }
 
@@ -990,53 +896,36 @@ namespace ortc
 
       if (isShutdown()) return;
 
-      if (!mGracefulShutdownReference) mGracefulShutdownReference = mThisWeak.lock();
-
-      if (!mCloseDevicePromise) {
-        if (mDeviceResource) {
-          mCloseDevicePromise = mDeviceResource->shutdown();
-          mCloseDevicePromise->thenWeak(mGracefulShutdownReference);
-        }
-      }
-
-      if (mGracefulShutdownReference) {
-        if (mCloseDevicePromise) {
-          if (!mCloseDevicePromise->isSettled()) {
-            ZS_LOG_DEBUG(log("waiting for close device promise"))
-            return;
-          }
-        }
-      }
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
 
       //.......................................................................
       // final cleanup
 
       setState(State_Ended);
 
-      mSubscriptions.clear();
+      subscriptions_.clear();
       
-      if (mStatsTimer) {
-        mStatsTimer->cancel();
-        mStatsTimer.reset();
+      if (statsTimer_) {
+        statsTimer_->cancel();
+        statsTimer_.reset();
       }
 
-      mDeviceResourceLifetimeHolderPromise.reset();
-
-      mDeviceResource.reset();
-      mCloseDevicePromise.reset();
-
       // make sure to cleanup any final reference to self
-      mGracefulShutdownReference.reset();
+      gracefulShutdownReference_.reset();
     }
 
     //-------------------------------------------------------------------------
     void MediaStreamTrack::setState(States state)
     {
-      if (state == mCurrentState) return;
+      if (state == currentState_) return;
 
-      ZS_LOG_DETAIL(debug("state changed") + ZS_PARAM("new state", toString(state)) + ZS_PARAM("old state", toString(mCurrentState)))
+      ZS_EVENTING_3(x, i, Debug, MediaStreamTrackState, ol, MediaEngine, StateEvent, 
+        puid, id, id_,
+        string, newState, ortc::IMediaStreamTrack::toString(state),
+        string, oldState, ortc::IMediaStreamTrack::toString(currentState_)
+      );
 
-      mCurrentState = state;
+      currentState_ = state;
 
 //      MediaStreamTrackPtr pThis = mThisWeak.lock();
 //      if (pThis) {
@@ -1052,15 +941,23 @@ namespace ortc
         reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
       }
 
-      if (0 != mLastError) {
-        ZS_LOG_WARNING(Detail, debug("error already set thus ignoring new error") + ZS_PARAM("new error", errorCode) + ZS_PARAM("new reason", reason))
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, w, Debug, MediaStreamTrackErrorAgain, ol, MediaEngine, ErrorEvent,
+          puid, id, id_,
+          word, error, errorCode,
+          string, reason, reason
+        );
         return;
       }
 
-      mLastError = errorCode;
-      mLastErrorReason = reason;
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
 
-      ZS_LOG_WARNING(Detail, debug("error set") + ZS_PARAM("error", mLastError) + ZS_PARAM("reason", mLastErrorReason))
+      ZS_EVENTING_3(x, e, Detail, MediaStreamTrackError, ol, MediaEngine, ErrorEvent,
+        puid, id, id_,
+        word, error, errorCode,
+        string, reason, reason
+      );
     }
 
     //-------------------------------------------------------------------------
@@ -1078,24 +975,22 @@ namespace ortc
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr IMediaStreamTrackFactory::create(
-                                                         IMediaStreamTrackTypes::Kinds kind,
-                                                         bool remote,
-                                                         TrackConstraintsPtr constraints
-                                                         )
-    {
+    IMediaStreamTrackFactory::ForMediaDevicesPtr IMediaStreamTrackFactory::createForMediaDevices(
+                                                                                                 IMediaStreamTrackTypes::Kinds kind,
+                                                                                                 const TrackConstraints &constraints
+                                                                                                 )
+    {      
       if (this) {}
-      return internal::MediaStreamTrack::create(kind, remote, constraints);
+      return internal::MediaStreamTrack::createForMediaDevices(kind, constraints);
     }
 
     //-------------------------------------------------------------------------
-    MediaStreamTrackPtr IMediaStreamTrackFactory::create(IMediaStreamTrackTypes::Kinds kind)
+    IMediaStreamTrackFactory::ForReceiverPtr IMediaStreamTrackFactory::createForReceiver(IMediaStreamTrackTypes::Kinds kind)
     {
       if (this) {}
-      return internal::MediaStreamTrack::create(kind);
+      return internal::MediaStreamTrack::createForReceiver(kind);
     }
 
-
   } // internal namespace
 
   //---------------------------------------------------------------------------
@@ -1344,6 +1239,7 @@ namespace ortc
     IHelper::debugAppend(resultEl, "channel acount", mChannelCount.hasValue() ? mChannelCount.value().toDebug() : ElementPtr());
     IHelper::debugAppend(resultEl, "device id", mDeviceID);
     IHelper::debugAppend(resultEl, "group id", mGroupID);
+    IHelper::debugAppend(resultEl, "encodingFormat", mEncodingFormat.hasValue() ? mEncodingFormat.value().toDebug() : ElementPtr());
 
     return resultEl;
   }
@@ -1377,6 +1273,8 @@ namespace ortc
     hasher->update(mDeviceID);
     hasher->update(":");
     hasher->update(mGroupID);
+    hasher->update(":");
+    hasher->update(mEncodingFormat.hasValue() ? mEncodingFormat.value().hash() : String());
 
     return hasher->finalizeAsString();
   }
@@ -1408,6 +1306,7 @@ namespace ortc
     IHelper::getElementValue(elem, "ortc::IMediaStreamTrackTypes::Settings", "channelCount", mChannelCount);
     IHelper::getElementValue(elem, "ortc::IMediaStreamTrackTypes::Settings", "deviceId", mDeviceID);
     IHelper::getElementValue(elem, "ortc::IMediaStreamTrackTypes::Settings", "groupId", mGroupID);
+    IHelper::getElementValue(elem, "ortc::IMediaStreamTrackTypes::Settings", "encodingFormat", mEncodingFormat);
   }
 
   //---------------------------------------------------------------------------
@@ -1429,6 +1328,7 @@ namespace ortc
     IHelper::adoptElementValue(elem, "channelCount", mChannelCount);
     IHelper::adoptElementValue(elem, "deviceId", mDeviceID);
     IHelper::adoptElementValue(elem, "groupId", mGroupID);
+    IHelper::adoptElementValue(elem, "encodingFormat", mEncodingFormat);
 
     if (!elem->hasChildren()) return ElementPtr();
 
@@ -1479,6 +1379,7 @@ namespace ortc
     IHelper::debugAppend(resultEl, "channel count", mChannelCount);
     IHelper::debugAppend(resultEl, "device id", mDeviceID);
     IHelper::debugAppend(resultEl, "group id", mGroupID);
+    IHelper::debugAppend(resultEl, "encoding format", mEncodingFormat);
 
     return resultEl;
   }
@@ -1517,6 +1418,8 @@ namespace ortc
     hasher->update(mDeviceID, "bogus99255cc407eaf6f82b33a94ab86f588581df9000");
     hasher->update(":");
     hasher->update(mGroupID, "bogus99255cc407eaf6f82b33a94ab86f588581df9000");
+    hasher->update(":");
+    hasher->update(mEncodingFormat, "bogus99255cc407eaf6f82b33a94ab86f588581df9000");
 
     return hasher->finalizeAsString();
   }
@@ -1618,6 +1521,12 @@ namespace ortc
         mGroupID = ConstrainString(entryEl);
       }
     }
+    {
+      ElementPtr entryEl = elem->findFirstChildElement("encodingFormat");
+      if (entryEl) {
+        mEncodingFormat = ConstrainString(entryEl);
+      }
+    }
   }
 
   //---------------------------------------------------------------------------
@@ -1639,6 +1548,7 @@ namespace ortc
     elem->adoptAsLastChild(mChannelCount.createElement("channelCount"));
     elem->adoptAsLastChild(mDeviceID.createElement("deviceId"));
     elem->adoptAsLastChild(mGroupID.createElement("groupId"));
+    elem->adoptAsLastChild(mEncodingFormat.createElement("encodingFormat"));
 
     if (!elem->hasChildren()) return ElementPtr();
 
@@ -1681,6 +1591,7 @@ namespace ortc
     IHelper::debugAppend(resultEl, "channel count", mChannelCount.toDebug());
     IHelper::debugAppend(resultEl, "device id", mDeviceID.toDebug());
     IHelper::debugAppend(resultEl, "group id", mGroupID.toDebug());
+    IHelper::debugAppend(resultEl, "encoding format", mEncodingFormat.toDebug());
 
     return resultEl;
   }
@@ -1715,6 +1626,8 @@ namespace ortc
     hasher->update(mDeviceID.hash());
     hasher->update(":");
     hasher->update(mGroupID.hash());
+    hasher->update(":");
+    hasher->update(mEncodingFormat.hash());
 
     return hasher->finalizeAsString();
   }
@@ -1929,12 +1842,6 @@ namespace ortc
   #pragma mark IMediaStreamTrack
   #pragma mark
 
-  //---------------------------------------------------------------------------
-  ElementPtr IMediaStreamTrack::toDebug(IMediaStreamTrackPtr object)
-  {
-    return internal::MediaStreamTrack::toDebug(internal::MediaStreamTrack::convert(object));
-  }
-
   //---------------------------------------------------------------------------
   IMediaStreamTrackPtr IMediaStreamTrack::convert(AnyPtr any)
   {
diff --git a/ortc/cpp/ortc_RTPReceiverChannelMediaBase.cpp b/ortc/cpp/ortc_MediaStreamTrackMonitor.cpp
similarity index 58%
rename from ortc/cpp/ortc_RTPReceiverChannelMediaBase.cpp
rename to ortc/cpp/ortc_MediaStreamTrackMonitor.cpp
index 44986233..5f87052a 100644
--- a/ortc/cpp/ortc_RTPReceiverChannelMediaBase.cpp
+++ b/ortc/cpp/ortc_MediaStreamTrackMonitor.cpp
@@ -1,6 +1,7 @@
 /*
 
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
+ Copyright (c) 2017, Hookflash Inc.
+ Copyright (c) 2017, Optical Tone Ltd.
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -29,40 +30,19 @@
  
  */
 
-#include <ortc/internal/ortc_RTPReceiverChannelMediaBase.h>
-#include <ortc/internal/ortc_RTPReceiverChannelAudio.h>
-#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
-#include <ortc/internal/ortc_ORTC.h>
-#include <ortc/internal/platform.h>
-
-//#include <ortc/services/ISettings.h>
-//#include <ortc/services/IHelper.h>
-//#include <ortc/services/IHTTP.h>
-
-//#include <zsLib/Stringize.h>
-//#include <zsLib/Log.h>
-//#include <zsLib/XML.h>
-
-//#include <cryptopp/sha.h>
-
+#ifdef ORTC_USE_ALTERNATIVE_MEDIASTREAMTRACK_MONITOR
+#include <ortc/cpp/ortc_MediaStreamTrackMonitor_Alternative.cpp>
+#else // ORTC_USE_ALTERNATIVE_MEDIASTREAMTRACK_MONITOR
 
-#ifdef _DEBUG
-#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
-#else
-#define ASSERT(x)
-#endif //_DEBUG
+#include <ortc/internal/ortc_MediaStreamTrackMonitor.h>
+#include <ortc/internal/platform.h>
 
+#include <zsLib/Log.h>
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpreceiver) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_stream_track_monitor) }
 
 namespace ortc
 {
-//  ZS_DECLARE_TYPEDEF_PTR(ortc::services::ISettings, UseSettings)
-//  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHelper, UseServicesHelper)
-//  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP)
-//
-//  typedef ortc::services::Hasher<CryptoPP::SHA1> SHA1Hasher;
-
   namespace internal
   {
     //-------------------------------------------------------------------------
@@ -73,59 +53,34 @@ namespace ortc
     #pragma mark (helpers)
     #pragma mark
 
-
+    // foreward declaration
+    
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark IRTPReceiverChannelVideoForRTPReceiverChannel
+    #pragma mark MediaStreamTrackMonitorSettingsDefaults
     #pragma mark
 
     //-------------------------------------------------------------------------
-    ElementPtr IRTPReceiverChannelMediaBaseForRTPReceiverChannel::toDebug(ForRTPReceiverChannelPtr object)
+    void installMediaStreamTrackMonitorSettingsDefaults()
     {
-      if (!object) return ElementPtr();
-
-      {
-        auto pThis = RTPReceiverChannelAudio::convert(object);
-        if (pThis) return pThis->toDebug();
-      }
-
-      {
-        auto pThis = RTPReceiverChannelVideo::convert(object);
-        if (pThis) return pThis->toDebug();
-      }
-
-      return ElementPtr();
     }
-
+    
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark IRTPReceiverChannelVideoForMediaStreamTrack
+    #pragma mark IMediaStreamTrackMonitor
     #pragma mark
 
-    //-------------------------------------------------------------------------
-    ElementPtr IRTPReceiverChannelMediaBaseForMediaStreamTrack::toDebug(ForMediaStreamTrackPtr object)
+    IMediaStreamTrackMonitorPtr IMediaStreamTrackMonitor::create(ortc::IMediaStreamTrackPtr track)
     {
-      if (!object) return ElementPtr();
-
-      {
-        auto pThis = RTPReceiverChannelAudio::convert(object);
-        if (pThis) return pThis->toDebug();
-      }
-
-      {
-        auto pThis = RTPReceiverChannelVideo::convert(object);
-        if (pThis) return pThis->toDebug();
-      }
-
-      return ElementPtr();
+      return IMediaStreamTrackMonitorPtr();
     }
-
-
   } // internal namespace
 }
+
+#endif // ORTC_USE_ALTERNATIVE_MEDIASTREAMTRACK_MONITOR
diff --git a/ortc/cpp/ortc_ORTC.cpp b/ortc/cpp/ortc_ORTC.cpp
index 82f00afa..a4c2b6b6 100644
--- a/ortc/cpp/ortc_ORTC.cpp
+++ b/ortc/cpp/ortc_ORTC.cpp
@@ -32,8 +32,10 @@
 
 #include <ortc/internal/ortc_ORTC.h>
 #include <ortc/internal/ortc.events.h>
+#include <ortc/internal/ortc.events.jman.h>
 #include <ortc/internal/ortc.stats.events.h>
-#include <ortc/internal/ortc_RTPMediaEngine.h>
+#include <ortc/internal/ortc.stats.events.jman.h>
+#include <ortc/internal/ortc_MediaEngine.h>
 
 #include <ortc/services/IHelper.h>
 #include <ortc/services/ILogger.h>
@@ -44,7 +46,7 @@
 #include <zsLib/Socket.h>
 #include <zsLib/XML.h>
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc) }
 
 namespace ortc
 {
@@ -54,8 +56,8 @@ namespace ortc
 
   namespace internal
   {
-    ZS_DECLARE_TYPEDEF_PTR(zsLib::IMessageQueueManager, UseMessageQueueManager);
     ZS_DECLARE_CLASS_PTR(ORTCSettingsDefaults);
+    ZS_DECLARE_TYPEDEF_PTR(zsLib::IMessageQueueManager, UseMessageQueueManager);
 
     void initSubsystems();
     void installORTCSettingsDefaults();
@@ -69,15 +71,18 @@ namespace ortc
     void installMediaDevicesSettingsDefaults();
     void installMediaStreamTrackSettingsDefaults();
     void installRTPListenerSettingsDefaults();
-    void installRTPMediaEngineSettingsDefaults();
+    void installMediaChannelTraceHelperDefaults();
+    void installMediaDeviceCaptureAudioSettingsDefaults();
+    void installMediaDeviceCaptureVideoSettingsDefaults();
+    void installRTPDecoderAudioSettingsDefaults();
+    void installRTPDecoderVideoSettingsDefaults();
+    void installRTPEncoderAudioSettingsDefaults();
+    void installRTPEncoderVideoSettingsDefaults();
+    void installMediaEngineSettingsDefaults();
     void installRTPReceiverSettingsDefaults();
-    void installRTPReceiverChannelAudioSettingsDefaults();
     void installRTPReceiverChannelSettingsDefaults();
-    void installRTPReceiverChannelVideoSettingsDefaults();
     void installRTPSenderSettingsDefaults();
     void installRTPSenderChannelSettingsDefaults();
-    void installRTPSenderChannelAudioSettingsDefaults();
-    void installRTPSenderChannelVideoSettingsDefaults();
     void installStatsReportSettingsDefaults();
     void installSCTPTransportSettingsDefaults();
     void installSCTPTransportListenerSettingsDefaults();
@@ -96,17 +101,20 @@ namespace ortc
       installICETransportSettingsDefaults();
       installIdentitySettingsDefaults();
       installMediaDevicesSettingsDefaults();
+      installMediaChannelTraceHelperDefaults();
       installMediaStreamTrackSettingsDefaults();
       installRTPListenerSettingsDefaults();
-      installRTPMediaEngineSettingsDefaults();
+      installMediaDeviceCaptureAudioSettingsDefaults();
+      installMediaDeviceCaptureVideoSettingsDefaults();
+      installRTPDecoderAudioSettingsDefaults();
+      installRTPDecoderVideoSettingsDefaults();
+      installRTPEncoderAudioSettingsDefaults();
+      installRTPEncoderVideoSettingsDefaults();
+      installMediaEngineSettingsDefaults();
       installRTPReceiverSettingsDefaults();
-      installRTPReceiverChannelAudioSettingsDefaults();
       installRTPReceiverChannelSettingsDefaults();
-      installRTPReceiverChannelVideoSettingsDefaults();
       installRTPSenderSettingsDefaults();
       installRTPSenderChannelSettingsDefaults();
-      installRTPSenderChannelAudioSettingsDefaults();
-      installRTPSenderChannelVideoSettingsDefaults();
       installStatsReportSettingsDefaults();
       installSCTPTransportSettingsDefaults();
       installSCTPTransportListenerSettingsDefaults();
@@ -150,9 +158,18 @@ namespace ortc
       //-----------------------------------------------------------------------
       virtual void notifySettingsApplyDefaults() override
       {
+        ISettings::setString(ORTC_SETTING_ORTC_QUEUE_MAIN_THREAD_NAME, zsLib::toString(zsLib::ThreadPriority_NormalPriority));
+        ISettings::setString(ORTC_SETTING_ORTC_QUEUE_PIPELINE_THREAD_NAME, zsLib::toString(zsLib::ThreadPriority_HighPriority));
+        ISettings::setString(ORTC_SETTING_ORTC_QUEUE_BLOCKING_MEDIA_STARTUP_THREAD_NAME, "normal");
+        ISettings::setString(ORTC_SETTING_ORTC_QUEUE_CERTIFICATE_GENERATION_NAME, "low");
+
+        for (size_t index = 0; index < ORTC_QUEUE_TOTAL_MEDIA_DEVICE_THREADS; ++index) {
+          ISettings::setString((String(ORTC_SETTING_ORTC_QUEUE_MEDIA_DEVICE_THREAD_NAME) + string(index)).c_str(), "higest");
+        }
+        for (size_t index = 0; index < ORTC_QUEUE_TOTAL_RTP_THREADS; ++index) {
+          ISettings::setString((String(ORTC_SETTING_ORTC_QUEUE_RTP_THREAD_NAME) + string(index)).c_str(), "higest");
+        }
         ISettings::setString(ZSLIB_SETTING_SOCKET_MONITOR_THREAD_PRIORITY, zsLib::toString(zsLib::ThreadPriority_HighPriority));
-        ISettings::setString(ORTC_QUEUE_THREAD_MAIN_PRIORITY, zsLib::toString(zsLib::ThreadPriority_NormalPriority));
-        ISettings::setString(ORTC_QUEUE_THREAD_PIPELINE_PRIORITY, zsLib::toString(zsLib::ThreadPriority_HighPriority));
       }
       
     };
@@ -196,15 +213,21 @@ namespace ortc
     }
 
     //-------------------------------------------------------------------------
-    IMessageQueuePtr IORTCForInternal::queuePacket()
+    IMessageQueuePtr IORTCForInternal::queueBlockingMediaStartStopThread()
     {
-      return (ORTC::singleton())->queuePacket();
+      return (ORTC::singleton())->queueBlockingMediaStartStopThread();
     }
 
     //-------------------------------------------------------------------------
-    IMessageQueuePtr IORTCForInternal::queueBlockingMediaStartStopThread()
+    IMessageQueuePtr IORTCForInternal::queueMediaDevices()
     {
-      return (ORTC::singleton())->queueBlockingMediaStartStopThread();
+      return (ORTC::singleton())->queueMediaDevices();
+    }
+
+    //-------------------------------------------------------------------------
+    IMessageQueuePtr IORTCForInternal::queueRTP()
+    {
+      return (ORTC::singleton())->queueRTP();
     }
 
     //-------------------------------------------------------------------------
@@ -323,19 +346,17 @@ namespace ortc
       }
 
       UseServicesHelper::setup();
-      installAllDefaults();
-      ISettings::applyDefaults();
+      internalSetup();
     }
 
-#ifdef WINRT
+#ifdef WINUWP
     //-------------------------------------------------------------------------
     void ORTC::setup(Windows::UI::Core::CoreDispatcher ^dispatcher)
     {
       UseServicesHelper::setup(dispatcher);
-      installAllDefaults();
-      ISettings::applyDefaults();
+      internalSetup();
     }
-#endif //WINRT
+#endif //WINUWP
 
     //-------------------------------------------------------------------------
     Milliseconds ORTC::ntpServerTime() const
@@ -351,8 +372,7 @@ namespace ortc
         AutoRecursiveLock(*this);
         mNTPServerTime = value;
       }
-      auto totalMilliseconds = value.count();
-      IRTPMediaEngineForORTC::ntpServerTime(value);
+      IMediaEngineForORTC::ntpServerTime(value);
     }
 
     //-------------------------------------------------------------------------
@@ -372,37 +392,40 @@ namespace ortc
     //-------------------------------------------------------------------------
     void ORTC::startMediaTracing()
     {
-      IRTPMediaEngineForORTC::startMediaTracing();
+      IMediaEngineForORTC::startMediaTracing();
     }
 
     //-------------------------------------------------------------------------
     void ORTC::stopMediaTracing()
     {
-      IRTPMediaEngineForORTC::stopMediaTracing();
+      IMediaEngineForORTC::stopMediaTracing();
     }
 
     //-------------------------------------------------------------------------
     bool ORTC::isMediaTracing()
     {
-      return IRTPMediaEngineForORTC::isMediaTracing();
+      return IMediaEngineForORTC::isMediaTracing();
     }
 
     //-------------------------------------------------------------------------
     bool ORTC::saveMediaTrace(String filename)
     {
-      return IRTPMediaEngineForORTC::saveMediaTrace(filename);
+      return IMediaEngineForORTC::saveMediaTrace(filename);
     }
 
     //-------------------------------------------------------------------------
     bool ORTC::saveMediaTrace(String host, int port)
     {
-      return IRTPMediaEngineForORTC::saveMediaTrace(host, port);
+      return IMediaEngineForORTC::saveMediaTrace(host, port);
     }
 
     //-------------------------------------------------------------------------
     bool ORTC::isMRPInstalled()
     {
-      return IRTPMediaEngineForORTC::isMRPInstalled();
+#define TODO_NEED_THIS_MRP_INSTALLED_API_IMPLEMENTED 1
+#define TODO_NEED_THIS_MRP_INSTALLED_API_IMPLEMENTED 2
+//      return IRTPMediaEngineForORTC::isMRPInstalled();
+      return true;
     }
 
     //-------------------------------------------------------------------------
@@ -437,7 +460,7 @@ namespace ortc
       class Once {
       public:
         Once() {
-          zsLib::IMessageQueueManager::registerMessageQueueThreadPriority(ORTC_QUEUE_MAIN_THREAD_NAME, zsLib::threadPriorityFromString(ISettings::getString(ORTC_QUEUE_THREAD_MAIN_PRIORITY)));
+          zsLib::IMessageQueueManager::registerMessageQueueThreadPriority(ORTC_QUEUE_MAIN_THREAD_NAME, zsLib::threadPriorityFromString(ISettings::getString(ORTC_SETTING_ORTC_QUEUE_MAIN_THREAD_NAME)));
         }
       };
       static Once once;
@@ -451,7 +474,7 @@ namespace ortc
       class Once {
       public:
         Once() {
-          zsLib::IMessageQueueManager::registerMessageQueueThreadPriority(ORTC_QUEUE_PIPELINE_THREAD_NAME, zsLib::threadPriorityFromString(ISettings::getString(ORTC_QUEUE_THREAD_PIPELINE_PRIORITY)));
+          zsLib::IMessageQueueManager::registerMessageQueueThreadPriority(ORTC_QUEUE_PIPELINE_THREAD_NAME, zsLib::threadPriorityFromString(ISettings::getString(ORTC_SETTING_ORTC_QUEUE_PIPELINE_THREAD_NAME)));
         }
       };
       static Once once;
@@ -459,28 +482,43 @@ namespace ortc
     }
 
     //-------------------------------------------------------------------------
-    IMessageQueuePtr ORTC::queuePacket() const
+    IMessageQueuePtr ORTC::queueBlockingMediaStartStopThread() const
+    {
+      AutoRecursiveLock lock(*this);
+      if (!mBlockingMediaStartStopThread) {
+        mBlockingMediaStartStopThread = UseMessageQueueManager::getMessageQueue(ORTC_QUEUE_BLOCKING_MEDIA_STARTUP_THREAD_NAME);
+      }
+      return mBlockingMediaStartStopThread;
+    }
+
+    //-------------------------------------------------------------------------
+    IMessageQueuePtr ORTC::queueMediaDevices() const
     {
       AutoRecursiveLock lock(*this);
 
-      size_t index = mNextPacketQueueThread % ORTC_QUEUE_TOTAL_PACKET_THREADS;
+      size_t index = mNextMediaQueueThread % ORTC_QUEUE_TOTAL_MEDIA_DEVICE_THREADS;
 
-      if (!mPacketQueues[index]) {
-        mPacketQueues[index] = UseMessageQueueManager::getMessageQueue((String(ORTC_QUEUE_PACKET_THREAD_NAME) + string(index)).c_str());
+      if (!mMediaDeviceQueues[index]) {
+        mMediaDeviceQueues[index] = UseMessageQueueManager::getMessageQueue((String(ORTC_QUEUE_MEDIA_DEVICE_THREAD_NAME) + string(index)).c_str());
       }
 
-      ++mNextPacketQueueThread;
-      return mPacketQueues[index];
+      ++mNextMediaQueueThread;
+      return mMediaDeviceQueues[index];
     }
 
     //-------------------------------------------------------------------------
-    IMessageQueuePtr ORTC::queueBlockingMediaStartStopThread() const
+    IMessageQueuePtr ORTC::queueRTP() const
     {
       AutoRecursiveLock lock(*this);
-      if (!mBlockingMediaStartStopThread) {
-        mBlockingMediaStartStopThread = UseMessageQueueManager::getMessageQueue(ORTC_QUEUE_BLOCKING_MEDIA_STARTUP_THREAD_NAME);
+
+      size_t index = mNextRTPQueueThread % ORTC_QUEUE_TOTAL_RTP_THREADS;
+
+      if (!mRTPQueues[index]) {
+        mRTPQueues[index] = UseMessageQueueManager::getMessageQueue((String(ORTC_QUEUE_RTP_THREAD_NAME) + string(index)).c_str());
       }
-      return mBlockingMediaStartStopThread;
+
+      ++mNextRTPQueueThread;
+      return mRTPQueues[index];
     }
 
     //-------------------------------------------------------------------------
@@ -524,6 +562,29 @@ namespace ortc
       return Log::Params(message, objectEl);
     }
 
+    //-------------------------------------------------------------------------
+    void ORTC::internalSetup()
+    {
+      installAllDefaults();
+      ISettings::applyDefaults();
+
+      UseMessageQueueManager::registerMessageQueueThreadPriority(ORTC_QUEUE_BLOCKING_MEDIA_STARTUP_THREAD_NAME, zsLib::threadPriorityFromString(ISettings::getString(ORTC_SETTING_ORTC_QUEUE_BLOCKING_MEDIA_STARTUP_THREAD_NAME)));
+      UseMessageQueueManager::registerMessageQueueThreadPriority(ORTC_QUEUE_CERTIFICATE_GENERATION_NAME, zsLib::threadPriorityFromString(ISettings::getString(ORTC_SETTING_ORTC_QUEUE_CERTIFICATE_GENERATION_NAME)));
+
+      for (size_t index = 0; index < ORTC_QUEUE_TOTAL_MEDIA_DEVICE_THREADS; ++index) {
+        UseMessageQueueManager::registerMessageQueueThreadPriority(
+          (String(ORTC_QUEUE_MEDIA_DEVICE_THREAD_NAME) + string(index)).c_str(),
+          zsLib::threadPriorityFromString(ISettings::getString((String(ORTC_SETTING_ORTC_QUEUE_MEDIA_DEVICE_THREAD_NAME) + string(index)).c_str()))
+        );
+      }
+      for (size_t index = 0; index < ORTC_QUEUE_TOTAL_RTP_THREADS; ++index) {
+        UseMessageQueueManager::registerMessageQueueThreadPriority(
+          (String(ORTC_QUEUE_RTP_THREAD_NAME) + string(index)).c_str(),
+          zsLib::threadPriorityFromString(ISettings::getString((String(ORTC_SETTING_ORTC_QUEUE_RTP_THREAD_NAME) + string(index)).c_str()))
+        );
+      }
+    }
+
   } // namespace internal
 
   //---------------------------------------------------------------------------
@@ -543,14 +604,14 @@ namespace ortc
   }
 
   //---------------------------------------------------------------------------
-#ifdef WINRT
+#ifdef WINUWP
   void IORTC::setup(Windows::UI::Core::CoreDispatcher ^dispatcher)
   {
     auto singleton = internal::ORTC::singleton();
     if (!singleton) return;
     singleton->setup(dispatcher);
   }
-#endif //WINRT
+#endif //WINUWP
 
   //-------------------------------------------------------------------------
   Milliseconds IORTC::ntpServerTime()
diff --git a/ortc/cpp/ortc_RTCPPacket.cpp b/ortc/cpp/ortc_RTCPPacket.cpp
index 01936d2a..fcbfc8a6 100644
--- a/ortc/cpp/ortc_RTCPPacket.cpp
+++ b/ortc/cpp/ortc_RTCPPacket.cpp
@@ -29,7 +29,9 @@
  
  */
 
-#include <ortc/internal/ortc_RTCPPacket.h>
+#include <ortc/RTCPPacket.h>
+#include <ortc/internal/ortc.events.h>
+
 #include <ortc/internal/ortc_Helper.h>
 #include <ortc/internal/ortc_RTPUtils.h>
 #include <ortc/internal/platform.h>
@@ -48,23 +50,26 @@
 #define ASSERT(x)
 #endif //_DEBUG
 
-
 #define RTCP_IS_FLAG_SET(xByte, xBitPos) (0 != ((xByte) & (1 << xBitPos)))
 #define RTCP_GET_BITS(xByte, xBitPattern, xLowestBit) (((xByte) >> (xLowestBit)) & (xBitPattern))
 #define RTCP_PACK_BITS(xByte, xBitPattern, xLowestBit) (((xByte) & (xBitPattern)) << (xLowestBit))
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtp_rtcp_packet) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_rtp_rtcp_packet) }
 
 namespace ortc
 {
-  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHelper, UseServicesHelper)
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHelper, UseServicesHelper);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::internal::Helper, UseHelper);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::internal::RTPUtils, UseRTPUtils);
+
+  using zsLib::PTRNUMBER;
+
 //  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP)
 //
 //  typedef ortc::services::Hasher<CryptoPP::SHA1> SHA1Hasher;
 
   namespace internal
   {
-    ZS_DECLARE_TYPEDEF_PTR(ortc::internal::Helper, UseHelper)
 
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -157,5841 +162,6077 @@ namespace ortc
       return true;
     }
 
-
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark RTCPPacket::SenderReport
+    #pragma mark RTCPPacket (writing sizing routines)
     #pragma mark
 
     //-------------------------------------------------------------------------
-    const char *RTCPPacket::Report::ptToString(BYTE pt)
+    static size_t getPacketSizeSenderReport(const RTCPPacket::SenderReport *report)
     {
-      switch (pt) {
-        case SenderReport::kPayloadType:                    return "SenderReport";
-        case ReceiverReport::kPayloadType:                  return "ReceiverReport";
-        case SDES::kPayloadType:                            return "SDES";
-        case Bye::kPayloadType:                             return "Bye";
-        case App::kPayloadType:                             return "App";
-        case TransportLayerFeedbackMessage::kPayloadType:   return "TransportLayerFeedbackMessage";
-        case PayloadSpecificFeedbackMessage::kPayloadType:  return "PayloadSpecificFeedbackMessage";
-        case XR::kPayloadType:                              return "XR";
-        default:  {
-        }
-      }
-      return "Uknown";
+      auto rc = report->rc();
+      throwIfGreaterThanBitsAllow(rc, 5);
+      return (sizeof(DWORD)*2) + (sizeof(DWORD)*5) + ((sizeof(DWORD)*6)*rc) + boundarySize(report->extensionSize());
     }
 
     //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::SenderReport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    Time RTCPPacket::SenderReport::ntpTimestamp() const
+    static size_t getPacketSizeReceiverReport(const RTCPPacket::ReceiverReport *report)
     {
-      return RTPUtils::ntpToTime(mNTPTimestampMS, mNTPTimestampLS);
+      auto rc = report->rc();
+      throwIfGreaterThanBitsAllow(rc, 5);
+      return (sizeof(DWORD)*2) + ((sizeof(DWORD)*6)*rc) + boundarySize(report->extensionSize());
     }
 
     //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::SDES::Chunk::StringItem
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    const char *RTCPPacket::SDES::Chunk::StringItem::typeToString(BYTE type)
+    static size_t getPacketSizeSDES(const RTCPPacket::SDES *report)
     {
-      switch (type) {
-        case CName::kItemType:  return "CName";
-        case Name::kItemType:   return "Name";
-        case Email::kItemType:  return "Email";
-        case Phone::kItemType:  return "Phone";
-        case Loc::kItemType:    return "Loc";
-        case Tool::kItemType:   return "Tool";
-        case Note::kItemType:   return "Note";
-        case Priv::kItemType:   return "Priv";
-        case Mid::kItemType:    return "Mid";
-        case Rid::kItemType:    return "Rid";
-        default: {
-          break;
-        }
-      }
-      return "Unknown";
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::SDES::Chunk
-    #pragma mark
+      typedef RTCPPacket::SDES::Chunk Chunk;
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::CName *RTCPPacket::SDES::Chunk::cNameAtIndex(size_t index) const
-    {
-      ASSERT(index < mCNameCount)
-      return &(mFirstCName[index]);
-    }
+      size_t result = (sizeof(DWORD));
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::Name *RTCPPacket::SDES::Chunk::nameAtIndex(size_t index) const
-    {
-      ASSERT(index < mNameCount)
-      return &(mFirstName[index]);
-    }
+      size_t chunkCount = 0;
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::Email *RTCPPacket::SDES::Chunk::emailAtIndex(size_t index) const
-    {
-      ASSERT(index < mEmailCount)
-      return &(mFirstEmail[index]);
-    }
+      for (Chunk *chunk = report->firstChunk(); NULL != chunk; chunk = chunk->next(), ++chunkCount)
+      {
+        size_t chunkSize = sizeof(DWORD);
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::Phone *RTCPPacket::SDES::Chunk::phoneAtIndex(size_t index) const
-    {
-      ASSERT(index < mPhoneCount)
-      return &(mFirstPhone[index]);
-    }
+        for (auto *item = chunk->firstCName(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          throwIfGreaterThanBitsAllow(len, 8);
+          chunkSize += ((sizeof(BYTE))*len);
+          ZS_LOG_INSANE(packet_slog("get packet SDES CName size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::Loc *RTCPPacket::SDES::Chunk::locAtIndex(size_t index) const
-    {
-      ASSERT(index < mLocCount)
-      return &(mFirstLoc[index]);
-    }
+        for (auto *item = chunk->firstName(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          throwIfGreaterThanBitsAllow(len, 8);
+          chunkSize += ((sizeof(BYTE))*len);
+          ZS_LOG_INSANE(packet_slog("get packet SDES Name size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::Tool *RTCPPacket::SDES::Chunk::toolAtIndex(size_t index) const
-    {
-      ASSERT(index < mToolCount)
-      return &(mFirstTool[index]);
-    }
+        for (auto *item = chunk->firstEmail(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          throwIfGreaterThanBitsAllow(len, 8);
+          chunkSize += ((sizeof(BYTE))*len);
+          ZS_LOG_INSANE(packet_slog("get packet SDES Email size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::Note *RTCPPacket::SDES::Chunk::noteAtIndex(size_t index) const
-    {
-      ASSERT(index < mNoteCount)
-      return &(mFirstNote[index]);
-    }
+        for (auto *item = chunk->firstPhone(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          throwIfGreaterThanBitsAllow(len, 8);
+          chunkSize += ((sizeof(BYTE))*len);
+          ZS_LOG_INSANE(packet_slog("get packet SDES Phone size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::Priv *RTCPPacket::SDES::Chunk::privAtIndex(size_t index) const
-    {
-      ASSERT(index < mPrivCount)
-      return &(mFirstPriv[index]);
-    }
+        for (auto *item = chunk->firstLoc(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          throwIfGreaterThanBitsAllow(len, 8);
+          chunkSize += ((sizeof(BYTE))*len);
+          ZS_LOG_INSANE(packet_slog("get packet SDES Loc size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::Mid *RTCPPacket::SDES::Chunk::midAtIndex(size_t index) const
-    {
-      ASSERT(index < mMidCount)
-      return &(mFirstMid[index]);
-    }
+        for (auto *item = chunk->firstTool(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          throwIfGreaterThanBitsAllow(len, 8);
+          chunkSize += ((sizeof(BYTE))*len);
+          ZS_LOG_INSANE(packet_slog("get packet SDES Tool size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::Rid *RTCPPacket::SDES::Chunk::ridAtIndex(size_t index) const
-    {
-      ASSERT(index < mRidCount)
-      return &(mFirstRid[index]);
-    }
+        for (auto *item = chunk->firstNote(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          throwIfGreaterThanBitsAllow(len, 8);
+          chunkSize += ((sizeof(BYTE))*len);
+          ZS_LOG_INSANE(packet_slog("get packet SDES Note size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES::Chunk::Unknown *RTCPPacket::SDES::Chunk::unknownAtIndex(size_t index) const
-    {
-      ASSERT(index < mUnknownCount)
-      return &(mFirstUnknown[index]);
-    }
+        for (auto *item = chunk->firstPriv(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len1 = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          size_t len2 = (NULL != item->mPrefix ? strlen(item->mPrefix) : 0);
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::Bye
-    #pragma mark
+          size_t totalLen = len1 + len2;
+          if (0 != totalLen) ++totalLen;
 
-    //-------------------------------------------------------------------------
-    DWORD RTCPPacket::Bye::ssrc(size_t index) const
-    {
-      ASSERT(index < sc())
-      return mSSRCs[index];
-    }
+          throwIfGreaterThanBitsAllow(totalLen, 8);
+          chunkSize += ((sizeof(BYTE))*totalLen);
+          ZS_LOG_INSANE(packet_slog("get packet SDES Priv size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("prefix len", len2) + ZS_PARAM("prefix", (NULL != item->mPrefix ? item->mPrefix : NULL)) + ZS_PARAM("len", len1) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::FeedbackMessage
-    #pragma mark
+        for (auto *item = chunk->firstMid(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          throwIfGreaterThanBitsAllow(len, 8);
+          chunkSize += ((sizeof(BYTE))*len);
+          ZS_LOG_INSANE(packet_slog("get packet SDES Mid size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-    //-------------------------------------------------------------------------
-    const char *RTCPPacket::FeedbackMessage::fmtToString(BYTE pt, BYTE fmt, DWORD subFmt)
-    {
-      switch (pt) {
-        case TransportLayerFeedbackMessage::kPayloadType:     {
-          switch (fmt) {
-            case TransportLayerFeedbackMessage::GenericNACK::kFmt:  return "GenericNACK";
-            case TransportLayerFeedbackMessage::TMMBR::kFmt:        return "TMMBR";
-            case TransportLayerFeedbackMessage::TMMBN::kFmt:        return "TMMBN";
-            default:                                                break;
-          }
-          break;
+        for (auto *item = chunk->firstRid(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          throwIfGreaterThanBitsAllow(len, 8);
+          chunkSize += ((sizeof(BYTE))*len);
+          ZS_LOG_INSANE(packet_slog("get packet SDES Rid size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
         }
-        case PayloadSpecificFeedbackMessage::kPayloadType:    {
-          switch (fmt) {
-            case PayloadSpecificFeedbackMessage::PLI::kFmt:         return "PLI";
-            case PayloadSpecificFeedbackMessage::SLI::kFmt:         return "SLI";
-            case PayloadSpecificFeedbackMessage::RPSI::kFmt:        return "RPSI";
-            case PayloadSpecificFeedbackMessage::FIR::kFmt:         return "FIR";
-            case PayloadSpecificFeedbackMessage::TSTR::kFmt:        return "TSTR";
-            case PayloadSpecificFeedbackMessage::TSTN::kFmt:        return "TSTN";
-            case PayloadSpecificFeedbackMessage::VBCM::kFmt:        return "VBCM";
-            case PayloadSpecificFeedbackMessage::AFB::kFmt:         {
-              const char *tmp = "REMB";
-              if (subFmt == *(reinterpret_cast<const DWORD *>(tmp))) return "REMB";
-              return "AFB";
-            }
-            default:                                                break;
-          }
-          break;
+        for (auto *item = chunk->firstUnknown(); NULL != item; item = item->next())
+        {
+          chunkSize += (sizeof(BYTE)*2);
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          throwIfGreaterThanBitsAllow(len, 8);
+          chunkSize += ((sizeof(BYTE))*len);
+          ZS_LOG_INSANE(packet_slog("get packet SDES Unknown size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
         }
-        default:                                              {
-          break;
+
+        size_t modulas = chunkSize % sizeof(DWORD);
+
+        if ((chunkSize == sizeof(DWORD)) ||
+            (0 == modulas)) {
+          chunkSize += sizeof(DWORD);
         }
+
+        result += boundarySize(chunkSize);
       }
-      return "Unknown";
+
+      throwIfGreaterThanBitsAllow(chunkCount, 5);
+      return result;
     }
 
     //-------------------------------------------------------------------------
-    const char *RTCPPacket::FeedbackMessage::fmtToString() const
+    static size_t getPacketSizeBye(const RTCPPacket::Bye *report)
     {
-      if (PayloadSpecificFeedbackMessage::kPayloadType == mPT) {
-        if (PayloadSpecificFeedbackMessage::AFB::kFmt == mReportSpecific) {
-          auto result = reinterpret_cast<const PayloadSpecificFeedbackMessage *>(this);
-          const char tmp1[sizeof(DWORD)] {};
-          const char *tmp2 = "REMB";
-          const char *usingTmp = (result->mHasREMB ? tmp2 : (&(tmp1[0])));
+      auto sc = report->sc();
+      throwIfGreaterThanBitsAllow(sc, 5);
 
-          return fmtToString(mPT, mReportSpecific, *(reinterpret_cast<const DWORD *>(usingTmp)));
+      size_t result = (sizeof(DWORD)) + (sizeof(DWORD)*sc);
+
+      if (NULL != report->reasonForLeaving()) {
+        size_t len = strlen(report->reasonForLeaving());
+        if (len > 0) {
+          throwIfGreaterThanBitsAllow(len, 8);
+          result += sizeof(BYTE)+(sizeof(BYTE)*len);
         }
       }
-      return fmtToString(mPT, mReportSpecific);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::TransportLayerFeedbackMessage
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::TransportLayerFeedbackMessage::GenericNACK *RTCPPacket::TransportLayerFeedbackMessage::genericNACKAtIndex(size_t index) const
-    {
-      ASSERT(index < mGenericNACKCount)
-      return &(mFirstGenericNACK[index]);
-    }
 
-    //-------------------------------------------------------------------------
-    RTCPPacket::TransportLayerFeedbackMessage::TMMBR *RTCPPacket::TransportLayerFeedbackMessage::tmmbrAtIndex(size_t index) const
-    {
-      ASSERT(index < mTMMBRCount)
-      return &(mFirstTMMBR[index]);
+      return boundarySize(result);
     }
 
     //-------------------------------------------------------------------------
-    RTCPPacket::TransportLayerFeedbackMessage::TMMBN *RTCPPacket::TransportLayerFeedbackMessage::tmmbnAtIndex(size_t index) const
+    static size_t getPacketSizeApp(const RTCPPacket::App *report)
     {
-      ASSERT(index < mTMMBNCount)
-      return &(mFirstTMMBN[index]);
-    }
+      size_t result = (sizeof(DWORD)*3);
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::VBCM
-    #pragma mark
+      auto dataSize = report->dataSize();
+      if (0 != dataSize) {
+        ORTC_THROW_INVALID_PARAMETERS_IF(NULL == report->mData)
+        result += dataSize;
+      }
 
-    //-------------------------------------------------------------------------
-    BYTE RTCPPacket::PayloadSpecificFeedbackMessage::VBCM::zeroBit() const
-    {
-      return RTCP_GET_BITS(mControlSpecific, 0x1, 23);
+      return boundarySize(result);
     }
-
+    
     //-------------------------------------------------------------------------
-    BYTE RTCPPacket::PayloadSpecificFeedbackMessage::VBCM::payloadType() const
+    static size_t getPacketSizeTransportLayerFeedbackMessage(const RTCPPacket::TransportLayerFeedbackMessage *fm)
     {
-      return RTCP_GET_BITS(mControlSpecific, 0x7F, 16);
-    }
+      //typedef RTCPPacket::TransportLayerFeedbackMessage TransportLayerFeedbackMessage;
+      typedef RTCPPacket::TransportLayerFeedbackMessage::GenericNACK GenericNACK;
+      typedef RTCPPacket::TransportLayerFeedbackMessage::TMMBR TMMBR;
+      typedef RTCPPacket::TransportLayerFeedbackMessage::TMMBN TMMBN;
 
-    //-------------------------------------------------------------------------
-    size_t RTCPPacket::PayloadSpecificFeedbackMessage::VBCM::vbcmOctetStringSize() const
-    {
-      return RTCP_GET_BITS(mControlSpecific, 0xFFFF, 0);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::REMB
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    DWORD RTCPPacket::PayloadSpecificFeedbackMessage::REMB::ssrcAtIndex(size_t index) const
-    {
-      ASSERT(index < numSSRC())
-      return mSSRCs[index];
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::PayloadSpecificFeedbackMessage::PLI *RTCPPacket::PayloadSpecificFeedbackMessage::pli() const
-    {
-      if (PLI::kFmt != fmt()) return NULL;
-      return const_cast<PLI *>(&mPLI);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::PayloadSpecificFeedbackMessage::SLI *RTCPPacket::PayloadSpecificFeedbackMessage::sliAtIndex(size_t index) const
-    {
-      ASSERT(index < mSLICount)
-      return &(mFirstSLI[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::PayloadSpecificFeedbackMessage::FIR *RTCPPacket::PayloadSpecificFeedbackMessage::firAtIndex(size_t index) const
-    {
-      ASSERT(index < mFIRCount)
-      return &(mFirstFIR[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::PayloadSpecificFeedbackMessage::TSTR *RTCPPacket::PayloadSpecificFeedbackMessage::tstrAtIndex(size_t index) const
-    {
-      ASSERT(index < mTSTRCount)
-      return &(mFirstTSTR[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::PayloadSpecificFeedbackMessage::TSTN *RTCPPacket::PayloadSpecificFeedbackMessage::tstnAtIndex(size_t index) const
-    {
-      ASSERT(index < mTSTNCount)
-      return &(mFirstTSTN[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::PayloadSpecificFeedbackMessage::VBCM *RTCPPacket::PayloadSpecificFeedbackMessage::vbcmAtIndex(size_t index) const
-    {
-      ASSERT(index < mVBCMCount)
-      return &(mFirstVBCM[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::PayloadSpecificFeedbackMessage::RPSI *RTCPPacket::PayloadSpecificFeedbackMessage::rpsi() const
-    {
-      if (RPSI::kFmt != fmt()) return NULL;
-      return const_cast<RPSI *>(&mRPSI);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::PayloadSpecificFeedbackMessage::AFB *RTCPPacket::PayloadSpecificFeedbackMessage::afb() const
-    {
-      if (AFB::kFmt != fmt()) return NULL;
-      if (mHasREMB) return NULL;
-      return const_cast<AFB *>(&mAFB);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::PayloadSpecificFeedbackMessage::REMB *RTCPPacket::PayloadSpecificFeedbackMessage::remb() const
-    {
-      if (REMB::kFmt != fmt()) return NULL;
-      if (!mHasREMB) return NULL;
-      return const_cast<REMB *>(&mREMB);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR::ReportBlock
-    #pragma mark
+      size_t result = (sizeof(DWORD)*3);
 
-    //-------------------------------------------------------------------------
-    const char *RTCPPacket::XR::ReportBlock::blockTypeToString(BYTE blockType)
-    {
-      switch (blockType) {
-        case LossRLEReportBlock::kBlockType:                return "LossRLEReportBlock";
-        case DuplicateRLEReportBlock::kBlockType:           return "DuplicateRLEReportBlock";
-        case PacketReceiptTimesReportBlock::kBlockType:     return "PacketReceiptTimesReportBlock";
-        case ReceiverReferenceTimeReportBlock::kBlockType:  return "ReceiverReferenceTimeReportBlock";
-        case DLRRReportBlock::kBlockType:                   return "DLRRReportBlock";
-        case StatisticsSummaryReportBlock::kBlockType:      return "StatisticsSummaryReportBlock";
-        case VoIPMetricsReportBlock::kBlockType:            return "VoIPMetricsReportBlock";
-        default: {
+      switch (fm->fmt()) {
+        case GenericNACK::kFmt:
+        {
+          auto count = fm->genericNACKCount();
+          throwIfLessThan(count, 1);
+          result += ((sizeof(DWORD))*(count));
           break;
         }
-      }
-
-      return "UnknownReportBlock";
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR::ReportBlockRange
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    BYTE RTCPPacket::XR::ReportBlockRange::reserved() const
-    {
-      return RTCP_GET_BITS(mTypeSpecific, 0xF, 4);
-    }
-
-    //-------------------------------------------------------------------------
-    BYTE RTCPPacket::XR::ReportBlockRange::thinning() const
-    {
-      return RTCP_GET_BITS(mTypeSpecific, 0xF, 0);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR::RLEReportBlock
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::RLEChunk RTCPPacket::XR::RLEReportBlock::chunkAtIndex(size_t index) const
-    {
-      ASSERT(index < chunkCount())
-      return mChunks[index];
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR::PacketReceiptTimesReportBlock
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    DWORD RTCPPacket::XR::PacketReceiptTimesReportBlock::receiptTimeAtIndex(size_t index) const
-    {
-      ASSERT(index < receiptTimeCount())
-      return mReceiptTimes[index];
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR::ReceiverReferenceTimeReportBlock
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    Time RTCPPacket::XR::ReceiverReferenceTimeReportBlock::ntpTimestamp() const
-    {
-      return RTPUtils::ntpToTime(mNTPTimestampMS, mNTPTimestampLS);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR::DLRRReportBlock
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::DLRRReportBlock::SubBlock *RTCPPacket::XR::DLRRReportBlock::subBlockAtIndex(size_t index) const
-    {
-      ASSERT(index < subBlockCount())
-      return &(mSubBlocks[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR::StatisticsSummaryReportBlock
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::XR::StatisticsSummaryReportBlock::lossReportFlag() const
-    {
-      return RTCP_IS_FLAG_SET(mTypeSpecific, 7);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::XR::StatisticsSummaryReportBlock::duplicateReportFlag() const
-    {
-      return RTCP_IS_FLAG_SET(mTypeSpecific, 6);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::XR::StatisticsSummaryReportBlock::jitterFlag() const
-    {
-      return RTCP_IS_FLAG_SET(mTypeSpecific, 5);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::XR::StatisticsSummaryReportBlock::ttlFlag() const
-    {
-      return (1 == RTCP_GET_BITS(mTypeSpecific, 0x3, 3));
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::XR::StatisticsSummaryReportBlock::hopLimitFlag() const
-    {
-      return (2 == RTCP_GET_BITS(mTypeSpecific, 0x3, 3));
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR::VoIPMetricsReportBlock
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    BYTE RTCPPacket::XR::VoIPMetricsReportBlock::plc() const
-    {
-      return RTCP_GET_BITS(mRXConfig, 0x3, 6);
-    }
-
-    //-------------------------------------------------------------------------
-    BYTE RTCPPacket::XR::VoIPMetricsReportBlock::jba() const
-    {
-      return RTCP_GET_BITS(mRXConfig, 0x3, 4);
-    }
-
-    //-------------------------------------------------------------------------
-    BYTE RTCPPacket::XR::VoIPMetricsReportBlock::jbRate() const
-    {
-      return RTCP_GET_BITS(mRXConfig, 0xF, 0);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR::RunLength
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::RunLength::RunLength(RLEChunk chunk) :
-      mRunType(RTCP_GET_BITS(chunk, 0x1, 14)),
-      mRunLength(RTCP_GET_BITS(chunk, 0x3FFF, 0))
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR::BitVector
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::BitVector::BitVector(RLEChunk chunk) :
-      mBitVector(RTCP_GET_BITS(chunk, 0x7FFF, 0))
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    BYTE RTCPPacket::XR::BitVector::bitAtIndex(size_t index) const
-    {
-      ASSERT(index < (sizeof(WORD)*8))
-      return (mBitVector >> ((sizeof(WORD)*8)-index-1)) & 0x1;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket::XR
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::LossRLEReportBlock *RTCPPacket::XR::lossRLEReportBlockAtIndex(size_t index) const
-    {
-      ASSERT(index < mLossRLEReportBlockCount)
-      return &(mFirstLossRLEReportBlock[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::DuplicateRLEReportBlock *RTCPPacket::XR::duplicateRLEReportBlockAtIndex(size_t index) const
-    {
-      ASSERT(index < mDuplicateRLEReportBlockCount)
-      return &(mFirstDuplicateRLEReportBlock[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::PacketReceiptTimesReportBlock *RTCPPacket::XR::packetReceiptTimesReportBlockAtIndex(size_t index) const
-    {
-      ASSERT(index < mPacketReceiptTimesReportBlockCount)
-      return &(mFirstPacketReceiptTimesReportBlock[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::ReceiverReferenceTimeReportBlock *RTCPPacket::XR::receiverReferenceTimeReportBlockAtIndex(size_t index) const
-    {
-      ASSERT(index < mReceiverReferenceTimeReportBlockCount)
-      return &(mFirstReceiverReferenceTimeReportBlock[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::DLRRReportBlock *RTCPPacket::XR::dlrrReportBlockAtIndex(size_t index) const
-    {
-      ASSERT(index < mDLRRReportBlockCount)
-      return &(mFirstDLRRReportBlock[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::StatisticsSummaryReportBlock *RTCPPacket::XR::statisticsSummaryReportBlockAtIndex(size_t index) const
-    {
-      ASSERT(index < mStatisticsSummaryReportBlockCount)
-      return &(mFirstStatisticsSummaryReportBlock[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::VoIPMetricsReportBlock *RTCPPacket::XR::voIPMetricsReportBlockAtIndex(size_t index) const
-    {
-      ASSERT(index < mVoIPMetricsReportBlockCount)
-      return &(mFirstVoIPMetricsReportBlock[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR::UnknownReportBlock *RTCPPacket::XR::unknownReportBlockAtIndex(size_t index) const
-    {
-      ASSERT(index < mUnknownReportBlockCount)
-      return &(mFirstUnknownReportBlock[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::XR::isRunLengthChunk(RLEChunk chunk)
-    {
-      return !RTCP_IS_FLAG_SET(chunk, 15);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::XR::isBitVectorChunk(RLEChunk chunk)
-    {
-      return RTCP_IS_FLAG_SET(chunk, 15);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket (public)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::RTCPPacket(const make_private &)
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::~RTCPPacket()
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacketPtr RTCPPacket::create(const BYTE *buffer, size_t bufferLengthInBytes)
-    {
-      ORTC_THROW_INVALID_PARAMETERS_IF(!buffer)
-      ORTC_THROW_INVALID_PARAMETERS_IF(0 == bufferLengthInBytes)
-      return RTCPPacket::create(UseServicesHelper::convertToBuffer(buffer, bufferLengthInBytes));
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacketPtr RTCPPacket::create(const SecureByteBlock &buffer)
-    {
-      return RTCPPacket::create(buffer.BytePtr(), buffer.SizeInBytes());
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacketPtr RTCPPacket::create(SecureByteBlockPtr buffer)
-    {
-      RTCPPacketPtr pThis(make_shared<RTCPPacket>(make_private{}));
-      pThis->mBuffer = buffer;
-      if (!pThis->parse()) {
-        ZS_LOG_WARNING(Debug, pThis->log("packet could not be parsed"))
-        return RTCPPacketPtr();
-      }
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacketPtr RTCPPacket::create(const Report *first)
-    {
-      size_t allocationSize = getPacketSize(first);
-      SecureByteBlockPtr temp(make_shared<SecureByteBlock>(allocationSize));
-
-      BYTE *buffer = temp->BytePtr();
-      BYTE *pos = buffer;
-      writePacket(first, pos, allocationSize);
-
-      return create(temp);
-    }
-
-    //-------------------------------------------------------------------------
-    SecureByteBlockPtr RTCPPacket::generateFrom(const Report *first)
-    {
-      size_t allocationSize = getPacketSize(first);
-      SecureByteBlockPtr temp(make_shared<SecureByteBlock>(allocationSize));
-
-      BYTE *buffer = temp->BytePtr();
-      BYTE *pos = buffer;
-      writePacket(first, pos, allocationSize);
-
-      return temp;
-    }
-
-    //-------------------------------------------------------------------------
-    const BYTE *RTCPPacket::ptr() const
-    {
-      return mBuffer->BytePtr();
-    }
-
-    //-------------------------------------------------------------------------
-    size_t RTCPPacket::size() const
-    {
-      return mBuffer->SizeInBytes();
-    }
-
-    //-------------------------------------------------------------------------
-    SecureByteBlockPtr RTCPPacket::buffer() const
-    {
-      return mBuffer;
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::SenderReport *RTCPPacket::senderReportAtIndex(size_t index) const
-    {
-      ASSERT(index < mSenderReportCount)
-      return &(mFirstSenderReport[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::ReceiverReport *RTCPPacket::receiverReportAtIndex(size_t index) const
-    {
-      ASSERT(index < mReceiverReportCount)
-      return &(mFirstReceiverReport[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::SDES *RTCPPacket::sdesAtIndex(size_t index) const
-    {
-      ASSERT(index < mSDESCount)
-      return &(mFirstSDES[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::Bye *RTCPPacket::byeAtIndex(size_t index) const
-    {
-      ASSERT(index < mByeCount)
-      return &(mFirstBye[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::App *RTCPPacket::appAtIndex(size_t index) const
-    {
-      ASSERT(index < mAppCount)
-      return &(mFirstApp[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::TransportLayerFeedbackMessage *RTCPPacket::transportLayerFeedbackReportAtIndex(size_t index) const
-    {
-      ASSERT(index < mTransportLayerFeedbackMessageCount)
-      return &(mFirstTransportLayerFeedbackMessage[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::PayloadSpecificFeedbackMessage *RTCPPacket::payloadSpecificFeedbackReportAtIndex(size_t index) const
-    {
-      ASSERT(index < mPayloadSpecificFeedbackMessageCount)
-      return &(mFirstPayloadSpecificFeedbackMessage[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::XR *RTCPPacket::xrAtIndex(size_t index) const
-    {
-      ASSERT(index < mXRCount)
-      return &(mFirstXR[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    RTCPPacket::UnknownReport *RTCPPacket::unknownAtIndex(size_t index) const
-    {
-      ASSERT(index < mUnknownReportCount)
-      return &(mFirstUnknownReport[index]);
-    }
-
-    //-------------------------------------------------------------------------
-    static void toDebug(
-                        ElementPtr &subEl,
-                        RTCPPacket::Report *common
-                        )
-    {
-      UseServicesHelper::debugAppend(subEl, "next", NULL != common->next());
-      UseServicesHelper::debugAppend(subEl, "ptr", NULL != common->ptr());
-      UseServicesHelper::debugAppend(subEl, "size", common->size());
-      UseServicesHelper::debugAppend(subEl, "version", common->version());
-      UseServicesHelper::debugAppend(subEl, "padding", common->padding());
-      UseServicesHelper::debugAppend(subEl, "report specific", common->reportSpecific());
-      UseServicesHelper::debugAppend(subEl, "pt", common->pt());
-    }
-
-    //-------------------------------------------------------------------------
-    static void toDebugSenderReceiverCommonReport(
-                                                  ElementPtr &subEl,
-                                                  RTCPPacket::SenderReceiverCommonReport *common
-                                                  )
-    {
-      internal::toDebug(subEl, common);
-      UseServicesHelper::debugAppend(subEl, "rc", common->rc());
-      UseServicesHelper::debugAppend(subEl, (RTCPPacket::ReceiverReport::kPayloadType != common->pt() ? "ssrc of sender" : "ssrc of packet sender"), common->ssrcOfSender());
-      UseServicesHelper::debugAppend(subEl, "extension", (NULL != common->extension()));
-      UseServicesHelper::debugAppend(subEl, "extension size", common->extensionSize());
-    }
-
-    //-------------------------------------------------------------------------
-    static ElementPtr toDebug(RTCPPacket::SenderReceiverCommonReport *common)
-    {
-      RTCPPacket::SenderReceiverCommonReport::ReportBlock *block = common->firstReportBlock();
-      if (NULL == block) return ElementPtr();
-
-      ElementPtr outerEl = Element::create("ReportBlocks");
-
-      for (; NULL != block; block = block->next()) {
-        ElementPtr subEl = Element::create("ReportBlocks");
-        UseServicesHelper::debugAppend(subEl, "ssrc", block->ssrc());
-        UseServicesHelper::debugAppend(subEl, "fraction lost", block->fractionLost());
-        UseServicesHelper::debugAppend(subEl, "cumulative number of packets lost", block->cumulativeNumberOfPacketsLost());
-        UseServicesHelper::debugAppend(subEl, "extended highest sequence number received", block->extendedHighestSequenceNumberReceived());
-        UseServicesHelper::debugAppend(subEl, "interarrival jitter", block->interarrivalJitter());
-        UseServicesHelper::debugAppend(subEl, "lsr", block->lsr());
-        UseServicesHelper::debugAppend(subEl, "dlsr", block->dlsr());
-        UseServicesHelper::debugAppend(outerEl, subEl);
-      }
-      return outerEl;
-    }
-
-    //-------------------------------------------------------------------------
-    static void toDebug(
-                        ElementPtr &subEl,
-                        RTCPPacket::SDES::Chunk::StringItem *common
-                        )
-    {
-      auto type = common->type();
-      UseServicesHelper::debugAppend(subEl, "type", type);
-      if (RTCPPacket::SDES::Chunk::Priv::kItemType == type) {
-        RTCPPacket::SDES::Chunk::Priv *priv = reinterpret_cast<RTCPPacket::SDES::Chunk::Priv *>(common);
-        UseServicesHelper::debugAppend(subEl, "prefix length", priv->prefixLength());
-        UseServicesHelper::debugAppend(subEl, "prefix", priv->prefix());
-      }
-      UseServicesHelper::debugAppend(subEl, "length", common->length());
-      UseServicesHelper::debugAppend(subEl, "value", common->value());
-    }
-
-    //-------------------------------------------------------------------------
-    static ElementPtr toDebug(
-                              const char *typeNames,
-                              const char *typeName,
-                              RTCPPacket::SDES::Chunk::StringItem *first
-                              )
-    {
-      if (NULL == first) return ElementPtr();
-
-      RTCPPacket::SDES::Chunk::StringItem *item = first;
-      bool hasMoreThanOne = (NULL != item ? (NULL != item->mNext) : false);
-
-      ElementPtr outerEl;
-
-      if (hasMoreThanOne) {
-        outerEl = Element::create(typeNames);
-      }
-
-      for (; NULL != item; item = item->mNext) {
-        ElementPtr subEl = Element::create(typeName);
-        internal::toDebug(subEl, item);
-
-        if (!hasMoreThanOne) {
-          return subEl;
+        case TMMBR::kFmt:
+        {
+          auto count = fm->tmmbrCount();
+          throwIfLessThan(count, 1);
+          result += ((sizeof(DWORD)*2)*(count));
+          break;
         }
-        UseServicesHelper::debugAppend(outerEl, subEl);
-      }
-
-      return outerEl;
-    }
-
-    //-------------------------------------------------------------------------
-    static ElementPtr toDebug(
-                              const char *typeNamse,
-                              const char *typeName,
-                              DWORD *ssrcs,
-                              size_t count
-                              )
-    {
-      if (0 == count) return ElementPtr();
-
-      ElementPtr outerEl = Element::create(typeNamse);
-
-      for (size_t index = 0; index < count; ++index) {
-        UseServicesHelper::debugAppend(outerEl, typeName, ssrcs[index]);
-      }
-
-      return outerEl;
-    }
-    
-    //-------------------------------------------------------------------------
-    static void toDebugFeedbackMessage(
-                                       ElementPtr &subEl,
-                                       RTCPPacket::FeedbackMessage *common
-                                       )
-    {
-      internal::toDebug(subEl, common);
-
-      UseServicesHelper::debugAppend(subEl, "fmt", common->fmt());
-      UseServicesHelper::debugAppend(subEl, "ssrc of packet sender", common->ssrcOfPacketSender());
-      UseServicesHelper::debugAppend(subEl, "ssrc of media source", common->ssrcOfMediaSource());
-      UseServicesHelper::debugAppend(subEl, "fci", (NULL != common->fci()));
-      UseServicesHelper::debugAppend(subEl, "fci size", common->fciSize());
-    }
-
-    //-------------------------------------------------------------------------
-    static void toDebug(
-                        ElementPtr &subEl,
-                        RTCPPacket::TransportLayerFeedbackMessage::TMMBRCommon *common
-                        )
-    {
-      UseServicesHelper::debugAppend(subEl, "ssrc", common->ssrc());
-      UseServicesHelper::debugAppend(subEl, "mx tbr exp", common->mxTBRExp());
-      UseServicesHelper::debugAppend(subEl, "mx tbr mantissa", common->mxTBRMantissa());
-      UseServicesHelper::debugAppend(subEl, "measured overhead", common->measuredOverhead());
-    }
-    
-    //-------------------------------------------------------------------------
-    static void toDebug(
-                        ElementPtr &subEl,
-                        RTCPPacket::PayloadSpecificFeedbackMessage::CodecControlCommon *common
-                        )
-    {
-      UseServicesHelper::debugAppend(subEl, "ssrc", common->ssrc());
-      UseServicesHelper::debugAppend(subEl, "seq nr", common->seqNr());
-      UseServicesHelper::debugAppend(subEl, "reserved", common->reserved());
-    }
-
-    //-------------------------------------------------------------------------
-    static void toDebugReportBlock(
-                                   ElementPtr &subEl,
-                                   RTCPPacket::XR::ReportBlock *common
-                                   )
-    {
-      UseServicesHelper::debugAppend(subEl, "next", (NULL != common->next()));
-      UseServicesHelper::debugAppend(subEl, "block type", common->blockType());
-      UseServicesHelper::debugAppend(subEl, "type specific", common->typeSpecific());
-      UseServicesHelper::debugAppend(subEl, "type specific contents", (NULL != common->typeSpecificContents()));
-      UseServicesHelper::debugAppend(subEl, "type specific contents size", common->typeSpecificContentSize());
-    }
-
-    //-------------------------------------------------------------------------
-    static void toDebugReportBlockRange(
-                                        ElementPtr &subEl,
-                                        RTCPPacket::XR::ReportBlockRange *common
-                                        )
-    {
-      internal::toDebugReportBlock(subEl, common);
-      UseServicesHelper::debugAppend(subEl, "reserved", common->reserved());
-      UseServicesHelper::debugAppend(subEl, "thinning", common->thinning());
-      UseServicesHelper::debugAppend(subEl, "ssrc", common->ssrcOfSource());
-      UseServicesHelper::debugAppend(subEl, "begin seq", common->beginSeq());
-      UseServicesHelper::debugAppend(subEl, "end seq", common->endSeq());
-    }
-
-    //-------------------------------------------------------------------------
-    static void toDebugRLEReportBlock(
-                                      ElementPtr &subEl,
-                                      RTCPPacket::XR::RLEReportBlock *common
-                                      )
-    {
-      internal::toDebugReportBlockRange(subEl, common);
-      auto count = common->chunkCount();
-
-      if (count < 1) return;
-
-      ElementPtr outerEl = Element::create("chunks");
-
-      for (size_t index = 0; index < count; ++index) {
-        RTCPPacket::XR::RLEChunk chunk = common->chunkAtIndex(index);
-
-        ElementPtr chunkEl;
-
-        if (RTCPPacket::XR::isRunLengthChunk(chunk)) {
-          chunkEl = Element::create("run length");
-
-          RTCPPacket::XR::RunLength rl(chunk);
-          UseServicesHelper::debugAppend(chunkEl, "run type", string(rl.runType()));
-          UseServicesHelper::debugAppend(chunkEl, "run length", rl.runLength());
-
-        } else if (RTCPPacket::XR::isBitVectorChunk(chunk)) {
-          chunkEl = Element::create("bit vector");
-
-          String bits;
-          RTCPPacket::XR::BitVector bv(chunk);
-          for (int bitPos = 0; bitPos < sizeof(RTCPPacket::XR::RLEChunk); ++bitPos) {
-            bits += string(bv.bitAtIndex(bitPos));
-          }
-          UseServicesHelper::debugAppend(chunkEl, "bit vector", bits);
-        } else {
-          chunkEl = Element::create("unknown");
-          UseServicesHelper::debugAppend(chunkEl, "value", chunk);
+        case TMMBN::kFmt:
+        {
+          auto count = fm->tmmbnCount();
+          result += ((sizeof(DWORD)*2)*(count));
+          break;
+        }
+        default:
+        {
+          auto fciSize = fm->fciSize();
+          if (0 != fciSize) {
+            ORTC_THROW_INVALID_PARAMETERS_IF(NULL == fm->fci())
+            result += fciSize;
+          }
+          break;
         }
-
-        UseServicesHelper::debugAppend(outerEl, chunkEl);
-      }
-      UseServicesHelper::debugAppend(subEl, outerEl);
-
-    }
-
-    //-------------------------------------------------------------------------
-    static ElementPtr toDebugSenderReport(RTCPPacket::SenderReport *sr)
-    {
-      ElementPtr subEl = Element::create("SenderReport");
-
-      internal::toDebugSenderReceiverCommonReport(subEl, sr);
-      UseServicesHelper::debugAppend(subEl, "ntp timestamp ms", sr->ntpTimestampMS());
-      UseServicesHelper::debugAppend(subEl, "ntp timestamp ls", sr->ntpTimestampLS());
-      UseServicesHelper::debugAppend(subEl, "ntp timestamp", sr->ntpTimestamp());
-      UseServicesHelper::debugAppend(subEl, "sender packet count", sr->senderPacketCount());
-      UseServicesHelper::debugAppend(subEl, "sender octet count", sr->senderOctetCount());
-
-      UseServicesHelper::debugAppend(subEl, internal::toDebug(sr));
-
-      UseServicesHelper::debugAppend(subEl, "next sender report", NULL != sr->nextSenderReport());
-      return subEl;
-    }
-
-    //-------------------------------------------------------------------------
-    static ElementPtr toDebugReceiverReport(RTCPPacket::ReceiverReport *rr)
-    {
-      ElementPtr subEl = Element::create("ReceiverReport");
-      internal::toDebugSenderReceiverCommonReport(subEl, rr);
-      UseServicesHelper::debugAppend(subEl, internal::toDebug(rr));
-      UseServicesHelper::debugAppend(subEl, "next receiver report", NULL != rr->nextReceiverReport());
-      return subEl;
-    }
-
-    //-------------------------------------------------------------------------
-    static ElementPtr toDebugSDES(RTCPPacket::SDES *sdes)
-    {
-      ElementPtr subEl = Element::create("SDES");
-      internal::toDebug(subEl, sdes);
-      UseServicesHelper::debugAppend(subEl, "sc", sdes->sc());
-
-      RTCPPacket::SDES::Chunk *chunk = sdes->firstChunk();
-      if (NULL != chunk) {
-        ElementPtr chunksEl = Element::create("Chunks");
-
-        for (; NULL != chunk; chunk = chunk->next()) {
-          ElementPtr chunkEl = Element::create("Chunk");
-          UseServicesHelper::debugAppend(chunkEl, "ssrc", chunk->ssrc());
-          UseServicesHelper::debugAppend(chunkEl, "count", chunk->count());
-          UseServicesHelper::debugAppend(chunkEl, "cname count", chunk->cNameCount());
-          UseServicesHelper::debugAppend(chunkEl, "name count", chunk->nameCount());
-          UseServicesHelper::debugAppend(chunkEl, "email count", chunk->emailCount());
-          UseServicesHelper::debugAppend(chunkEl, "phone count", chunk->phoneCount());
-          UseServicesHelper::debugAppend(chunkEl, "loc count", chunk->locCount());
-          UseServicesHelper::debugAppend(chunkEl, "tool count", chunk->toolCount());
-          UseServicesHelper::debugAppend(chunkEl, "note count", chunk->noteCount());
-          UseServicesHelper::debugAppend(chunkEl, "priv count", chunk->privCount());
-          UseServicesHelper::debugAppend(chunkEl, "mid count", chunk->midCount());
-          UseServicesHelper::debugAppend(chunkEl, "rid count", chunk->ridCount());
-          UseServicesHelper::debugAppend(chunkEl, "unknown count", chunk->unknownCount());
-
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("cnames", "cname", chunk->firstCName()));
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("names", "name", chunk->firstName()));
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("emails", "email", chunk->firstEmail()));
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("phones", "phone", chunk->firstPhone()));
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("locs", "loc", chunk->firstLoc()));
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("tools", "tool", chunk->firstTool()));
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("notes", "note", chunk->firstNote()));
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("privs", "priv", chunk->firstPriv()));
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("mid", "mid", chunk->firstMid()));
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("rid", "rid", chunk->firstRid()));
-          UseServicesHelper::debugAppend(chunkEl, internal::toDebug("unknowns", "unknown", chunk->firstUnknown()));
-
-          UseServicesHelper::debugAppend(chunksEl, chunkEl);
-        }
-
-        UseServicesHelper::debugAppend(subEl, chunksEl);
       }
 
-      UseServicesHelper::debugAppend(subEl, "next sdes", NULL != sdes->nextSDES());
-      return subEl;
-    }
-
-    //-------------------------------------------------------------------------
-    static ElementPtr toDebugBye(RTCPPacket::Bye *bye)
-    {
-      ElementPtr subEl = Element::create("Bye");
-      internal::toDebug(subEl, bye);
-
-      UseServicesHelper::debugAppend(subEl, internal::toDebug("ssrcs", "ssrc", bye->mSSRCs, bye->sc()));
-
-      UseServicesHelper::debugAppend(subEl, "reason for leaving", bye->reasonForLeaving());
-      UseServicesHelper::debugAppend(subEl, "next bye", NULL != bye->nextBye());
-      return subEl;
-    }
-
-    //-------------------------------------------------------------------------
-    static ElementPtr toDebugApp(RTCPPacket::App *app)
-    {
-      ElementPtr subEl = Element::create("App");
-      internal::toDebug(subEl, app);
-
-      UseServicesHelper::debugAppend(subEl, "subtype", app->subtype());
-      UseServicesHelper::debugAppend(subEl, "ssrc", app->ssrc());
-      UseServicesHelper::debugAppend(subEl, "name", app->name());
-
-      UseServicesHelper::debugAppend(subEl, "data", (NULL != app->data()));
-      UseServicesHelper::debugAppend(subEl, "name size", app->dataSize());
+      ZS_LOG_INSANE(packet_slog("getting transport layer feedback message packet size") + ZS_PARAM("fmt", fm->fmtToString()) + ZS_PARAM("fmt (number)", fm->reportSpecific()) + ZS_PARAM("size", result))
 
-      UseServicesHelper::debugAppend(subEl, "next app", NULL != app->nextApp());
-      return subEl;
+      return boundarySize(result);
     }
 
     //-------------------------------------------------------------------------
-    static ElementPtr toDebugTransportLayerFeedbackMessage(RTCPPacket::TransportLayerFeedbackMessage *fm)
+    static size_t getPacketSizePayloadSpecificFeedbackMessage(const RTCPPacket::PayloadSpecificFeedbackMessage *fm)
     {
-      ElementPtr subEl = Element::create("TransportLayerFeedbackMessage");
-      internal::toDebugFeedbackMessage(subEl, fm);
-
-      {
-        auto count = fm->genericNACKCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("GenericNACKs");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("GenericNACK");
+      //typedef RTCPPacket::PayloadSpecificFeedbackMessage PayloadSpecificFeedbackMessage;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::PLI PLI;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::SLI SLI;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::RPSI RPSI;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::FIR FIR;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::TSTR TSTR;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::TSTN TSTN;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::VBCM VBCM;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::AFB AFB;
+      //typedef RTCPPacket::PayloadSpecificFeedbackMessage::REMB REMB;
 
-            auto format = fm->genericNACKAtIndex(index);
+      size_t result = (sizeof(DWORD)*3);
 
-            UseServicesHelper::debugAppend(formatEl, "pid", format->pid());
-            UseServicesHelper::debugAppend(formatEl, "blp", format->blp());
+      switch (fm->fmt()) {
+        case PLI::kFmt:
+        {
+          break;
+        }
+        case SLI::kFmt:
+        {
+          auto count = fm->sliCount();
+          throwIfLessThan(count, 1);
+          result += (sizeof(DWORD)*(count));
+          break;
+        }
+        case RPSI::kFmt:
+        {
+          auto rpsi = fm->rpsi();
+          ORTC_THROW_INVALID_PARAMETERS_IF(NULL == rpsi)
+          result += sizeof(WORD) + (rpsi->nativeRPSIBitStringSizeInBits()/8);
+          if (0 != (rpsi->nativeRPSIBitStringSizeInBits()%8)) ++result;
+          break;
+        }
+        case FIR::kFmt:
+        {
+          auto count = fm->firCount();
+          throwIfLessThan(count, 1);
+          result += ((sizeof(DWORD)*2)*(count));
+          break;
+        }
+        case TSTR::kFmt:
+        {
+          auto count = fm->tstrCount();
+          throwIfLessThan(count, 1);
+          result += ((sizeof(DWORD)*2)*(count));
+          break;
+        }
+        case TSTN::kFmt:
+        {
+          auto count = fm->tstnCount();
+          throwIfLessThan(count, 1);
+          result += ((sizeof(DWORD)*2)*(count));
+          break;
+        }
+        case VBCM::kFmt:
+        {
+          auto count = fm->vbcmCount();
+          throwIfLessThan(count, 1);
+          for (size_t index = 0; index < count; ++index)
+          {
+            auto vbcm = fm->vbcmAtIndex(index);
+            ORTC_THROW_INVALID_PARAMETERS_IF(NULL == vbcm)
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+            size_t size = (sizeof(DWORD)*2) + (vbcm->vbcmOctetStringSize()*sizeof(BYTE));
+            result += boundarySize(size);
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
+          break;
         }
-      }
-
-      {
-        auto count = fm->tmmbrCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("TMMBRs");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("TMMBR");
-
-            auto format = fm->tmmbrAtIndex(index);
-            internal::toDebug(formatEl, format);
+        case AFB::kFmt:
+        {
+          auto remb = fm->remb();
+          if (NULL == remb) {
+            auto afb = fm->afb();
+            ORTC_THROW_INVALID_PARAMETERS_IF(NULL == afb)
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+            result += afb->dataSize();
+          } else {
+            result += (sizeof(DWORD)*2);
+            size_t numSSRCs = remb->numSSRC();
+            throwIfGreaterThanBitsAllow(numSSRCs, 8);
+            throwIfLessThan(numSSRCs, 1);
+            result += ((sizeof(DWORD))*numSSRCs);
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
+          break;
         }
-      }
-
-      {
-        auto count = fm->tmmbrCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("TMMBNs");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("TMMBN");
-
-            auto format = fm->tmmbrAtIndex(index);
-            internal::toDebug(formatEl, format);
-
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+        default:
+        {
+          auto fciSize = fm->fciSize();
+          if (0 != fciSize) {
+            ORTC_THROW_INVALID_PARAMETERS_IF(NULL == fm->fci())
+            result += fciSize;
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
+          break;
         }
       }
 
-      UseServicesHelper::debugAppend(subEl, "unknown", NULL != fm->unknown());
-
-      UseServicesHelper::debugAppend(subEl, "next transport layer feedback message", (NULL != fm->nextTransportLayerFeedbackMessage()));
+      ZS_LOG_INSANE(packet_slog("getting payload specific feedback message packet size") + ZS_PARAM("fmt", fm->fmtToString()) + ZS_PARAM("fmt (number)", fm->reportSpecific()) + ZS_PARAM("size", result))
 
-      return subEl;
+      return boundarySize(result);
     }
 
     //-------------------------------------------------------------------------
-    static ElementPtr toDebugPayloadSpecificFeedbackMessage(RTCPPacket::PayloadSpecificFeedbackMessage *fm)
+    static size_t getPacketSizeXR(const RTCPPacket::XR *report)
     {
-      ElementPtr subEl = Element::create("PayloadSpecificFeedbackMessage");
-      internal::toDebugFeedbackMessage(subEl, fm);
-
-      {
-        auto format = fm->pli();
-        if (NULL != format) {
-          ElementPtr formatEl = Element::create("PLI");
+      //typedef RTCPPacket::XR XR;
+      typedef RTCPPacket::XR::ReportBlock ReportBlock;
+      typedef RTCPPacket::XR::LossRLEReportBlock LossRLEReportBlock;
+      typedef RTCPPacket::XR::DuplicateRLEReportBlock DuplicateRLEReportBlock;
+      typedef RTCPPacket::XR::PacketReceiptTimesReportBlock PacketReceiptTimesReportBlock;
+      typedef RTCPPacket::XR::ReceiverReferenceTimeReportBlock ReceiverReferenceTimeReportBlock;
+      typedef RTCPPacket::XR::DLRRReportBlock DLRRReportBlock;
+      typedef RTCPPacket::XR::StatisticsSummaryReportBlock StatisticsSummaryReportBlock;
+      typedef RTCPPacket::XR::VoIPMetricsReportBlock VoIPMetricsReportBlock;
+      //typedef RTCPPacket::XR::UnknownReportBlock UnknownReportBlock;
 
-          UseServicesHelper::debugAppend(subEl, formatEl);
-        }
-      }
+      size_t result = (sizeof(DWORD)*2);
 
+      for (const ReportBlock *reportBlock = report->firstReportBlock(); NULL != reportBlock; reportBlock = reportBlock->next())
       {
-        auto count = fm->sliCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("SLIs");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("SLI");
-
-            auto format = fm->sliAtIndex(index);
-
-            UseServicesHelper::debugAppend(formatEl, "first", format->first());
-            UseServicesHelper::debugAppend(formatEl, "number", format->number());
-            UseServicesHelper::debugAppend(formatEl, "picture id", format->pictureID());
+        size_t preSize = result;
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+        switch (reportBlock->mBlockType) {
+          case LossRLEReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const LossRLEReportBlock *>(reportBlock);
+            result += (sizeof(DWORD)*3);
+            result += boundarySize(sizeof(WORD)*(block->chunkCount()));
+            break;
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
-        }
-      }
-
-      {
-        auto format = fm->rpsi();
-        if (NULL != format) {
-          ElementPtr formatEl = Element::create("RPSI");
-
-          UseServicesHelper::debugAppend(formatEl, "zero bit", format->zeroBit());
-          UseServicesHelper::debugAppend(formatEl, "payload type", format->payloadType());
-
-          UseServicesHelper::debugAppend(formatEl, "native rpsi bit string", (NULL != format->nativeRPSIBitString()));
-          UseServicesHelper::debugAppend(formatEl, "native rpsi bit string size (bits)", format->nativeRPSIBitStringSizeInBits());
-
-          UseServicesHelper::debugAppend(subEl, formatEl);
-        }
-      }
-
-      {
-        auto count = fm->firCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("FIRs");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("FIR");
-
-            auto format = fm->firAtIndex(index);
-            internal::toDebug(formatEl, format);
-
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+          case DuplicateRLEReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const DuplicateRLEReportBlock *>(reportBlock);
+            result += (sizeof(DWORD)*3);
+            result += boundarySize(sizeof(WORD)*(block->chunkCount()));
+            break;
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
-        }
-      }
-
-      {
-        auto count = fm->tstrCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("TSTRs");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("TSTR");
-
-            auto format = fm->tstrAtIndex(index);
-            internal::toDebug(formatEl, format);
-
-            UseServicesHelper::debugAppend(formatEl, "index", format->index());
-
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+          case PacketReceiptTimesReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const PacketReceiptTimesReportBlock *>(reportBlock);
+            result += (sizeof(DWORD)*3);
+            result += (sizeof(DWORD)*(block->receiptTimeCount()));
+            break;
+          }
+          case ReceiverReferenceTimeReportBlock::kBlockType:
+          {
+            result += (sizeof(DWORD)*3);
+            break;
+          }
+          case DLRRReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const DLRRReportBlock *>(reportBlock);
+            result += (sizeof(DWORD));
+            result += ((sizeof(DWORD)*3)*(block->subBlockCount()));
+            break;
+          }
+          case StatisticsSummaryReportBlock::kBlockType:
+          {
+            result += (sizeof(DWORD)*10);
+            break;
+          }
+          case VoIPMetricsReportBlock::kBlockType:
+          {
+            result += (sizeof(DWORD)*9);
+            break;
+          }
+          default:
+          {
+            result += (sizeof(DWORD)) + boundarySize(reportBlock->mTypeSpecificContentSize);
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
         }
-      }
 
-      {
-        auto count = fm->tstnCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("TSTNs");
+        ZS_LOG_INSANE(packet_slog("XR block packet size") + ZS_PARAM("block type", reportBlock->blockTypeToString()) + ZS_PARAM("block type (number)", reportBlock->blockType()) + ZS_PARAM("size", result - preSize))
+      }
 
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("TSTN");
+      return boundarySize(result);
+    }
 
-            auto format = fm->tstnAtIndex(index);
-            internal::toDebug(formatEl, format);
+    //-------------------------------------------------------------------------
+    static void writePacketUnknown(const RTCPPacket::UnknownReport *report, BYTE * &pos, size_t &remaining)
+    {
+      //typedef RTCPPacket::UnknownReport UnknownReport;
+      pos[1] = report->pt();
 
-            UseServicesHelper::debugAppend(formatEl, "index", format->index());
+      advancePos(pos, remaining, sizeof(DWORD));
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
-          }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
-        }
-      }
+      auto size = report->size();
+      if (0 == size) return;
 
-      {
-        auto count = fm->vbcmCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("VBCMs");
+      ASSERT(NULL != report->ptr());
 
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("VBCM");
+      memcpy(pos, report->ptr(), size);
 
-            auto format = fm->vbcmAtIndex(index);
-            internal::toDebug(formatEl, format);
+      advancePos(pos, remaining, size);
+    }
 
-            UseServicesHelper::debugAppend(formatEl, "zero bit", format->zeroBit());
-            UseServicesHelper::debugAppend(formatEl, "payload type", format->payloadType());
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTCPPacket (packet writing routines)
+    #pragma mark
 
-            UseServicesHelper::debugAppend(formatEl, "vbcm octet string", (NULL != format->vbcmOctetString()));
-            UseServicesHelper::debugAppend(formatEl, "vbcm octet string size", format->vbcmOctetStringSize());
+    //-------------------------------------------------------------------------
+    static void writePacketHeader(const RTCPPacket::Report *report, BYTE * &pos, size_t &remaining)
+    {
+      ASSERT(remaining >= sizeof(DWORD))
+      ASSERT(2 == report->version())
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
-          }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
-        }
+      auto padding = report->padding();
+      if (0 != padding) {
+        ASSERT(NULL == report->next())
+        ASSERT(throwIfGreaterThanBitsAllow(padding, 8))
       }
 
-      {
-        auto format = fm->afb();
-        auto remb = fm->remb();
-
-        if ((NULL != format) &&
-            (NULL == remb)) {
-          ElementPtr formatEl = Element::create("AFB");
+      ASSERT(throwIfGreaterThanBitsAllow(report->reportSpecific(), 5))
 
-          UseServicesHelper::debugAppend(formatEl, "data", (NULL != format->data()));
-          UseServicesHelper::debugAppend(formatEl, "data size", format->dataSize());
+      pos[0] = RTCP_PACK_BITS(report->version(), 0x3, 6) |
+                ((0 != padding) ? RTCP_PACK_BITS(1, 0x1, 5) : 0) |
+                RTCP_PACK_BITS(report->reportSpecific(), 0x1F, 0);
+      pos[1] = report->pt();
+    }
 
-          UseServicesHelper::debugAppend(subEl, formatEl);
-        }
-      }
+    //-------------------------------------------------------------------------
+    static void writePacketSenderReceiverCommonReport(const RTCPPacket::SenderReceiverCommonReport *report, BYTE * &pos, size_t &remaining)
+    {
+      //typedef RTCPPacket::SenderReceiverCommonReport SenderReceiverCommonReport;
+      typedef RTCPPacket::SenderReceiverCommonReport::ReportBlock ReportBlock;
 
+      size_t count = 0;
+      for (const ReportBlock *block = report->firstReportBlock(); NULL != block; block = block->next(), ++count)
       {
-        auto format = fm->remb();
-        if (NULL != format) {
-          ElementPtr formatEl = Element::create("REMB");
+        ASSERT(count < report->rc());
 
-          UseServicesHelper::debugAppend(formatEl, "num ssrc", format->numSSRC());
-          UseServicesHelper::debugAppend(formatEl, "br exp", format->brExp());
-          UseServicesHelper::debugAppend(formatEl, "br mantissa", format->brMantissa());
+        UseRTPUtils::setBE32(&(pos[0]), block->ssrc());
+        ASSERT(throwIfGreaterThanBitsAllow(block->cumulativeNumberOfPacketsLost(), 24));
+        UseRTPUtils::setBE32(&(pos[4]), block->cumulativeNumberOfPacketsLost());
+        pos[4] = block->fractionLost();
+        UseRTPUtils::setBE32(&(pos[8]), block->extendedHighestSequenceNumberReceived());
+        UseRTPUtils::setBE32(&(pos[12]), block->interarrivalJitter());
+        UseRTPUtils::setBE32(&(pos[16]), block->lsr());
+        UseRTPUtils::setBE32(&(pos[20]), block->dlsr());
 
-          UseServicesHelper::debugAppend(formatEl, internal::toDebug("ssrcs", "ssrc", format->mSSRCs, format->numSSRC()));
+        advancePos(pos, remaining, sizeof(DWORD)*6);
+      }
 
-          UseServicesHelper::debugAppend(subEl, formatEl);
-        }
+      ASSERT(count == report->rc())
+
+      if (report->extensionSize() > 0) {
+        ASSERT(NULL != report->extension())
+        memcpy(pos, report->extension(), report->extensionSize());
+        advancePos(pos, remaining, boundarySize(report->extensionSize()));
       }
+    }
+    
+    //-------------------------------------------------------------------------
+    static void writePacketSenderReport(const RTCPPacket::SenderReport *report, BYTE * &pos, size_t &remaining)
+    {
+      typedef RTCPPacket::SenderReport SenderReport;
+      pos[1] = SenderReport::kPayloadType;
+
+      UseRTPUtils::setBE32(&(pos[4]), report->ssrcOfSender());
+      UseRTPUtils::setBE32(&(pos[8]), report->ntpTimestampMS());
+      UseRTPUtils::setBE32(&(pos[12]), report->ntpTimestampLS());
+      UseRTPUtils::setBE32(&(pos[16]), report->rtpTimestamp());
+      UseRTPUtils::setBE32(&(pos[20]), report->senderPacketCount());
+      UseRTPUtils::setBE32(&(pos[24]), report->senderOctetCount());
 
-      UseServicesHelper::debugAppend(subEl, "unknown", NULL != fm->unknown());
+      advancePos(pos, remaining, sizeof(DWORD)*7);
 
-      UseServicesHelper::debugAppend(subEl, "next payload specific feedback message", (NULL != fm->nextPayloadSpecificFeedbackMessage()));
-      return subEl;
+      writePacketSenderReceiverCommonReport(report, pos, remaining);
     }
 
     //-------------------------------------------------------------------------
-    static ElementPtr toDebugXR(RTCPPacket::XR *xr)
+    static void writePacketReceiverReport(const RTCPPacket::ReceiverReport *report, BYTE * &pos, size_t &remaining)
     {
-      ElementPtr subEl = Element::create("XR");
-      internal::toDebug(subEl, xr);
-
-      UseServicesHelper::debugAppend(subEl, "reserved", xr->reserved());
-      UseServicesHelper::debugAppend(subEl, "ssrc", xr->ssrc());
-      UseServicesHelper::debugAppend(subEl, "report block count", xr->reportBlockCount());
+      typedef RTCPPacket::ReceiverReport ReceiverReport;
+      pos[1] = ReceiverReport::kPayloadType;
 
-      {
-        auto count = xr->lossRLEReportBlockCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("LossRLEReportBlocks");
+      UseRTPUtils::setBE32(&(pos[4]), report->ssrcOfPacketSender());
 
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("LossRLEReportBlock");
+      advancePos(pos, remaining, sizeof(DWORD)*2);
 
-            auto format = xr->lossRLEReportBlockAtIndex(index);
+      writePacketSenderReceiverCommonReport(report, pos, remaining);
+    }
+    
+    //-------------------------------------------------------------------------
+    static void writePacketSDES(const RTCPPacket::SDES *report, BYTE * &pos, size_t &remaining)
+    {
+      typedef RTCPPacket::SDES SDES;
+      typedef RTCPPacket::SDES::Chunk Chunk;
 
-            internal::toDebugRLEReportBlock(formatEl, format);
+      pos[1] = SDES::kPayloadType;
 
-            UseServicesHelper::debugAppend(formatEl, "next loss rle report block", (NULL != format->nextLossRLE()));
+      advancePos(pos, remaining, sizeof(DWORD));
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
-          }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
-        }
-      }
+      size_t chunkCount = 0;
 
+      for (Chunk *chunk = report->firstChunk(); NULL != chunk; chunk = chunk->next(), ++chunkCount)
       {
-        auto count = xr->duplicateRLEReportBlockCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("DuplicateRLEReportBlocks");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("DuplicateRLEReportBlock");
+        UseRTPUtils::setBE32(pos, chunk->ssrc());
+        advancePos(pos, remaining, sizeof(DWORD));
 
-            auto format = xr->duplicateRLEReportBlockAtIndex(index);
+        BYTE *startPos = pos;
 
-            internal::toDebugRLEReportBlock(formatEl, format);
+        for (auto *item = chunk->firstCName(); NULL != item; item = item->next())
+        {
+          pos[0] = Chunk::CName::kItemType;
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
 
-            UseServicesHelper::debugAppend(formatEl, "next duplicate rle report block", (NULL != format->nextDuplicateRLE()));
+          advancePos(pos, remaining, sizeof(WORD));
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+          if (len > 0) {
+            memcpy(pos, item->value(), len*sizeof(BYTE));
+            advancePos(pos, remaining, len*sizeof(BYTE));
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
+          ZS_LOG_INSANE(packet_slog("writing SDES CName") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
         }
-      }
 
-      {
-        auto count = xr->packetReceiptTimesReportBlockCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("PacketReceiptTimesReportBlocks");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("PacketReceiptTimesReportBlock");
-
-            auto format = xr->packetReceiptTimesReportBlockAtIndex(index);
-
-            internal::toDebugReportBlockRange(formatEl, format);
+        for (auto *item = chunk->firstName(); NULL != item; item = item->next())
+        {
+          pos[0] = Chunk::Name::kItemType;
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
 
-            UseServicesHelper::debugAppend(formatEl, internal::toDebug("receipt times", "receipt time", format->mReceiptTimes, format->receiptTimeCount()));
-            UseServicesHelper::debugAppend(formatEl, "next packet receipt times report block", (NULL != format->nextPacketReceiptTimesReportBlock()));
+          advancePos(pos, remaining, sizeof(WORD));
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+          if (len > 0) {
+            memcpy(pos, item->value(), len*sizeof(BYTE));
+            advancePos(pos, remaining, len*sizeof(BYTE));
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
+          ZS_LOG_INSANE(packet_slog("writing SDES Name") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
         }
-      }
 
-      {
-        auto count = xr->receiverReferenceTimeReportBlockCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("ReceiverReferenceTimeReportBlocks");
+        for (auto *item = chunk->firstEmail(); NULL != item; item = item->next())
+        {
+          pos[0] = Chunk::Email::kItemType;
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8));
 
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("ReceiverReferenceTimeReportBlock");
+          advancePos(pos, remaining, sizeof(WORD));
 
-            auto format = xr->receiverReferenceTimeReportBlockAtIndex(index);
+          if (len > 0) {
+            memcpy(pos, item->value(), len*sizeof(BYTE));
+            advancePos(pos, remaining, len*sizeof(BYTE));
+          }
+          ZS_LOG_INSANE(packet_slog("writing SDES Email") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-            internal::toDebugReportBlock(formatEl, format);
+        for (auto *item = chunk->firstPhone(); NULL != item; item = item->next())
+        {
+          pos[0] = Chunk::Phone::kItemType;
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8));
 
-            UseServicesHelper::debugAppend(formatEl, "ntp timestamp ms", format->ntpTimestampMS());
-            UseServicesHelper::debugAppend(formatEl, "ntp timestamp ls", format->ntpTimestampLS());
-            UseServicesHelper::debugAppend(formatEl, "ntp timestamp", format->ntpTimestamp());
-            UseServicesHelper::debugAppend(formatEl, "next receiver reference time report block", (NULL != format->nextReceiverReferenceTimeReportBlock()));
+          advancePos(pos, remaining, sizeof(WORD));
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+          if (len > 0) {
+            memcpy(pos, item->value(), len*sizeof(BYTE));
+            advancePos(pos, remaining, len*sizeof(BYTE));
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
+          ZS_LOG_INSANE(packet_slog("writing SDES Phone") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
         }
-      }
 
-      {
-        auto count = xr->dlrrReportBlockCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("DLRRReportBlocks");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("DLRRReportBlock");
-
-            auto format = xr->dlrrReportBlockAtIndex(index);
+        for (auto *item = chunk->firstLoc(); NULL != item; item = item->next())
+        {
+          pos[0] = Chunk::Loc::kItemType;
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8));
 
-            internal::toDebugReportBlock(formatEl, format);
+          advancePos(pos, remaining, sizeof(WORD));
 
-            UseServicesHelper::debugAppend(formatEl, "subblock count", format->subBlockCount());
+          if (len > 0) {
+            memcpy(pos, item->value(), len*sizeof(BYTE));
+            advancePos(pos, remaining, len*sizeof(BYTE));
+          }
+          ZS_LOG_INSANE(packet_slog("writing SDES Loc") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-            size_t subBlockCount = format->subBlockCount();
-            if (subBlockCount > 0) {
-              ElementPtr subblocksEl = Element::create("SubBlocks");
-              for (size_t indexSubBlock = 0; indexSubBlock < subBlockCount; ++indexSubBlock)
-              {
-                ElementPtr subblockEl = Element::create("SubBlock");
-                auto subBlock = format->subBlockAtIndex(indexSubBlock);
-                UseServicesHelper::debugAppend(subblockEl, "ssrc", subBlock->ssrc());
-                UseServicesHelper::debugAppend(subblockEl, "lrr", subBlock->lrr());
-                UseServicesHelper::debugAppend(subblockEl, "dlrr", subBlock->dlrr());
-                UseServicesHelper::debugAppend(subblocksEl, subblockEl);
-              }
-              UseServicesHelper::debugAppend(formatEl, subblocksEl);
-            }
+        for (auto *item = chunk->firstTool(); NULL != item; item = item->next())
+        {
+          pos[0] = Chunk::Tool::kItemType;
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8));
 
-            UseServicesHelper::debugAppend(formatEl, "next dlrr report block", (NULL != format->nextDLRRReportBlock()));
+          advancePos(pos, remaining, sizeof(WORD));
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+          if (len > 0) {
+            memcpy(pos, item->value(), len*sizeof(BYTE));
+            advancePos(pos, remaining, len*sizeof(BYTE));
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
+          ZS_LOG_INSANE(packet_slog("writing SDES Tool") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
         }
-      }
-
-      {
-        auto count = xr->statisticsSummaryReportBlockCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("StatisticsSummaryReportBlocks");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("StatisticsSummaryReportBlock");
 
-            auto format = xr->statisticsSummaryReportBlockAtIndex(index);
+        for (auto *item = chunk->firstNote(); NULL != item; item = item->next())
+        {
+          pos[0] = Chunk::Note::kItemType;
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8));
 
-            internal::toDebugReportBlockRange(formatEl, format);
+          advancePos(pos, remaining, sizeof(WORD));
 
-            UseServicesHelper::debugAppend(formatEl, "loss report flag", format->lossReportFlag());
-            UseServicesHelper::debugAppend(formatEl, "duplicate report flag", format->duplicateReportFlag());
-            UseServicesHelper::debugAppend(formatEl, "jitter report flag", format->jitterFlag());
-            UseServicesHelper::debugAppend(formatEl, "ttl flag", format->ttlFlag());
-            UseServicesHelper::debugAppend(formatEl, "hop limit flag", format->hopLimitFlag());
+          if (len > 0) {
+            memcpy(pos, item->value(), len*sizeof(BYTE));
+            advancePos(pos, remaining, len*sizeof(BYTE));
+          }
+          ZS_LOG_INSANE(packet_slog("writing SDES Note") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-            if (format->lossReportFlag()) {
-              UseServicesHelper::debugAppend(formatEl, "lost packets", format->lostPackets());
-            }
-            if (format->duplicateReportFlag()) {
-              UseServicesHelper::debugAppend(formatEl, "dup packets", format->dupPackets());
-            }
+        for (auto *item = chunk->firstPriv(); NULL != item; item = item->next())
+        {
+          pos[0] = Chunk::Priv::kItemType;
+          size_t len1 = (NULL != item->mPrefix ? strlen(item->mPrefix) : 0);
+          size_t len2 = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          size_t len = len1 + len2;
+          if (len > 0) ++len;
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8));
 
-            if (format->jitterFlag()) {
-              UseServicesHelper::debugAppend(formatEl, "min jitter", format->minJitter());
-              UseServicesHelper::debugAppend(formatEl, "max jitter", format->maxJitter());
-              UseServicesHelper::debugAppend(formatEl, "mean jitter", format->meanJitter());
-              UseServicesHelper::debugAppend(formatEl, "dev jitter", format->devJitter());
-            }
+          advancePos(pos, remaining, sizeof(WORD));
 
-            if (format->ttlFlag()) {
-              UseServicesHelper::debugAppend(formatEl, "min ttl", format->minTTL());
-              UseServicesHelper::debugAppend(formatEl, "max ttl", format->maxTTL());
-              UseServicesHelper::debugAppend(formatEl, "mean ttl", format->meanTTL());
-              UseServicesHelper::debugAppend(formatEl, "dev ttl", format->devTTL());
+          if (len > 0) {
+            pos[0] = static_cast<BYTE>(len1);
+            advancePos(pos, remaining);
+            if (len1 > 0) {
+              memcpy(pos, item->prefix(), len1*sizeof(BYTE));
+              advancePos(pos, remaining, len1*sizeof(BYTE));
             }
-
-            if (format->hopLimitFlag()) {
-              UseServicesHelper::debugAppend(formatEl, "min hop limit", format->minHopLimit());
-              UseServicesHelper::debugAppend(formatEl, "max hop limit", format->maxHopLimit());
-              UseServicesHelper::debugAppend(formatEl, "mean hop limit", format->meanHopLimit());
-              UseServicesHelper::debugAppend(formatEl, "dev hop limit", format->devHopLimit());
+            if (len2 > 0) {
+              memcpy(pos, item->value(), len2*sizeof(BYTE));
+              advancePos(pos, remaining, len2*sizeof(BYTE));
             }
-
-            UseServicesHelper::debugAppend(formatEl, "next statistics summary report block", (NULL != format->nextStatisticsSummaryReportBlock()));
-
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
+          ZS_LOG_INSANE(packet_slog("writing SDES Priv") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("prefix len", len1) + ZS_PARAM("prefix", (NULL != item->mPrefix ? item->mPrefix : NULL)) + ZS_PARAM("len", len2) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
         }
-      }
-
-      {
-        auto count = xr->voIPMetricsReportBlockCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("VoIPMetricsReportBlocks");
-
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("VoIPMetricsReportBlock");
 
-            auto format = xr->voIPMetricsReportBlockAtIndex(index);
-
-            internal::toDebugReportBlock(formatEl, format);
-
-            UseServicesHelper::debugAppend(formatEl, "ssrc of source", format->ssrcOfSource());
-
-            UseServicesHelper::debugAppend(formatEl, "loss rate", format->lossRate());
-            UseServicesHelper::debugAppend(formatEl, "discard rate", format->discardRate());
-            UseServicesHelper::debugAppend(formatEl, "burst density", format->burstDensity());
-            UseServicesHelper::debugAppend(formatEl, "gap densitity", format->gapDensity());
-
-            UseServicesHelper::debugAppend(formatEl, "burst duration", format->burstDuration());
-            UseServicesHelper::debugAppend(formatEl, "gap duration", format->gapDuration());
-
-            UseServicesHelper::debugAppend(formatEl, "round trip delay", format->roundTripDelay());
-            UseServicesHelper::debugAppend(formatEl, "end system delay", format->endSystemDelay());
-
-            UseServicesHelper::debugAppend(formatEl, "signal level", format->signalLevel());
-            UseServicesHelper::debugAppend(formatEl, "noise level", format->noiseLevel());
-            UseServicesHelper::debugAppend(formatEl, "rerl", format->rerl());
-            UseServicesHelper::debugAppend(formatEl, "Gmin", format->Gmin());
+        for (auto *item = chunk->firstMid(); NULL != item; item = item->next())
+        {
+          pos[0] = Chunk::Mid::kItemType;
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8));
 
-            UseServicesHelper::debugAppend(formatEl, "r factor", format->rFactor());
-            UseServicesHelper::debugAppend(formatEl, "ext r factor", format->extRFactor());
-            UseServicesHelper::debugAppend(formatEl, "moslq", format->mosLQ());
-            UseServicesHelper::debugAppend(formatEl, "moscq", format->mosCQ());
+          advancePos(pos, remaining, sizeof(WORD));
 
-            UseServicesHelper::debugAppend(formatEl, "rx config", format->rxConfig());
-            UseServicesHelper::debugAppend(formatEl, "plc", format->plc());
-            UseServicesHelper::debugAppend(formatEl, "jba", format->jba());
-            UseServicesHelper::debugAppend(formatEl, "jb rate", format->jbRate());
+          if (len > 0) {
+            memcpy(pos, item->value(), len*sizeof(BYTE));
+            advancePos(pos, remaining, len*sizeof(BYTE));
+          }
+          ZS_LOG_INSANE(packet_slog("writing SDES Mid report") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-            UseServicesHelper::debugAppend(formatEl, "jb nominal", format->jbNominal());
-            UseServicesHelper::debugAppend(formatEl, "jb maximum", format->jbMaximum());
-            UseServicesHelper::debugAppend(formatEl, "jb abs max", format->jbAbsMax());
+        for (auto *item = chunk->firstRid(); NULL != item; item = item->next())
+        {
+          pos[0] = Chunk::Rid::kItemType;
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8));
 
-            UseServicesHelper::debugAppend(formatEl, "next voip metrics report block", (NULL != format->nextVoIPMetricsReportBlock()));
+          advancePos(pos, remaining, sizeof(WORD));
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
+          if (len > 0) {
+            memcpy(pos, item->value(), len*sizeof(BYTE));
+            advancePos(pos, remaining, len*sizeof(BYTE));
           }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
+          ZS_LOG_INSANE(packet_slog("writing SDES Rid report") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
         }
-      }
 
-      {
-        auto count = xr->unknownReportBlockCount();
-        if (count > 0) {
-          ElementPtr formatsEl = Element::create("UnknownReportBlocks");
+        for (auto *item = chunk->firstUnknown(); NULL != item; item = item->next())
+        {
+          pos[0] = item->type();
+          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
+          pos[1] = static_cast<BYTE>(len);
+          ASSERT(throwIfGreaterThanBitsAllow(len, 8));
 
-          for (size_t index = 0; index < count; ++index) {
-            ElementPtr formatEl = Element::create("UnknownReportBlock");
+          advancePos(pos, remaining, sizeof(WORD));
 
-            auto format = xr->unknownReportBlockAtIndex(index);
+          if (len > 0) {
+            memcpy(pos, item->value(), len*sizeof(BYTE));
+            advancePos(pos, remaining, len*sizeof(BYTE));
+          }
+          ZS_LOG_INSANE(packet_slog("writing SDES Unknown") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("type", item->mType) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        }
 
-            internal::toDebugReportBlock(formatEl, format);
+        BYTE *endPos = pos;
 
-            UseServicesHelper::debugAppend(formatEl, "next unknown report block", (NULL != format->nextUnknownReportBlock()));
+        PTRNUMBER diff = reinterpret_cast<PTRNUMBER>(endPos) - reinterpret_cast<PTRNUMBER>(startPos);
+        auto modulas = (diff % sizeof(DWORD));
+        if (0 != modulas) {
+          advancePos(pos, remaining, sizeof(DWORD)-modulas);
+        }
 
-            UseServicesHelper::debugAppend(formatsEl, formatEl);
-          }
-          UseServicesHelper::debugAppend(subEl, formatsEl);
+        if ((0 == diff) ||
+            (0 == modulas)) {
+          // write "empty" chunk
+          UseRTPUtils::setBE32(pos, 0);
+          advancePos(pos, remaining, sizeof(DWORD));
         }
       }
 
-      UseServicesHelper::debugAppend(subEl, "next xr", (NULL != xr->nextXR()));
-      return subEl;
+      throwIfGreaterThanBitsAllow(chunkCount, 5);
     }
-
+    
     //-------------------------------------------------------------------------
-    ElementPtr RTCPPacket::toDebug() const
+    static void writePacketBye(const RTCPPacket::Bye *report, BYTE * &pos, size_t &remaining)
     {
-      ElementPtr objectEl = Element::create("ortc::RTCPPacket");
-
-      UseServicesHelper::debugAppend(objectEl, "buffer", mBuffer ? mBuffer->SizeInBytes() : 0);
-      UseServicesHelper::debugAppend(objectEl, "allocate buffer", mAllocationBuffer ? mAllocationBuffer->SizeInBytes() : 0);
+      typedef RTCPPacket::Bye Bye;
+      pos[1] = Bye::kPayloadType;
 
-      UseServicesHelper::debugAppend(objectEl, "allocation pos", (NULL != mAllocationPos ? (mAllocationBuffer ? (reinterpret_cast<PTRNUMBER>(mAllocationPos) - reinterpret_cast<PTRNUMBER>(mAllocationBuffer->BytePtr())) : reinterpret_cast<PTRNUMBER>(mAllocationPos)) : 0));
-      UseServicesHelper::debugAppend(objectEl, "buffer", mAllocationSize);
+      advancePos(pos, remaining, sizeof(DWORD));
 
-      for (Report *report = mFirst; NULL != report; report = report->next())
+      for (size_t index = 0; index < report->sc(); ++index)
       {
-        switch (report->pt()) {
-          case SenderReport::kPayloadType:
-          {
-            SenderReport *sr = static_cast<SenderReport *>(report);
-            UseServicesHelper::debugAppend(objectEl, toDebugSenderReport(sr));
-            break;
-          }
-          case ReceiverReport::kPayloadType:
-          {
-            ReceiverReport *rr = static_cast<ReceiverReport *>(report);
-            UseServicesHelper::debugAppend(objectEl, toDebugReceiverReport(rr));
-            break;
-          }
-          case SDES::kPayloadType:
-          {
-            SDES *sdes = static_cast<SDES *>(report);
-            UseServicesHelper::debugAppend(objectEl, toDebugSDES(sdes));
-            break;
-          }
-          case Bye::kPayloadType:
-          {
-            Bye *bye = static_cast<Bye *>(report);
-            UseServicesHelper::debugAppend(objectEl, toDebugBye(bye));
-            break;
-          }
-          case App::kPayloadType:
-          {
-            App *app = static_cast<App *>(report);
-            UseServicesHelper::debugAppend(objectEl, toDebugApp(app));
-            break;
-          }
-          case TransportLayerFeedbackMessage::kPayloadType:
-          {
-            TransportLayerFeedbackMessage *fm = static_cast<TransportLayerFeedbackMessage *>(report);
-            UseServicesHelper::debugAppend(objectEl, toDebugTransportLayerFeedbackMessage(fm));
-            break;
-          }
-          case PayloadSpecificFeedbackMessage::kPayloadType:
-          {
-            PayloadSpecificFeedbackMessage *fm = static_cast<PayloadSpecificFeedbackMessage *>(report);
-            UseServicesHelper::debugAppend(objectEl, toDebugPayloadSpecificFeedbackMessage(fm));
-            break;
-          }
-          case XR::kPayloadType:
-          {
-            XR *xr = static_cast<XR *>(report);
-            UseServicesHelper::debugAppend(objectEl, toDebugXR(xr));
-            break;
-          }
-          default:
-          {
-            UnknownReport *unknown = static_cast<UnknownReport *>(report);
-
-            ElementPtr subEl = Element::create("UnknownReport");
-            internal::toDebug(subEl, unknown);
-
-            UseServicesHelper::debugAppend(subEl, "next unknown", (NULL != unknown->nextUnknown()));
+        UseRTPUtils::setBE32(pos, report->ssrc(index));
+        advancePos(pos, remaining, sizeof(DWORD));
+      }
 
-            UseServicesHelper::debugAppend(objectEl, subEl);
-            break;
-          }
+      if (NULL != report->reasonForLeaving()) {
+        size_t len = strlen(report->reasonForLeaving());
+        if (len > 0) {
+          pos[0] = static_cast<BYTE>(len);
+          memcpy(&(pos[1]), report->reasonForLeaving(), len*sizeof(BYTE));
+          advancePos(pos, remaining, (len*sizeof(BYTE))+sizeof(BYTE));
         }
       }
-
-      return objectEl;
     }
 
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket (internal)
-    #pragma mark
-
     //-------------------------------------------------------------------------
-    Log::Params RTCPPacket::slog(const char *message)
+    static void writePacketApp(const RTCPPacket::App *report, BYTE * &pos, size_t &remaining)
     {
-      return packet_slog(message);
-    }
+      typedef RTCPPacket::App App;
+      pos[1] = App::kPayloadType;
 
-    //-------------------------------------------------------------------------
-    Log::Params RTCPPacket::log(const char *message) const
-    {
-      ElementPtr objectEl = Element::create("ortc::RTCPPacket");
-      return Log::Params(message, objectEl);
-    }
+      UseRTPUtils::setBE32(&(pos[4]), report->ssrc());
+      memcpy(&(pos[8]), report->name(), sizeof(DWORD));
 
-    //-------------------------------------------------------------------------
-    Log::Params RTCPPacket::debug(const char *message) const
-    {
-      return Log::Params(message, toDebug());
+      advancePos(pos, remaining, sizeof(DWORD)*3);
+
+      size_t dataSize = report->dataSize();
+      if (0 != dataSize) {
+        memcpy(pos, report->data(), dataSize);
+        advancePos(pos, remaining, dataSize);
+      }
     }
 
     //-------------------------------------------------------------------------
-    bool RTCPPacket::parse()
+    static void writePacketTransportLayerFeedbackMessage(const RTCPPacket::TransportLayerFeedbackMessage *report, BYTE * &pos, size_t &remaining)
     {
-      const BYTE *buffer = mBuffer->BytePtr();
-      size_t size = mBuffer->SizeInBytes();
+      typedef RTCPPacket::TransportLayerFeedbackMessage TransportLayerFeedbackMessage;
+      typedef RTCPPacket::TransportLayerFeedbackMessage::GenericNACK GenericNACK;
+      typedef RTCPPacket::TransportLayerFeedbackMessage::TMMBR TMMBR;
+      typedef RTCPPacket::TransportLayerFeedbackMessage::TMMBN TMMBN;
 
-      if (size < kMinRtcpPacketLen) {
-        ZS_LOG_WARNING(Trace, log("packet length is too short") + ZS_PARAM("length", size))
-        return false;
-      }
+      pos[1] = TransportLayerFeedbackMessage::kPayloadType;
 
-      bool foundPaddingBit = false;
+      UseRTPUtils::setBE32(&(pos[4]), report->ssrcOfPacketSender());
+      UseRTPUtils::setBE32(&(pos[8]), report->ssrcOfMediaSource());
 
-      // scope: calculate total memory allocation size needed to parse entire RTCP packet
-      {
-        size_t remaining = size;
-        const BYTE *pos = buffer;
+      advancePos(pos, remaining, sizeof(DWORD)*3);
 
-        while (remaining >= kMinRtcpPacketLen) {
-          auto version = RTCP_GET_BITS(*pos, 0x3, 6);
-          if (kRtpVersion != version) {
-            ZS_LOG_WARNING(Trace, debug("illegal version found") + ZS_PARAM("version", version))
-            return false;
+      switch (report->fmt()) {
+        case GenericNACK::kFmt:
+        {
+          auto count = report->genericNACKCount();
+
+          for (size_t index = 0; index < count; ++index)
+          {
+            auto item = report->genericNACKAtIndex(index);
+            UseRTPUtils::setBE16(&(pos[0]), item->pid());
+            UseRTPUtils::setBE16(&(pos[2]), item->blp());
+            advancePos(pos, remaining, sizeof(DWORD));
           }
+          break;
+        }
+        case TMMBR::kFmt:
+        {
+          auto count = report->tmmbrCount();
 
-          size_t length = sizeof(DWORD) + (static_cast<size_t>(RTPUtils::getBE16(&(pos[2]))) * sizeof(DWORD));
+          for (size_t index = 0; index < count; ++index)
+          {
+            auto item = report->tmmbrAtIndex(index);
+            UseRTPUtils::setBE32(&(pos[0]), item->ssrc());
 
-          size_t padding = 0;
+            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(item->mxTBRExp()), 0x3F, 26) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(item->mxTBRMantissa()), 0x1FFFF, 9) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(item->measuredOverhead()), 0x1FF, 0);
 
-          if (RTCP_IS_FLAG_SET(*pos, 5)) {
-            if (foundPaddingBit) {
-              ZS_LOG_WARNING(Trace, debug("found illegal second padding bit set in compound RTCP block"))
-              return false;
-            }
+            UseRTPUtils::setBE32(&(pos[4]), merged);
 
-            padding = buffer[size-1];
+            advancePos(pos, remaining, sizeof(DWORD)*2);
           }
+          break;
+        }
+        case TMMBN::kFmt:
+        {
+          auto count = report->tmmbnCount();
 
-          if ((sizeof(DWORD) + padding) > length) {
-            ZS_LOG_WARNING(Trace, debug("malformed padding size in RTCP packet"))
-            return false;
-          }
+          for (size_t index = 0; index < count; ++index)
+          {
+            auto item = report->tmmbnAtIndex(index);
+            UseRTPUtils::setBE32(&(pos[0]), item->ssrc());
 
-          length -= padding;
+            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(item->mxTBRExp()), 0x3F, 26) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(item->mxTBRMantissa()), 0x1FFFF, 9) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(item->measuredOverhead()), 0x1FF, 0);
 
-          if (remaining < length) {
-            ZS_LOG_WARNING(Trace, debug("insufficient length remaining for RTCP block") + ZS_PARAM("length", length) + ZS_PARAM("remaining", remaining))
-            return false;
+            UseRTPUtils::setBE32(&(pos[4]), merged);
+
+            advancePos(pos, remaining, sizeof(DWORD)*2);
+          }
+          break;
+        }
+        default:
+        {
+          auto fciSize = report->fciSize();
+          if (0 != fciSize) {
+            memcpy(pos, report->fci(), report->fciSize());
+            advancePos(pos, remaining, report->fciSize());
           }
+          break;
+        }
+      }
 
-          BYTE reportSpecific = RTCP_GET_BITS(*pos, 0x1F, 0);
+      ZS_LOG_INSANE(packet_slog("writing transport layer feedback message") + ZS_PARAM("fmt", report->fmtToString()) + ZS_PARAM("fmt (number)", report->reportSpecific()))
+    }
+    
+    //-------------------------------------------------------------------------
+    static void writePacketPayloadSpecificFeedbackMessage(const RTCPPacket::PayloadSpecificFeedbackMessage *report, BYTE * &pos, size_t &remaining)
+    {
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage PayloadSpecificFeedbackMessage;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::PLI PLI;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::SLI SLI;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::RPSI RPSI;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::FIR FIR;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::TSTR TSTR;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::TSTN TSTN;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::VBCM VBCM;
+      typedef RTCPPacket::PayloadSpecificFeedbackMessage::AFB AFB;
+      //typedef RTCPPacket::PayloadSpecificFeedbackMessage::REMB REMB;
 
-          const BYTE *prePos = pos;
-          BYTE pt = pos[1];
+      pos[1] = PayloadSpecificFeedbackMessage::kPayloadType;
 
-          advancePos(pos, remaining, sizeof(DWORD));
+      UseRTPUtils::setBE32(&(pos[4]), report->ssrcOfPacketSender());
+      UseRTPUtils::setBE32(&(pos[8]), report->ssrcOfMediaSource());
 
-          size_t preAllocationSize = mAllocationSize;
+      advancePos(pos, remaining, sizeof(DWORD)*3);
 
-          if (!getAllocationSize(static_cast<BYTE>(version), static_cast<BYTE>(padding), reportSpecific, pt, pos, static_cast<size_t>(length - sizeof(DWORD)))) return false;
+      switch (report->fmt()) {
+        case PLI::kFmt:
+        {
+          break;
+        }
+        case SLI::kFmt:
+        {
+          auto count = report->sliCount();
 
-          advancePos(pos, remaining, length - sizeof(DWORD));
+          for (size_t index = 0; index < count; ++index)
+          {
+            auto item = report->sliAtIndex(index);
 
-          if (0 != padding) {
-            advancePos(pos, remaining, padding);
-          }
+            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(item->first()), 0x1FFF, 19) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(item->number()), 0x1FFF, 6) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(item->pictureID()), 0x3F, 0);
 
-          if (ZS_IS_LOGGING(Insane)) {
-            ZS_LOG_TRACE(log("report allocation size") + ZS_PARAM("pt", Report::ptToString(pt)) + ZS_PARAM("pt (number)", pt) + ZS_PARAM("consumed", (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(prePos))) + ZS_PARAM("allocation size", mAllocationSize - preAllocationSize))
+            UseRTPUtils::setBE32(&(pos[0]), merged);
+            advancePos(pos, remaining, sizeof(DWORD));
           }
-
-          ++mCount;
+          break;
         }
-      }
+        case RPSI::kFmt:
+        {
+          auto rpsi = report->rpsi();
 
-      if (0 == mAllocationSize) {
-        ZS_LOG_TRACE(debug("no RTCP packets were processed"))
-        return true;
-      }
+          pos[1] = RTCP_PACK_BITS(static_cast<BYTE>(rpsi->zeroBit()), 0x1, 7) |
+                    RTCP_PACK_BITS(static_cast<BYTE>(rpsi->payloadType()), 0x7F, 0);
 
-      mAllocationBuffer = make_shared<SecureByteBlock>(alignedSize(mAllocationSize));
+          auto totalBits = static_cast<size_t>(rpsi->nativeRPSIBitStringSizeInBits());
 
-      mAllocationPos = mAllocationBuffer->BytePtr();
+          size_t byteModulas = (totalBits%8);
 
-      // scope: allocation size is now established; begin parsing all reports contained in RTCP packet
-      {
-        size_t remaining = size;
-        const BYTE *pos = buffer;
+          size_t totalBytes = (totalBits/8) + ((0 != byteModulas) ? 1 : 0);
+          if (0 != totalBytes) {
+            memcpy(&(pos[2]), rpsi->nativeRPSIBitString(), totalBytes);
+            if (0 != byteModulas) {
+              BYTE &by = (pos[2+totalBytes-1]);
+              by = by & static_cast<BYTE>(((1 << byteModulas)-1) << (8-byteModulas));
+            }
+          }
 
+          size_t totalSizeInBits = (sizeof(WORD)*8)+(totalBits);
+          auto boundaryModulas = totalSizeInBits % (sizeof(DWORD)*8);
 
-        if (0 != mSenderReportCount) {
-          mFirstSenderReport = new (allocateBuffer(alignedSize(sizeof(SenderReport)) * mSenderReportCount)) SenderReport[mSenderReportCount];
-        }
-        if (0 != mReceiverReportCount) {
-          mFirstReceiverReport = new (allocateBuffer(alignedSize(sizeof(ReceiverReport)) * mReceiverReportCount)) ReceiverReport[mReceiverReportCount];
-        }
-        if (0 != mSDESCount) {
-          mFirstSDES = new (allocateBuffer(alignedSize(sizeof(SDES)) * mSDESCount)) SDES[mSDESCount];
-        }
-        if (0 != mByeCount) {
-          mFirstBye = new (allocateBuffer(alignedSize(sizeof(Bye)) * mByeCount)) Bye[mByeCount];
-        }
-        if (0 != mAppCount) {
-          mFirstApp = new (allocateBuffer(alignedSize(sizeof(App)) * mAppCount)) App[mAppCount];
-        }
-        if (0 != mTransportLayerFeedbackMessageCount) {
-          mFirstTransportLayerFeedbackMessage = new (allocateBuffer(alignedSize(sizeof(TransportLayerFeedbackMessage)) * mTransportLayerFeedbackMessageCount)) TransportLayerFeedbackMessage[mTransportLayerFeedbackMessageCount];
-        }
-        if (0 != mPayloadSpecificFeedbackMessageCount) {
-          mFirstPayloadSpecificFeedbackMessage = new (allocateBuffer(alignedSize(sizeof(PayloadSpecificFeedbackMessage)) * mPayloadSpecificFeedbackMessageCount)) PayloadSpecificFeedbackMessage[mPayloadSpecificFeedbackMessageCount];
-        }
-        if (0 != mXRCount) {
-          mFirstXR = new (allocateBuffer(alignedSize(sizeof(XR)) * mXRCount)) XR[mXRCount];
-        }
-        if (0 != mUnknownReportCount) {
-          mFirstUnknownReport = new (allocateBuffer(alignedSize(sizeof(UnknownReport)) * mUnknownReportCount)) UnknownReport[mUnknownReportCount];
-        }
+          if (0 != boundaryModulas) {
+            pos[0] = static_cast<BYTE>((sizeof(DWORD)*8)-boundaryModulas);
+          } else {
+            pos[0] = 0;
+          }
 
-        mSenderReportCount = 0;
-        mReceiverReportCount = 0;
-        mSDESCount = 0;
-        mByeCount = 0;
-        mAppCount = 0;
-        mTransportLayerFeedbackMessageCount = 0;
-        mPayloadSpecificFeedbackMessageCount = 0;
-        mXRCount = 0;
-        mUnknownReportCount = 0;
+          advancePos(pos, remaining, sizeof(WORD)+(sizeof(BYTE)*totalBytes));
+          break;
+        }
+        case FIR::kFmt:
+        {
+          auto count = report->firCount();
 
-        Report *lastReport = NULL;
-        size_t count = 0;
+          for (size_t index = 0; index < count; ++index)
+          {
+            auto item = report->firAtIndex(index);
+            UseRTPUtils::setBE32(&(pos[0]), item->ssrc());
+            UseRTPUtils::setBE32(&(pos[4]), item->reserved());
+            pos[4] = item->seqNr();
+            advancePos(pos, remaining, sizeof(DWORD)*2);
+          }
+          break;
+        }
+        case TSTR::kFmt:
+        {
+          auto count = report->tstrCount();
 
-        while (remaining >= kMinRtcpPacketLen) {
-          auto version = RTCP_GET_BITS(*pos, 0x3, 6);
-          size_t length = sizeof(DWORD) + (static_cast<size_t>(RTPUtils::getBE16(&(pos[2]))) * sizeof(DWORD));
+          for (size_t index = 0; index < count; ++index)
+          {
+            auto item = report->tstrAtIndex(index);
+            UseRTPUtils::setBE32(&(pos[0]), item->ssrc());
 
-          size_t padding = 0;
+            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(item->seqNr()), 0xFF, 24) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(item->reserved()), 0x7FFFF, 5) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(item->index()), 0x1F, 0);
 
-          if (RTCP_IS_FLAG_SET(*pos, 5)) {
-            padding = buffer[size-1];
-            length -= padding; // already protected during pre-parse against malformed padding length
+            UseRTPUtils::setBE32(&(pos[4]), merged);
+            advancePos(pos, remaining, sizeof(DWORD)*2);
           }
+          break;
+        }
+        case TSTN::kFmt:
+        {
+          auto count = report->tstnCount();
 
-          BYTE reportSpecific = RTCP_GET_BITS(*pos, 0x1F, 0);
-
-          const BYTE *prePos = pos;
-          BYTE pt = pos[1];
+          for (size_t index = 0; index < count; ++index)
+          {
+            auto item = report->tstnAtIndex(index);
+            UseRTPUtils::setBE32(&(pos[0]), item->ssrc());
 
-          advancePos(pos, remaining, sizeof(DWORD));
+            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(item->seqNr()), 0xFF, 24) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(item->reserved()), 0x7FFFF, 5) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(item->index()), 0x1F, 0);
 
-          size_t preAllocationSize = mAllocationSize;
+            UseRTPUtils::setBE32(&(pos[4]), merged);
+            advancePos(pos, remaining, sizeof(DWORD)*2);
+          }
+          break;
+        }
+        case VBCM::kFmt:
+        {
+          auto count = report->vbcmCount();
 
-          if (!parse(lastReport, version, static_cast<BYTE>(padding), reportSpecific, pt, pos, length - sizeof(DWORD))) return false;
+          for (size_t index = 0; index < count; ++index)
+          {
+            auto item = report->vbcmAtIndex(index);
 
-          if (NULL == mFirst) {
-            mFirst = lastReport;
-          }
+            UseRTPUtils::setBE32(&(pos[0]), item->ssrc());
 
-          advancePos(pos, remaining, length - sizeof(DWORD));
+            pos[4] = item->seqNr();
+            pos[5] = RTCP_PACK_BITS(static_cast<BYTE>(item->zeroBit()), 0x1, 7) |
+                      RTCP_PACK_BITS(static_cast<BYTE>(item->payloadType()), 0x7F, 0);
 
-          if (0 != padding) {
-            advancePos(pos, remaining, padding);
-          }
+            auto size = item->vbcmOctetStringSize();
+            if (0 != size) {
+              UseRTPUtils::setBE16(&(pos[6]), static_cast<WORD>(size));
+              memcpy(&(pos[8]), item->vbcmOctetString(), size*sizeof(BYTE));
+            }
 
-          if (ZS_IS_LOGGING(Insane)) {
-            ZS_LOG_TRACE(log("report parsed") + ZS_PARAM("pt", Report::ptToString(pt)) + ZS_PARAM("pt (number)", pt) + ZS_PARAM("consumed", (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(prePos))) + ZS_PARAM("consumed allocation", preAllocationSize - mAllocationSize))
+            advancePos(pos, remaining, boundarySize((sizeof(DWORD)*2)+(size*sizeof(BYTE))));
           }
-
-          ++count;
-          ASSERT(count <= mCount)
+          break;
         }
-      }
-
-      ZS_LOG_INSANE(debug("parsed"))
+        case AFB::kFmt:
+        {
 
-      return true;
-    }
+          auto remb = report->remb();
+          if (NULL == remb) {
+            auto afb = report->afb();
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket (parse allocation sizing routines)
-    #pragma mark
+            size_t size = afb->dataSize();
+            if (0 != size) {
+              memcpy(pos, afb->data(), size*sizeof(BYTE));
+              advancePos(pos, remaining, boundarySize(size*sizeof(BYTE)));
+            }
+          } else {
+            memcpy(pos, "REMB", sizeof(DWORD));
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getAllocationSize(
-                                       BYTE version,
-                                       BYTE padding,
-                                       BYTE reportSpecific,
-                                       BYTE pt,
-                                       const BYTE *contents,
-                                       size_t contentSize
-                                       )
-    {
-      bool result = false;
+            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(remb->brExp()), 0x3F, 18) |
+                            RTCP_PACK_BITS(static_cast<DWORD>(remb->brMantissa()), 0x3FFFF, 0);
+            UseRTPUtils::setBE32(&(pos[4]), merged);
+            pos[4] = static_cast<BYTE>(remb->numSSRC());
+            advancePos(pos, remaining, sizeof(DWORD)*2);
 
-      switch (pt) {
-        case SenderReport::kPayloadType:                    result = getSenderReportAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
-        case ReceiverReport::kPayloadType:                  result = getReceiverReportAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
-        case SDES::kPayloadType:                            result = getSDESAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
-        case Bye::kPayloadType:                             result = getByeAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
-        case App::kPayloadType:                             result = getAppAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
-        case TransportLayerFeedbackMessage::kPayloadType:   result = getTransportLayerFeedbackMessageAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
-        case PayloadSpecificFeedbackMessage::kPayloadType:  result = getPayloadSpecificFeedbackMessageAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
-        case XR::kPayloadType:                              result = getXRAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
+            auto count = remb->numSSRC();
+            for (size_t index = 0; index < count; ++index)
+            {
+              auto ssrc = remb->ssrcAtIndex(index);
+              UseRTPUtils::setBE32(pos, ssrc);
+              advancePos(pos, remaining, sizeof(DWORD));
+            }
+          }
+          break;
+        }
         default:
         {
-          result = getUnknownReportAllocationSize(version, padding, reportSpecific, contents, contentSize);
+          auto fciSize = report->fciSize();
+          if (0 != fciSize) {
+            memcpy(pos, report->fci(), fciSize);
+            advancePos(pos, remaining, fciSize);
+          }
           break;
         }
       }
-      return result;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getSenderReportAllocationSize(
-                                                   BYTE version,
-                                                   BYTE padding,
-                                                   BYTE reportSpecific,
-                                                   const BYTE *contents,
-                                                   size_t contentSize
-                                                   )
-    {
-      ++mSenderReportCount;
-
-      mAllocationSize += alignedSize(sizeof(SenderReport)) + (alignedSize(sizeof(SenderReport::ReportBlock)) * static_cast<size_t>(reportSpecific));
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getReceiverReportAllocationSize(
-                                                     BYTE version,
-                                                     BYTE padding,
-                                                     BYTE reportSpecific,
-                                                     const BYTE *contents,
-                                                     size_t contentSize
-                                                     )
-    {
-      ++mReceiverReportCount;
-
-      mAllocationSize += alignedSize(sizeof(ReceiverReport)) + (alignedSize(sizeof(ReceiverReport::ReportBlock)) * static_cast<size_t>(reportSpecific));
-      return true;
+      ZS_LOG_INSANE(packet_slog("writing payload specific feedback message") + ZS_PARAM("fmt", report->fmtToString()) + ZS_PARAM("fmt (number)", report->reportSpecific()))
     }
 
     //-------------------------------------------------------------------------
-    bool RTCPPacket::getSDESAllocationSize(
-                                           BYTE version,
-                                           BYTE padding,
-                                           BYTE reportSpecific,
-                                           const BYTE *contents,
-                                           size_t contentSize
-                                           )
+    static void writePacketXR(const RTCPPacket::XR *report, BYTE * &pos, size_t &remaining)
     {
-      ++mSDESCount;
-
-      size_t chunksCount = static_cast<size_t>(reportSpecific);
-
-      mAllocationSize += alignedSize(sizeof(SDES)) + (alignedSize(sizeof(SDES::Chunk)) * chunksCount);
+      typedef RTCPPacket::XR XR;
+      typedef RTCPPacket::XR::ReportBlock ReportBlock;
+      typedef RTCPPacket::XR::LossRLEReportBlock LossRLEReportBlock;
+      typedef RTCPPacket::XR::DuplicateRLEReportBlock DuplicateRLEReportBlock;
+      typedef RTCPPacket::XR::PacketReceiptTimesReportBlock PacketReceiptTimesReportBlock;
+      typedef RTCPPacket::XR::ReceiverReferenceTimeReportBlock ReceiverReferenceTimeReportBlock;
+      typedef RTCPPacket::XR::DLRRReportBlock DLRRReportBlock;
+      typedef RTCPPacket::XR::StatisticsSummaryReportBlock StatisticsSummaryReportBlock;
+      typedef RTCPPacket::XR::VoIPMetricsReportBlock VoIPMetricsReportBlock;
+      typedef RTCPPacket::XR::UnknownReportBlock UnknownReportBlock;
+      typedef RTCPPacket::XR::RLEChunk RLEChunk;
 
-      size_t remaining = contentSize;
+      pos[1] = XR::kPayloadType;
+      UseRTPUtils::setBE32(&(pos[4]), report->mSSRC);
 
-      const BYTE *pos = contents;
+      advancePos(pos, remaining, sizeof(DWORD)*2);
 
-      while ((remaining > sizeof(DWORD)) &&
-             (chunksCount > 0))
+      for (const ReportBlock *reportBlock = report->firstReportBlock(); NULL != reportBlock; reportBlock = reportBlock->next())
       {
-        advancePos(pos, remaining, sizeof(DWORD));
-
-        ZS_LOG_INSANE(log("getting SDES chunk allocation size") + ZS_PARAM("chunk number", static_cast<size_t>(reportSpecific) - chunksCount))
+        BYTE *blockStart = pos;
 
-        --chunksCount;
+        pos[0] = reportBlock->blockType();
+        pos[1] = reportBlock->typeSpecific();
 
-        while (remaining >= sizeof(BYTE)) {
+        advancePos(pos, remaining, sizeof(DWORD));
 
-          size_t preAllocationSize = mAllocationSize;
+        switch (reportBlock->mBlockType) {
+          case LossRLEReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const LossRLEReportBlock *>(reportBlock);
 
-          BYTE type = *pos;
-          advancePos(pos, remaining);
+            UseRTPUtils::setBE32(&(pos[0]), block->ssrcOfSource());
+            UseRTPUtils::setBE16(&(pos[4]), block->beginSeq());
+            UseRTPUtils::setBE16(&(pos[6]), block->endSeq());
 
-          if (SDES::Chunk::kEndOfItemsType == type) {
-            // skip NUL item (no length octet is present)
+            advancePos(pos, remaining, sizeof(DWORD)*2);
 
-            // skip to next DWORD alignment
-            auto diff = reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(contents);
-            while ((0 != (diff % sizeof(DWORD))) &&
-                   (remaining > 0))
+            size_t chunkCount = block->chunkCount();
+            for (size_t index = 0; index < chunkCount; ++index)
             {
-              // only NUL chunks are allowed
-              if (SDES::Chunk::kEndOfItemsType != (*pos)) {
-                ZS_LOG_WARNING(Insane, log("SDES item type is not understood") + ZS_PARAM("type", *pos))
-                return false;
-              }
-
-              advancePos(pos, remaining);
-              ++diff;
+              RLEChunk chunk = block->chunkAtIndex(index);
+              UseRTPUtils::setBE16(pos, chunk);
+              advancePos(pos, remaining, sizeof(WORD));
             }
             break;
           }
+          case DuplicateRLEReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const DuplicateRLEReportBlock *>(reportBlock);
 
-          if (remaining < sizeof(BYTE)) {
-            ZS_LOG_WARNING(Trace, log("no length of SDES entry present") + ZS_PARAM("remaining", remaining))
-            return false;
-          }
-
-          size_t prefixLength = 0;
-          size_t length = static_cast<size_t>(*pos);
-          advancePos(pos, remaining);
+            UseRTPUtils::setBE32(&(pos[0]), block->ssrcOfSource());
+            UseRTPUtils::setBE16(&(pos[4]), block->beginSeq());
+            UseRTPUtils::setBE16(&(pos[6]), block->endSeq());
 
-          if (remaining < length) {
-            ZS_LOG_WARNING(Trace, debug("malformed SDES length found") + ZS_PARAM("length", length) + ZS_PARAM("remaining", remaining))
-            return false;
-          }
+            advancePos(pos, remaining, sizeof(DWORD)*2);
 
-          switch (type) {
-            case SDES::Chunk::CName::kItemType: mAllocationSize += alignedSize(sizeof(SDES::Chunk::CName)); break;
-            case SDES::Chunk::Name::kItemType:  mAllocationSize += alignedSize(sizeof(SDES::Chunk::Name)); break;
-            case SDES::Chunk::Email::kItemType: mAllocationSize += alignedSize(sizeof(SDES::Chunk::Email)); break;
-            case SDES::Chunk::Phone::kItemType: mAllocationSize += alignedSize(sizeof(SDES::Chunk::Phone)); break;
-            case SDES::Chunk::Loc::kItemType:   mAllocationSize += alignedSize(sizeof(SDES::Chunk::Loc)); break;
-            case SDES::Chunk::Tool::kItemType:  mAllocationSize += alignedSize(sizeof(SDES::Chunk::Tool)); break;
-            case SDES::Chunk::Note::kItemType:  mAllocationSize += alignedSize(sizeof(SDES::Chunk::Note)); break;
-            case SDES::Chunk::Priv::kItemType:
+            size_t count = block->chunkCount();
+            for (size_t index = 0; index < count; ++index)
             {
-              {
-                mAllocationSize += alignedSize(sizeof(SDES::Chunk::Priv));
+              RLEChunk chunk = block->chunkAtIndex(index);
+              UseRTPUtils::setBE16(pos, chunk);
+              advancePos(pos, remaining, sizeof(WORD));
+            }
+            break;
+          }
+          case PacketReceiptTimesReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const PacketReceiptTimesReportBlock *>(reportBlock);
 
-                if (length > 0) {
-                  prefixLength = static_cast<size_t>(*pos);
+            UseRTPUtils::setBE32(&(pos[0]), block->ssrcOfSource());
+            UseRTPUtils::setBE16(&(pos[4]), block->beginSeq());
+            UseRTPUtils::setBE16(&(pos[6]), block->endSeq());
 
-                  if (prefixLength > (length-1)) goto illegal_priv_prefix;
+            advancePos(pos, remaining, sizeof(DWORD)*2);
 
-                  if (0 != prefixLength) {
-                    mAllocationSize += alignedSize(sizeof(char)*(prefixLength+1));
-                  }
-                }
-                break;
-              }
-            illegal_priv_prefix:
-              {
-                ZS_LOG_WARNING(Trace, debug("malformed SDES Priv prefix found"))
-                return false;
-              }
-              break;
-            }
-            case SDES::Chunk::Mid::kItemType:  mAllocationSize += alignedSize(sizeof(SDES::Chunk::Mid)); break;
-            case SDES::Chunk::Rid::kItemType:  mAllocationSize += alignedSize(sizeof(SDES::Chunk::Rid)); break;
-            default:
+            size_t count = block->receiptTimeCount();
+            for (size_t index = 0; index < count; ++index)
             {
-              mAllocationSize += alignedSize(sizeof(SDES::Chunk::Unknown));
-              ZS_LOG_WARNING(Insane, log("SDES item type is not understood") + ZS_PARAM("type", type))
-              break;
+              DWORD receiptTime = block->receiptTimeAtIndex(index);
+              UseRTPUtils::setBE32(pos, receiptTime);
+              advancePos(pos, remaining, sizeof(DWORD));
             }
+            break;
           }
-
-          if (0 != length) {
-            mAllocationSize += alignedSize((sizeof(char)*length)+sizeof(char));
+          case ReceiverReferenceTimeReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const ReceiverReferenceTimeReportBlock *>(reportBlock);
+            UseRTPUtils::setBE32(&(pos[0]), block->ntpTimestampMS());
+            UseRTPUtils::setBE32(&(pos[4]), block->ntpTimestampLS());
+            advancePos(pos, remaining, sizeof(DWORD)*2);
+            break;
           }
+          case DLRRReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const DLRRReportBlock *>(reportBlock);
 
-          ZS_LOG_INSANE(log("get SDES item allocation size") + ZS_PARAM("type", SDES::Chunk::StringItem::typeToString(type)) + ZS_PARAM("type (number)", type) + ZS_PARAM("prefix length", prefixLength) + ZS_PARAM("length", length) + ZS_PARAM("allocation size", (mAllocationSize - preAllocationSize)))
-
-          advancePos(pos, remaining, length);
-        }
-
-      }
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getByeAllocationSize(
-                                           BYTE version,
-                                           BYTE padding,
-                                           BYTE reportSpecific,
-                                           const BYTE *contents,
-                                           size_t contentSize
-                                           )
-    {
-      ++mByeCount;
-
-      size_t ssrcCount = static_cast<size_t>(reportSpecific);
-
-      mAllocationSize += alignedSize(sizeof(Bye)) + (alignedSize(sizeof(DWORD)) * ssrcCount);
-
-      const BYTE *pos = contents;
-      size_t remaining = contentSize;
+            size_t count = block->subBlockCount();
+            for (size_t index = 0; index < count; ++index)
+            {
+              DLRRReportBlock::SubBlock *subBlock = block->subBlockAtIndex(index);
+              UseRTPUtils::setBE32(&(pos[0]), subBlock->ssrc());
+              UseRTPUtils::setBE32(&(pos[4]), subBlock->lrr());
+              UseRTPUtils::setBE32(&(pos[8]), subBlock->dlrr());
+              advancePos(pos, remaining, sizeof(DWORD)*3);
+            }
+            break;
+          }
+          case StatisticsSummaryReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const StatisticsSummaryReportBlock *>(reportBlock);
+            UseRTPUtils::setBE32(&(pos[0]), block->ssrcOfSource());
+            UseRTPUtils::setBE16(&(pos[4]), block->beginSeq());
+            UseRTPUtils::setBE16(&(pos[6]), block->endSeq());
+            UseRTPUtils::setBE32(&(pos[8]), block->lostPackets());
+            UseRTPUtils::setBE32(&(pos[12]), block->dupPackets());
+            UseRTPUtils::setBE32(&(pos[16]), block->minJitter());
+            UseRTPUtils::setBE32(&(pos[20]), block->maxJitter());
+            UseRTPUtils::setBE32(&(pos[24]), block->meanJitter());
+            UseRTPUtils::setBE32(&(pos[28]), block->devJitter());
+            pos[32] = block->mMinTTLOrHL;
+            pos[33] = block->mMaxTTLOrHL;
+            pos[34] = block->mMeanTTLOrHL;
+            pos[35] = block->mDevTTLOrHL;
+            advancePos(pos, remaining, sizeof(DWORD)*9);
+            break;
+          }
+          case VoIPMetricsReportBlock::kBlockType:
+          {
+            auto block = reinterpret_cast<const VoIPMetricsReportBlock *>(reportBlock);
+            UseRTPUtils::setBE32(&(pos[0]), block->ssrcOfSource());
+            pos[4] = block->lossRate();
+            pos[5] = block->discardRate();
+            pos[6] = block->burstDensity();
+            pos[7] = block->gapDensity();
+            UseRTPUtils::setBE16(&(pos[8]), block->burstDuration());
+            UseRTPUtils::setBE16(&(pos[10]), block->gapDuration());
+            UseRTPUtils::setBE16(&(pos[12]), block->roundTripDelay());
+            UseRTPUtils::setBE16(&(pos[14]), block->endSystemDelay());
+            pos[16] = block->signalLevel();
+            pos[17] = block->noiseLevel();
+            pos[18] = block->rerl();
+            pos[19] = block->Gmin();
 
-      if (remaining < (ssrcCount * sizeof(DWORD))) {
-        ZS_LOG_WARNING(Trace, debug("malformed BYE SSRC size"))
-        return false;
-      }
+            pos[20] = block->rFactor();
+            pos[21] = block->extRFactor();
+            pos[22] = block->mosLQ();
+            pos[23] = block->mosCQ();
 
-      advancePos(pos, remaining, sizeof(DWORD) * ssrcCount);
+            pos[24] = block->rxConfig();
+            pos[25] = block->mReservedVoIP;
+            UseRTPUtils::setBE16(&(pos[26]), block->jbNominal());
+            UseRTPUtils::setBE16(&(pos[28]), block->jbMaximum());
+            UseRTPUtils::setBE16(&(pos[30]), block->jbAbsMax());
+            advancePos(pos, remaining, sizeof(DWORD)*8);
+            break;
+          }
+          default:
+          {
+            auto block = reinterpret_cast<const UnknownReportBlock *>(reportBlock);
 
-      if (remaining < sizeof(BYTE)) return true;
+            auto size = block->typeSpecificContentSize();
+            if (0 != size) {
+              memcpy(pos, block->typeSpecificContents(), size*sizeof(BYTE));
+              advancePos(pos, remaining, boundarySize(size*sizeof(BYTE)));
+            }
+          }
+        }
 
-      size_t length = static_cast<size_t>(*pos);
+        BYTE *blockEnd = pos;
 
-      if (length < 1) return true;
+        size_t diff = static_cast<size_t>(reinterpret_cast<PTRNUMBER>(blockEnd) - reinterpret_cast<PTRNUMBER>(blockStart));
+        auto modulas = diff % sizeof(DWORD);
+        if (0 != modulas) {
+          advancePos(pos, remaining, sizeof(DWORD)-modulas);
+        }
 
-      if (length > remaining) {
-        ZS_LOG_WARNING(Trace, debug("malformed BYE reason length") + ZS_PARAM("length", length) + ZS_PARAM("remaining", remaining))
-        return false;
-      }
+        diff = boundarySize(diff);
+        ZS_LOG_INSANE(packet_slog("writing XR block") + ZS_PARAM("block type", reportBlock->blockTypeToString()) + ZS_PARAM("block type (number)", reportBlock->blockType()) + ZS_PARAM("block size", diff))
 
-      mAllocationSize += alignedSize((sizeof(char)*(length+1)));
-      return true;
+        UseRTPUtils::setBE16(&(blockStart[2]), static_cast<WORD>((diff/sizeof(DWORD))-1));
+      }
     }
 
     //-------------------------------------------------------------------------
-    bool RTCPPacket::getAppAllocationSize(
-                                           BYTE version,
-                                           BYTE padding,
-                                           BYTE reportSpecific,
-                                           const BYTE *contents,
-                                           size_t contentSize
-                                           )
+    static void traceReport(
+                            IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                            RTCPPacket::Report *common
+                            )
     {
-      ++mAppCount;
-
-      mAllocationSize += alignedSize(sizeof(App));
+      ZS_EVENTING_8(x, i, Basic, RTCPPacketTraceReport, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        bool, next, NULL != common->next(),
+        buffer, buffer, common->ptr(),
+        size, size, common->size(),
+        byte, version, common->version(),
+        size_t, padding, common->padding(),
+        byte, reportSpecific, common->reportSpecific(),
+        byte, payloadType, common->pt()
+      );
+    }
 
-      size_t remaining = contentSize;
+    //-------------------------------------------------------------------------
+    static void traceReportBlocks(
+                                  IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                  RTCPPacket::SenderReceiverCommonReport *common
+                                  )
+    {
+      RTCPPacket::SenderReceiverCommonReport::ReportBlock *block = common->firstReportBlock();
+      if (NULL == block) return;
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Detail, log("malformed APP length") + ZS_PARAM("remaining", remaining))
-        return false;
+      for (; NULL != block; block = block->next()) {
+        ZS_EVENTING_8(x, i, Basic, RTCPPacketTraceSenderReceiverCommonReportBlock, ol, RtcpPacket, Info,
+          puid, mediaChannelID, mediaChannelID,
+          dword, ssrc, block->ssrc(),
+          byte, fractionLost, block->fractionLost(),
+          dword, cumulativeNumberOfPacketsLost, block->cumulativeNumberOfPacketsLost(),
+          dword, extendedHighestSequenceNumberReceived, block->extendedHighestSequenceNumberReceived(),
+          dword, interarrivalJitter, block->interarrivalJitter(),
+          dword, lsr, block->lsr(),
+          dword, dlsr, block->dlsr()
+        );
       }
-
-      return true;
     }
-
+    
     //-------------------------------------------------------------------------
-    bool RTCPPacket::getTransportLayerFeedbackMessageAllocationSize(
-                                                                    BYTE version,
-                                                                    BYTE padding,
-                                                                    BYTE reportSpecific,
-                                                                    const BYTE *contents,
-                                                                    size_t contentSize
-                                                                    )
+    static void traceSenderReceiverCommonReport(
+                                                IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                                RTCPPacket::SenderReceiverCommonReport *common
+                                                )
     {
-      ++mTransportLayerFeedbackMessageCount;
+      traceReport(mediaChannelID, common);
+      ZS_EVENTING_5(x, i, Basic, RTCPPacketTraceSenderReceiverCommonReport, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        string, ssrcType, (RTCPPacket::ReceiverReport::kPayloadType != common->pt() ? "ssrc of sender" : "ssrc of packet sender"),
+        dword, ssrc, common->ssrcOfSender(),
+        buffer, extension, common->extension(),
+        size, extensionSize, common->extensionSize()
+      );
+      traceReportBlocks(mediaChannelID, common);
+    }
 
-      mAllocationSize += alignedSize(sizeof(TransportLayerFeedbackMessage));
+    //-------------------------------------------------------------------------
+    static void traceStringItem(
+                                IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                RTCPPacket::SDES::Chunk::StringItem *common
+                                )
+  {
+      auto type = common->type();
 
-      const BYTE *pos = contents;
-      size_t remaining = contentSize;
+      if (RTCPPacket::SDES::Chunk::Priv::kItemType == type) {
+        RTCPPacket::SDES::Chunk::Priv *priv = reinterpret_cast<RTCPPacket::SDES::Chunk::Priv *>(common);
+        ZS_EVENTING_6(x, i, Basic, RTCPPacketTraceChunkStringItemPriv, ol, RtcpPacket, Info,
+          puid, mediaChannelID, mediaChannelID,
+          byte, type, common->type(),
+          size_t, prefixLength, priv->prefixLength(),
+          string, prefix, priv->prefix(),
+          size_t, length, common->length(),
+          string, value, common->value()
+        );
+      } else {
+        ZS_EVENTING_4(x, i, Basic, RTCPPacketTraceChunkStringItem, ol, RtcpPacket, Parse,
+          puid, mediaChannelID, mediaChannelID,
+          byte, type, common->type(),
+          size_t, length, common->length(),
+          string, value, common->value()
+        );
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    static void traceStringItemList(
+                                    IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                    RTCPPacket::SDES::Chunk::StringItem *first
+                                    )
+    {
+      if (NULL == first) return;
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Detail, log("malformed transport layer feedback message length") + ZS_PARAM("remaining", remaining))
-        return false;
+      RTCPPacket::SDES::Chunk::StringItem *item = first;
+      for (; NULL != item; item = item->mNext) {
+        traceStringItem(mediaChannelID, item);
       }
+    }
 
-      advancePos(pos, remaining, sizeof(DWORD)*2);
-
-      bool result = false;
+    //-------------------------------------------------------------------------
+    static void traceDWORDs(
+                            IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                            const char *type,
+                            DWORD *values,
+                            size_t count
+                            )
+    {
+      if (NULL == values) return;
 
-      switch (reportSpecific) {
-        case TransportLayerFeedbackMessage::GenericNACK::kFmt:  result = getTransportLayerFeedbackMessageGenericNACKAllocationSize(reportSpecific, pos, remaining); break;
-        case TransportLayerFeedbackMessage::TMMBR::kFmt:        result = getTransportLayerFeedbackMessageTMMBRAllocationSize(reportSpecific, pos, remaining); break;
-        case TransportLayerFeedbackMessage::TMMBN::kFmt:        result = getTransportLayerFeedbackMessageTMMBNAllocationSize(reportSpecific, pos, remaining); break;
-        default: {
-          break;
-        }
+      for (size_t index = 0; index < count; ++index) {
+        ZS_EVENTING_4(x, i, Basic, RTCPPacketTraceDWORDs, ol, RtcpPacket, Info,
+          puid, mediaChannelID, mediaChannelID,
+          string, type, type,
+          size_t, index, index,
+          dword, value, values[index]
+        );
       }
-
-      ZS_LOG_INSANE(packet_slog("getting transport layer feedback message size") + ZS_PARAM("fmt", FeedbackMessage::fmtToString(TransportLayerFeedbackMessage::kPayloadType, reportSpecific)) + ZS_PARAM("fmt (number)", reportSpecific))
-
-      return true;
+    }
+    
+    //-------------------------------------------------------------------------
+    static void traceFeedbackMessage(
+                                     IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                     RTCPPacket::FeedbackMessage *common
+                                     )
+    {
+      traceReport(mediaChannelID, common);
+      ZS_EVENTING_6(x, i, Basic, RTCPPacketTraceFeedbackMessage, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        byte, fmt, common->fmt(),
+        dword, ssrcOfPacketSender, common->ssrcOfPacketSender(),
+        dword, ssrcOfMediaSource, common->ssrcOfMediaSource(),
+        buffer, fci, common->fci(),
+        size, fciSize, common->fciSize()
+      );
     }
 
     //-------------------------------------------------------------------------
-    bool RTCPPacket::getPayloadSpecificFeedbackMessageAllocationSize(
-                                                                     BYTE version,
-                                                                     BYTE padding,
-                                                                     BYTE reportSpecific,
-                                                                     const BYTE *contents,
-                                                                     size_t contentSize
-                                                                     )
+    static void traceTMMBRCommon(
+                                 IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                 BYTE fmt,
+                                 RTCPPacket::TransportLayerFeedbackMessage::TMMBRCommon *common
+                                 )
+    {
+      ZS_EVENTING_6(x, i, Basic, RTCPPacketTraceFeedbackMessageTMMBRCommon, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        byte, fmt, fmt,
+        dword, ssrc, common->ssrc(),
+        byte, mxTBRExp, common->mxTBRExp(),
+        dword, mxTBRMantissa, common->mxTBRMantissa(),
+        word, measuredOverhead, common->measuredOverhead()
+      );
+    }
+    
+    //-------------------------------------------------------------------------
+    static void traceCodecControlCommon(
+                                        IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                        BYTE fmt,
+                                        RTCPPacket::PayloadSpecificFeedbackMessage::CodecControlCommon *common
+                                        )
     {
-      ++mPayloadSpecificFeedbackMessageCount;
+      ZS_EVENTING_5(x, i, Basic, RTCPPacketTraceFeedbackMessageCodecControlCommon, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        byte, fmt, fmt,
+        dword, ssrc, common->ssrc(),
+        byte, seqNr, common->seqNr(),
+        dword, reserved, common->reserved()
+      );
+    }
 
-      mAllocationSize += alignedSize(sizeof(PayloadSpecificFeedbackMessage));
+    //-------------------------------------------------------------------------
+    static void traceXRReportBlock(
+                                   IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                   RTCPPacket::XR::ReportBlock *common
+                                   )
+    {
+      ZS_EVENTING_6(x, i, Basic, RTCPPacketTraceXRReportBlock, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        bool, next, (NULL != common->next()),
+        byte, blockType, common->blockType(),
+        byte, typeSpecific, common->typeSpecific(),
+        buffer, typeSpecificContents, common->typeSpecificContents(),
+        size, typeSpecificContentSize, common->typeSpecificContentSize()
+      );
+    }
 
-      const BYTE *pos = contents;
-      size_t remaining = contentSize;
+    //-------------------------------------------------------------------------
+    static void traceReportBlockRange(
+                                      IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                      RTCPPacket::XR::ReportBlockRange *common
+                                      )
+    {
+      traceXRReportBlock(mediaChannelID, common);
+      ZS_EVENTING_6(x, i, Basic, RTCPPacketTraceXRReportBlockRange, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        byte, reserved, common->reserved(),
+        byte, thinning, common->thinning(),
+        dword, ssrcOfSource, common->ssrcOfSource(),
+        word, beginSeq, common->beginSeq(),
+        word, endSeq, common->endSeq()
+      );
+    }
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Detail, log("malformed transport layer feedback message length") + ZS_PARAM("remaining", remaining))
-        return false;
-      }
+    //-------------------------------------------------------------------------
+    static void traceRLEReportBlock(
+                                    IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                    RTCPPacket::XR::RLEReportBlock *common
+                                    )
+    {
+      traceReportBlockRange(mediaChannelID, common);
+      auto count = common->chunkCount();
 
-      advancePos(pos, remaining, sizeof(DWORD)*2);
+      if (count < 1) return;
 
-      bool result = false;
+      ElementPtr outerEl = Element::create("chunks");
 
-      char bogus[sizeof(DWORD)] {};
-      const DWORD *usingSubType = reinterpret_cast<const DWORD *>(&(bogus[0]));
-
-      switch (reportSpecific) {
-        case PayloadSpecificFeedbackMessage::PLI::kFmt:   result = getPayloadSpecificFeedbackMessagePLIAllocationSize(reportSpecific, pos, remaining); break;
-        case PayloadSpecificFeedbackMessage::SLI::kFmt:   result = getPayloadSpecificFeedbackMessageSLIAllocationSize(reportSpecific, pos, remaining); break;
-        case PayloadSpecificFeedbackMessage::RPSI::kFmt:  result = getPayloadSpecificFeedbackMessageRPSIAllocationSize(reportSpecific, pos, remaining); break;
-        case PayloadSpecificFeedbackMessage::FIR::kFmt:   result = getPayloadSpecificFeedbackMessageFIRAllocationSize(reportSpecific, pos, remaining); break;
-        case PayloadSpecificFeedbackMessage::TSTR::kFmt:  result = getPayloadSpecificFeedbackMessageTSTRAllocationSize(reportSpecific, pos, remaining); break;
-        case PayloadSpecificFeedbackMessage::TSTN::kFmt:  result = getPayloadSpecificFeedbackMessageTSTNAllocationSize(reportSpecific, pos, remaining); break;
-        case PayloadSpecificFeedbackMessage::VBCM::kFmt:  result = getPayloadSpecificFeedbackMessageVBCMAllocationSize(reportSpecific, pos, remaining); break;
-        case PayloadSpecificFeedbackMessage::AFB::kFmt:   {
-          {
-            if (remaining < sizeof(DWORD)) goto generic_afb;
-            if (0 != memcmp(pos, reinterpret_cast<const BYTE *>("REMB"), sizeof(DWORD))) goto generic_afb;
+      for (size_t index = 0; index < count; ++index) {
+        RTCPPacket::XR::RLEChunk chunk = common->chunkAtIndex(index);
 
-            usingSubType = reinterpret_cast<const DWORD *>(pos);
+        ElementPtr chunkEl;
 
-            result = getPayloadSpecificFeedbackMessageREMBAllocationSize(reportSpecific, pos, remaining);
-            break;
-          }
-        generic_afb:
-          {
-            result = getPayloadSpecificFeedbackMessageAFBAllocationSize(reportSpecific, pos, remaining);
-            break;
-          }
-        }
-        default: {
-          break;
+        if (RTCPPacket::XR::isRunLengthChunk(chunk)) {
+          RTCPPacket::XR::RunLength rl(chunk);
+          ZS_EVENTING_3(x, i, Basic, RTCPPacketTraceXRRLEReportBlockChunkRunLength, ol, RtcpPacket, Info,
+            puid, mediaChannelID, mediaChannelID,
+            byte, runType, rl.runType(),
+            size_t, runLength, rl.runLength()
+          );
+        } else if (RTCPPacket::XR::isBitVectorChunk(chunk)) {
+          RTCPPacket::XR::BitVector bv(chunk);
+          ZS_EVENTING_2(x, i, Basic, RTCPPacketTraceXRRLEReportBlockChunkBitVector, ol, RtcpPacket, Info,
+            puid, mediaChannelID, mediaChannelID,
+            word, bitVector, bv.bitVector()
+          );
+        } else {
+          ZS_EVENTING_2(x, i, Basic, RTCPPacketTraceXRRLEReportBlockChunkUnknown, ol, RtcpPacket, Info,
+            puid, mediaChannelID, mediaChannelID,
+            word, chunk, chunk
+          );
         }
       }
+    }
 
-      ZS_LOG_INSANE(packet_slog("getting payload specific feedback message size") + ZS_PARAM("fmt", FeedbackMessage::fmtToString(TransportLayerFeedbackMessage::kPayloadType, reportSpecific, *usingSubType)) + ZS_PARAM("fmt (number)", reportSpecific))
+    //-------------------------------------------------------------------------
+    static void traceSenderReport(
+                                  IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                  RTCPPacket::SenderReport *sr
+                                  )
+    {
+      traceSenderReceiverCommonReport(mediaChannelID, sr);
+      ZS_EVENTING_7(x, i, Basic, RTCPPacketTraceSenderReport, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        dword, ntpTimestampMS, sr->ntpTimestampMS(),
+        dword, ntpTimestampLS, sr->ntpTimestampLS(),
+        string, ntpTimestamp, string(sr->ntpTimestamp()),
+        dword, senderPacketCount, sr->senderPacketCount(),
+        dword, senderOctetCount, sr->senderOctetCount(),
+        bool, nextSenderReport, (NULL != sr->nextSenderReport())
+      );
+    }
 
-      return true;
+    //-------------------------------------------------------------------------
+    static void traceReceiverReport(
+                                    IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                    RTCPPacket::ReceiverReport *rr
+                                    )
+    {
+      ElementPtr subEl = Element::create("ReceiverReport");
+      traceSenderReceiverCommonReport(mediaChannelID, rr);
+      ZS_EVENTING_2(x, i, Basic, RTCPPacketTraceReceiverReport, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        bool, nextReceiverReport, (NULL != rr->nextReceiverReport())
+      );
     }
 
     //-------------------------------------------------------------------------
-    bool RTCPPacket::getXRAllocationSize(
-                                         BYTE version,
-                                         BYTE padding,
-                                         BYTE reportSpecific,
-                                         const BYTE *contents,
-                                         size_t contentSize
-                                         )
+    static void traceSDES(
+                          IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                          RTCPPacket::SDES *sdes
+                          )
     {
-      ++mXRCount;
+      traceReport(mediaChannelID, sdes);
 
-      mAllocationSize += alignedSize(sizeof(XR));
+      ZS_EVENTING_3(x, i, Basic, RTCPPacketTraceSDES, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        size_t, sc, sdes->sc(),
+        bool, nextSDES, (NULL != sdes->nextSDES())
+      );
 
-      const BYTE *pos = contents;
-      size_t remaining = contentSize;
+      RTCPPacket::SDES::Chunk *chunk = sdes->firstChunk();
+      if (NULL != chunk) {
+        for (; NULL != chunk; chunk = chunk->next()) {
+          ZS_EVENTING_14(x, i, Basic, RTCPPacketTraceSDESChunk, ol, RtcpPacket, Info,
+            puid, mediaChannelID, mediaChannelID,
+            dword, ssrc, chunk->ssrc(),
+            size_t, count, chunk->count(),
+            size_t, cNameCount, chunk->cNameCount(),
+            size_t, nameCount, chunk->nameCount(),
+            size_t, emailCount, chunk->emailCount(),
+            size_t, phoneCount, chunk->phoneCount(),
+            size_t, locCount, chunk->locCount(),
+            size_t, toolCount, chunk->toolCount(),
+            size_t, noteCount, chunk->noteCount(),
+            size_t, privCount, chunk->privCount(),
+            size_t, midCount, chunk->midCount(),
+            size_t, ridCount, chunk->ridCount(),
+            size_t, unknownCount, chunk->unknownCount()
+          );
+
+          traceStringItemList(mediaChannelID, chunk->firstCName());
+          traceStringItemList(mediaChannelID, chunk->firstName());
+          traceStringItemList(mediaChannelID, chunk->firstEmail());
+          traceStringItemList(mediaChannelID, chunk->firstPhone());
+          traceStringItemList(mediaChannelID, chunk->firstLoc());
+          traceStringItemList(mediaChannelID, chunk->firstTool());
+          traceStringItemList(mediaChannelID, chunk->firstNote());
+          traceStringItemList(mediaChannelID, chunk->firstPriv());
+          traceStringItemList(mediaChannelID, chunk->firstMid());
+          traceStringItemList(mediaChannelID, chunk->firstRid());
+          traceStringItemList(mediaChannelID, chunk->firstUnknown());
+        }
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    static void traceBye(
+                         IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                         RTCPPacket::Bye *bye
+                         )
+    {
+      traceReport(mediaChannelID, bye);
+      ZS_EVENTING_3(x, i, Basic, RTCPPacketTraceBye, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        string, reasonForLeaving, bye->reasonForLeaving(),
+        bool, nextBye, (NULL != bye->nextBye())
+      );
+      traceDWORDs(mediaChannelID, "ssrc", bye->mSSRCs, bye->sc());
+    }
+
+    //-------------------------------------------------------------------------
+    static void traceApp(
+                         IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                         RTCPPacket::App *app
+                         )
+    {
+      traceReport(mediaChannelID, app);
+      ZS_EVENTING_7(x, i, Basic, RTCPPacketTraceApp, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        byte, subtype, app->subtype(),
+        dword, ssrc, app->ssrc(),
+        string, name, app->name(),
+        buffer, data, app->data(),
+        size, dataSize, app->dataSize(),
+        bool, nextApp, (NULL != app->nextApp())
+      );
+    }
+
+    //-------------------------------------------------------------------------
+    static void traceTransportLayerFeedbackMessage(
+                                                   IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                                   RTCPPacket::TransportLayerFeedbackMessage *fm
+                                                   )
+    {
+      traceFeedbackMessage(mediaChannelID, fm);
 
-      if (remaining < sizeof(DWORD)) {
-        ZS_LOG_WARNING(Trace, debug("XR is not a valid length") + ZS_PARAM("remaining", remaining))
-        return false;
-      }
+      ZS_EVENTING_3(x, i, Basic, RTCPPacketTraceTransportLayerFeedbackMessage, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        bool, unknown, (NULL != fm->unknown()),
+        bool, nextTransportLayerFeedbackMessage, (NULL != fm->nextTransportLayerFeedbackMessage())
+      );
 
-      advancePos(pos, remaining, sizeof(DWORD));
+      {
+        auto count = fm->genericNACKCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = fm->genericNACKAtIndex(index);
 
-      while (remaining >= sizeof(DWORD)) {
-        const BYTE *prePos = pos;
-        size_t preAllocationSize = mAllocationSize;
+            ZS_EVENTING_3(x, i, Basic, RTCPPacketTransportLayerFeedbackMessageGenericNACK, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              word, pid, format->pid(),
+              word, blp, format->blp()
+            );
+          }
+        }
+      }
 
-        BYTE bt = pos[0];
-        BYTE typeSpecific = pos[1];
-        size_t blockLength = static_cast<size_t>(RTPUtils::getBE16(&(pos[2]))) * sizeof(DWORD);
+      {
+        auto count = fm->tmmbrCount();
+        if (count > 0) {
+          ElementPtr formatsEl = Element::create("TMMBRs");
 
-        advancePos(pos, remaining, sizeof(DWORD));
+          for (size_t index = 0; index < count; ++index) {
+            ElementPtr formatEl = Element::create("TMMBR");
 
-        if (remaining < blockLength) {
-          ZS_LOG_WARNING(Trace, debug("malformed XR block length found") + ZS_PARAM("block length", blockLength) + ZS_PARAM("remaining", remaining))
-          return false;
+            auto format = fm->tmmbrAtIndex(index);
+            traceTMMBRCommon(mediaChannelID, RTCPPacket::TransportLayerFeedbackMessage::TMMBR::kFmt, format);
+          }
         }
+      }
 
-        bool result = false;
-
-        switch (bt) {
-          case XR::LossRLEReportBlock::kBlockType:                result = getXRLossRLEReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
-          case XR::DuplicateRLEReportBlock::kBlockType:           result = getXRDuplicateRLEReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
-          case XR::PacketReceiptTimesReportBlock::kBlockType:     result = getXRPacketReceiptTimesReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
-          case XR::ReceiverReferenceTimeReportBlock::kBlockType:  result = getXRReceiverReferenceTimeReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
-          case XR::DLRRReportBlock::kBlockType:                   result = getXRDLRRReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
-          case XR::StatisticsSummaryReportBlock::kBlockType:      result = getXRStatisticsSummaryReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
-          case XR::VoIPMetricsReportBlock::kBlockType:            result = getXRVoIPMetricsReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
-          default:
-          {
-            result = getXRUnknownReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
-            break;
+      {
+        auto count = fm->tmmbrCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = fm->tmmbnAtIndex(index);
+            traceTMMBRCommon(mediaChannelID, RTCPPacket::TransportLayerFeedbackMessage::TMMBN::kFmt, format);
           }
         }
-
-        if (!result) return false;
-
-        advancePos(pos, remaining, blockLength);
-
-        ZS_LOG_INSANE(log("get XR allocation size for block") + ZS_PARAM("block type", XR::ReportBlock::blockTypeToString(bt)) + ZS_PARAM("block type (number)", bt) + ZS_PARAM("block size", blockLength) + ZS_PARAM("consumed", (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(prePos))) + ZS_PARAM("allocation size", mAllocationSize - preAllocationSize))
       }
-
-      return true;
     }
 
     //-------------------------------------------------------------------------
-    bool RTCPPacket::getUnknownReportAllocationSize(
-                                                   BYTE version,
-                                                   BYTE padding,
-                                                   BYTE reportSpecific,
-                                                   const BYTE *contents,
-                                                   size_t contentSize
-                                                   )
-    {
-      ++mUnknownReportCount;
-
-      mAllocationSize += alignedSize(sizeof(UnknownReport));
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getTransportLayerFeedbackMessageGenericNACKAllocationSize(
-                                                                               BYTE fmt,
-                                                                               const BYTE *contents,
-                                                                               size_t contentSize
-                                                                               )
+    static void tracePayloadSpecificFeedbackMessage(
+                                                    IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                                                    RTCPPacket::PayloadSpecificFeedbackMessage *fm
+                                                    )
     {
-      size_t remaining = contentSize;
+      traceFeedbackMessage(mediaChannelID, fm);
 
-      if (remaining < sizeof(DWORD)) {
-        ZS_LOG_WARNING(Trace, debug("malformed generic NACK transport layer feedback message") + ZS_PARAM("remaining", remaining))
-        return false;
+      {
+        auto format = fm->pli();
+        if (NULL != format) {
+          ZS_EVENTING_1(x, i, Basic, RTCPPacketTracePayloadSpecificFeedbackMessagePLI, ol, RtcpPacket, Info, puid, mediaChannelID, mediaChannelID);
+        }
       }
 
-      size_t possibleNACKs = remaining / sizeof(DWORD);
-
-      mAllocationSize += (alignedSize(sizeof(TransportLayerFeedbackMessage::GenericNACK)) * possibleNACKs);
-      return true;
-    }
+      {
+        auto count = fm->sliCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = fm->sliAtIndex(index);
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getTransportLayerFeedbackMessageTMMBRAllocationSize(
-                                                                         BYTE fmt,
-                                                                         const BYTE *contents,
-                                                                         size_t contentSize
-                                                                         )
-    {
-      size_t remaining = contentSize;
+            ZS_EVENTING_5(x, i, Basic, RTCPPacketTracePayloadSpecificFeedbackMessageSLI, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              size_t, index, index,
+              word, first, format->first(),
+              word, number, format->number(),
+              byte, pictureID, format->pictureID()
+            );
+          }
+        }
+      }
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Trace, debug("malformed TMMBR transport layer feedback message") + ZS_PARAM("remaining", remaining))
-        return false;
+      {
+        auto format = fm->rpsi();
+        if (NULL != format) {
+          ZS_EVENTING_5(x, i, Basic, RTCPPacketTracePayloadSpecificFeedbackMessageRPSI, ol, RtcpPacket, Info,
+            puid, mediaChannelID, mediaChannelID,
+            byte, zeroBit, format->zeroBit(),
+            byte, payloadType, format->payloadType(),
+            buffer, nativeRPSIBitString, format->nativeRPSIBitString(),
+            size, nativeRPSIBitStringSizeInBits, (format->nativeRPSIBitStringSizeInBits()/8)+(0 == format->nativeRPSIBitStringSizeInBits()%8 ? 0 : 1)
+          );
+        }
       }
 
-      size_t possibleTMMBRs = remaining / (sizeof(DWORD)*2);
+      {
+        auto count = fm->firCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = fm->firAtIndex(index);
+            traceCodecControlCommon(mediaChannelID, RTCPPacket::PayloadSpecificFeedbackMessage::FIR::kFmt, format);
+          }
+        }
+      }
 
-      mAllocationSize += (alignedSize(sizeof(TransportLayerFeedbackMessage::TMMBR)) * possibleTMMBRs);
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getTransportLayerFeedbackMessageTMMBNAllocationSize(
-                                                                         BYTE fmt,
-                                                                         const BYTE *contents,
-                                                                         size_t contentSize
-                                                                         )
-    {
-      size_t remaining = contentSize;
+      {
+        auto count = fm->tstrCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = fm->tstrAtIndex(index);
+            traceCodecControlCommon(mediaChannelID, RTCPPacket::PayloadSpecificFeedbackMessage::TSTR::kFmt, format);
+
+            ZS_EVENTING_4(x, i, Basic, RTCPPacketTracePayloadSpecificFeedbackMessageTSTx, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              string, type, "TSTR",
+              size_t, index, index,
+              byte, formatIndex, format->index()
+            );
+          }
+        }
+      }
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Trace, debug("malformed TMMBN transport layer feedback message") + ZS_PARAM("remaining", remaining))
-        return false;
+      {
+        auto count = fm->tstnCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = fm->tstnAtIndex(index);
+            traceCodecControlCommon(mediaChannelID, RTCPPacket::PayloadSpecificFeedbackMessage::TSTN::kFmt, format);
+
+            ZS_EVENTING_4(x, i, Basic, RTCPPacketTracePayloadSpecificFeedbackMessageTSTx, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              string, type, "TSTN",
+              size_t, index, index,
+              byte, formatIndex, format->index()
+            );
+          }
+        }
       }
 
-      size_t possibleTMMBNs = remaining / (sizeof(DWORD)*2);
+      {
+        auto count = fm->vbcmCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = fm->vbcmAtIndex(index);
+            traceCodecControlCommon(mediaChannelID, RTCPPacket::PayloadSpecificFeedbackMessage::TSTN::kFmt, format);
+
+            ZS_EVENTING_6(x, i, Basic, RTCPPacketTracePayloadSpecificFeedbackMessageVBCM, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              size_t, index, index,
+              byte, zeroBit, format->zeroBit(),
+              byte, payloadType, format->payloadType(),
+              buffer, vbcmOctetString, format->vbcmOctetString(),
+              size, vbcmOctetStringSize, format->vbcmOctetStringSize()
+            );
+          }
+        }
+      }
 
-      mAllocationSize += (alignedSize(sizeof(TransportLayerFeedbackMessage::TMMBN)) * possibleTMMBNs);
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getPayloadSpecificFeedbackMessagePLIAllocationSize(
-                                                                        BYTE fmt,
-                                                                        const BYTE *contents,
-                                                                        size_t contentSize
-                                                                        )
-    {
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getPayloadSpecificFeedbackMessageSLIAllocationSize(
-                                                                        BYTE fmt,
-                                                                        const BYTE *contents,
-                                                                        size_t contentSize
-                                                                        )
-    {
-      size_t remaining = contentSize;
+      {
+        auto format = fm->afb();
+        auto remb = fm->remb();
 
-      if (remaining < sizeof(DWORD)) {
-        ZS_LOG_WARNING(Trace, debug("malformed SLI payload specific feedback message") + ZS_PARAM("remaining", remaining))
-        return false;
+        if ((NULL != format) &&
+            (NULL == remb)) {
+          ZS_EVENTING_3(x, i, Basic, RTCPPacketTracePayloadSpecificFeedbackMessageAFB, ol, RtcpPacket, Info,
+            puid, mediaChannelID, mediaChannelID,
+            buffer, data, format->data(),
+            size, dataSize, format->dataSize()
+          );
+        }
       }
 
-      size_t possibleSLIs = remaining / sizeof(DWORD);
-
-      mAllocationSize += (alignedSize(sizeof(PayloadSpecificFeedbackMessage::SLI)) * possibleSLIs);
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getPayloadSpecificFeedbackMessageRPSIAllocationSize(
-                                                                         BYTE fmt,
-                                                                         const BYTE *contents,
-                                                                         size_t contentSize
-                                                                         )
-    {
-      return true;
+      {
+        auto format = fm->remb();
+        if (NULL != format) {
+          ZS_EVENTING_4(x, i, Basic, RTCPPacketTracePayloadSpecificFeedbackMessageREMB, ol, RtcpPacket, Info,
+            puid, mediaChannelID, mediaChannelID,
+            size_t, numSSRC, format->numSSRC(),
+            byte, brExp, format->brExp(),
+            dword, brMantissa, format->brMantissa()
+          );
+          traceDWORDs(mediaChannelID, "ssrc", format->mSSRCs, format->numSSRC());
+        }
+      }
     }
-    
+
     //-------------------------------------------------------------------------
-    bool RTCPPacket::getPayloadSpecificFeedbackMessageFIRAllocationSize(
-                                                                         BYTE fmt,
-                                                                         const BYTE *contents,
-                                                                         size_t contentSize
-                                                                         )
+    static void traceXR(
+                        IMediaStreamTrackTypes::MediaChannelID mediaChannelID,
+                        RTCPPacket::XR *xr
+                        )
     {
-      size_t remaining = contentSize;
+      traceReport(mediaChannelID, xr);
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Trace, debug("malformed FIR payload specific feedback message") + ZS_PARAM("remaining", remaining))
-        return false;
+      ZS_EVENTING_5(x, i, Basic, RTCPPacketTraceXR, ol, RtcpPacket, Info,
+        puid, mediaChannelID, mediaChannelID,
+        byte, numSSRC, xr->reserved(),
+        dword, ssrc, xr->ssrc(),
+        size_t, reportBlockCount, xr->reportBlockCount(),
+        bool, next, xr->nextXR()
+      );
+
+      {
+        auto count = xr->lossRLEReportBlockCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = xr->lossRLEReportBlockAtIndex(index);
+            ZS_EVENTING_4(x, i, Basic, RTCPPacketTraceXRTypeRLEReportBlock, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              string, type, "LossRLE", 
+              size_t, index, index,
+              bool, next, (NULL != format->nextLossRLE())
+            );
+            traceRLEReportBlock(mediaChannelID, format);
+          }
+        }
       }
 
-      size_t possibleFIRs = remaining / (sizeof(DWORD)*2);
+      {
+        auto count = xr->duplicateRLEReportBlockCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = xr->duplicateRLEReportBlockAtIndex(index);
+            ZS_EVENTING_4(x, i, Basic, RTCPPacketTraceXRTypeRLEReportBlock, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              string, type, "DuplicateRLE",
+              size_t, index, index,
+              bool, next, (NULL != format->nextDuplicateRLE())
+            );
+            traceRLEReportBlock(mediaChannelID, format);
+          }
+        }
+      }
 
-      mAllocationSize += (alignedSize(sizeof(PayloadSpecificFeedbackMessage::FIR)) * possibleFIRs);
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getPayloadSpecificFeedbackMessageTSTRAllocationSize(
-                                                                         BYTE fmt,
-                                                                         const BYTE *contents,
-                                                                         size_t contentSize
-                                                                         )
-    {
-      size_t remaining = contentSize;
+      {
+        auto count = xr->packetReceiptTimesReportBlockCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = xr->packetReceiptTimesReportBlockAtIndex(index);
+            ZS_EVENTING_4(x, i, Basic, RTCPPacketTraceXRTypeRLEReportBlock, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              string, type, "PacketReceiptTimes",
+              size_t, index, index,
+              bool, next, (NULL != format->nextPacketReceiptTimesReportBlock())
+            );
+            traceDWORDs(mediaChannelID, "receipt time", format->mReceiptTimes, format->receiptTimeCount());
+            traceReportBlockRange(mediaChannelID, format);
+          }
+        }
+      }
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Trace, debug("malformed TSTR payload specific feedback message") + ZS_PARAM("remaining", remaining))
-        return false;
+      {
+        auto count = xr->receiverReferenceTimeReportBlockCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = xr->receiverReferenceTimeReportBlockAtIndex(index);
+            ZS_EVENTING_6(x, i, Basic, RTCPPacketTraceXRReceiverReferenceTimeReportBlock, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              size_t, index, index,
+              dword, ntpTimestampMS, format->ntpTimestampMS(),
+              dword, ntpTimestampLS, format->ntpTimestampLS(),
+              string, ntpTimestamp, string(format->ntpTimestamp()),
+              bool, next, (NULL != format->nextReceiverReferenceTimeReportBlock())
+            );
+            traceXRReportBlock(mediaChannelID, format);
+          }
+        }
       }
 
-      size_t possibleTSTRs = remaining / (sizeof(DWORD)*2);
+      {
+        auto count = xr->dlrrReportBlockCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = xr->dlrrReportBlockAtIndex(index);
+            size_t subBlockCount = format->subBlockCount();
 
-      mAllocationSize += (alignedSize(sizeof(PayloadSpecificFeedbackMessage::TSTR)) * possibleTSTRs);
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getPayloadSpecificFeedbackMessageTSTNAllocationSize(
-                                                                         BYTE fmt,
-                                                                         const BYTE *contents,
-                                                                         size_t contentSize
-                                                                         )
-    {
-      size_t remaining = contentSize;
+            ZS_EVENTING_4(x, i, Basic, RTCPPacketTraceXRDLRRReportBlock, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              size_t, index, index,
+              size_t, subBlockCount, subBlockCount,
+              bool, next, (NULL != format->nextDLRRReportBlock())
+            );
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Trace, debug("malformed TSTN payload specific feedback message") + ZS_PARAM("remaining", remaining))
-        return false;
+            if (subBlockCount > 0) {
+              for (size_t indexSubBlock = 0; indexSubBlock < subBlockCount; ++indexSubBlock)
+              {
+                auto subBlock = format->subBlockAtIndex(indexSubBlock);
+                ZS_EVENTING_6(x, i, Basic, RTCPPacketTraceXRDLRRReportBlockSubBlock, ol, RtcpPacket, Info,
+                  puid, mediaChannelID, mediaChannelID,
+                  size_t, index, indexSubBlock,
+                  size_t, subBlockCount, subBlockCount,
+                  dword, ssrc, subBlock->ssrc(),
+                  dword, lrr, subBlock->lrr(),
+                  dword, dlrr, subBlock->dlrr()
+                );
+              }
+            }
+            traceXRReportBlock(mediaChannelID, format);
+          }
+        }
+      }
+
+      {
+        auto count = xr->statisticsSummaryReportBlockCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = xr->statisticsSummaryReportBlockAtIndex(index);
+            ZS_EVENTING_22(x, i, Basic, RTCPPacketTraceXRStatisticsSummary, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              size_t, index, index,
+              bool, lossReportFlag, format->lossReportFlag(),
+              bool, lrr, format->duplicateReportFlag(),
+              bool, jitterFlag, format->jitterFlag(),
+              bool, ttlFlag, format->ttlFlag(),
+              bool, hopLimitFlag, format->hopLimitFlag(),
+              dword, lostPackets, format->lossReportFlag() ? format->lostPackets() : 0,
+              dword, dupPackets, format->duplicateReportFlag() ? format->dupPackets() : 0,
+              dword, minJitter, format->jitterFlag() ? format->minJitter() : 0,
+              dword, maxJitter, format->jitterFlag() ? format->maxJitter() : 0,
+              dword, meanJitter, format->jitterFlag() ? format->meanJitter() : 0,
+              dword, devJitter, format->jitterFlag() ? format->devJitter() : 0,
+              byte, minTTL, format->ttlFlag() ? format->minTTL() : static_cast<BYTE>(0),
+              byte, maxTTL, format->ttlFlag() ? format->maxTTL() : static_cast<BYTE>(0),
+              byte, meanTTL, format->ttlFlag() ? format->meanTTL() : static_cast<BYTE>(0),
+              byte, devTTL, format->ttlFlag() ? format->devTTL() : static_cast<BYTE>(0),
+              byte, minHopLimit, format->hopLimitFlag() ? format->minHopLimit() : static_cast<BYTE>(0),
+              byte, maxHopLimit, format->hopLimitFlag() ? format->maxHopLimit() : static_cast<BYTE>(0),
+              byte, meanHopLimit, format->hopLimitFlag() ? format->meanHopLimit() : static_cast<BYTE>(0),
+              byte, devHopLimit, format->hopLimitFlag() ? format->devHopLimit() : static_cast<BYTE>(0),
+              bool, next, (NULL != format->nextStatisticsSummaryReportBlock())
+            );
+            traceReportBlockRange(mediaChannelID, format);
+          }
+        }
       }
 
-      size_t possibleTSTNs = remaining / (sizeof(DWORD)*2);
+      {
+        auto count = xr->voIPMetricsReportBlockCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = xr->voIPMetricsReportBlockAtIndex(index);
+            ZS_EVENTING_27(x, i, Basic, RTCPPacketTraceXRVoIPMetricsReportBlock, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              size_t, index, index,
+              dword, ssrcOfSource, format->ssrcOfSource(),
+              byte, lossRate, format->lossRate(),
+              byte, discardRate, format->discardRate(),
+              byte, burstDensity, format->burstDensity(),
+              byte, gapDensity, format->gapDensity(),
+              word, burstDuration, format->burstDuration(),
+              word, gapDuration, format->gapDuration(),
+              word, roundTripDelay, format->roundTripDelay(),
+              word, endSystemDelay, format->endSystemDelay(),
+              byte, signalLevel, format->signalLevel(),
+              byte, noiseLevel, format->noiseLevel(),
+              byte, rerl, format->rerl(),
+              byte, Gmin, format->Gmin(),
+              byte, rFactor, format->rFactor(),
+              byte, extRFactor, format->extRFactor(),
+              byte, mosLQ, format->mosLQ(),
+              byte, mosCQ, format->mosCQ(),
+              byte, rxConfig, format->rxConfig(),
+              byte, plc, format->plc(),
+              byte, jba, format->jba(),
+              byte, jbRate, format->jbRate(),
+              word, jbNominal, format->jbNominal(),
+              word, jbMaximum, format->jbMaximum(),
+              word, jbAbsMax, format->jbAbsMax(),
+              bool, next, (NULL != format->nextVoIPMetricsReportBlock())
+            );
+
+            traceXRReportBlock(mediaChannelID, format);
+          }
+        }
+      }
 
-      mAllocationSize += (alignedSize(sizeof(PayloadSpecificFeedbackMessage::TSTN)) * possibleTSTNs);
-      return true;
+      {
+        auto count = xr->unknownReportBlockCount();
+        if (count > 0) {
+          for (size_t index = 0; index < count; ++index) {
+            auto format = xr->unknownReportBlockAtIndex(index);
+            ZS_EVENTING_4(x, i, Basic, RTCPPacketTraceXRTypeRLEReportBlock, ol, RtcpPacket, Info,
+              puid, mediaChannelID, mediaChannelID,
+              string, type, "UnknownReportBlock",
+              size_t, index, index,
+              bool, next, (NULL != format->nextUnknownReportBlock())
+            );
+
+            traceXRReportBlock(mediaChannelID, format);
+          }
+        }
+      }
     }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getPayloadSpecificFeedbackMessageVBCMAllocationSize(
-                                                                         BYTE fmt,
-                                                                         const BYTE *contents,
-                                                                         size_t contentSize
-                                                                         )
-    {
-      const BYTE *pos = contents;
-      size_t remaining = contentSize;
 
-      size_t possibleVBCMs = 0;
-
-      while (remaining >= (sizeof(DWORD)*2)) {
-        mAllocationSize += alignedSize(sizeof(PayloadSpecificFeedbackMessage::VBCM));
-        ++possibleVBCMs;
+  } // namespace internal
 
-        size_t length = RTPUtils::getBE16(&(pos[6]));
-        size_t modulas = length % sizeof(DWORD);
-        size_t padding = ((0 != modulas) ? (sizeof(DWORD)-modulas) : 0);
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::SenderReport
+  #pragma mark
 
-        advancePos(pos, remaining, sizeof(DWORD)*2);
+  //-------------------------------------------------------------------------
+  const char *RTCPPacket::Report::ptToString(BYTE pt)
+  {
+    switch (pt) {
+      case SenderReport::kPayloadType:                    return "SenderReport";
+      case ReceiverReport::kPayloadType:                  return "ReceiverReport";
+      case SDES::kPayloadType:                            return "SDES";
+      case Bye::kPayloadType:                             return "Bye";
+      case App::kPayloadType:                             return "App";
+      case TransportLayerFeedbackMessage::kPayloadType:   return "TransportLayerFeedbackMessage";
+      case PayloadSpecificFeedbackMessage::kPayloadType:  return "PayloadSpecificFeedbackMessage";
+      case XR::kPayloadType:                              return "XR";
+      default:  {
+      }
+    }
+    return "Uknown";
+  }
 
-        if (remaining < length) {
-          ZS_LOG_WARNING(Trace, debug("malformed VBCM payload specific feedback message") + ZS_PARAM("remaining", remaining) + ZS_PARAM("length", length))
-          return false;
-        }
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::SenderReport
+  #pragma mark
 
-        size_t skipLength = (((length + padding) > remaining) ? remaining : (length + padding));
+  //-------------------------------------------------------------------------
+  Time RTCPPacket::SenderReport::ntpTimestamp() const
+  {
+    return UseRTPUtils::ntpToTime(mNTPTimestampMS, mNTPTimestampLS);
+  }
 
-        advancePos(pos, remaining, skipLength);
-      }
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::SDES::Chunk::StringItem
+  #pragma mark
 
-      if (possibleVBCMs < 1) {
-        ZS_LOG_WARNING(Trace, debug("malformed VBCM payload specific feedback message") + ZS_PARAM("remaining", remaining) + ZS_PARAM("possible", possibleVBCMs))
-        return false;
-      }
+  //-------------------------------------------------------------------------
+  const char *RTCPPacket::SDES::Chunk::StringItem::typeToString(BYTE type)
+  {
+    switch (type) {
+      case CName::kItemType:  return "CName";
+      case Name::kItemType:   return "Name";
+      case Email::kItemType:  return "Email";
+      case Phone::kItemType:  return "Phone";
+      case Loc::kItemType:    return "Loc";
+      case Tool::kItemType:   return "Tool";
+      case Note::kItemType:   return "Note";
+      case Priv::kItemType:   return "Priv";
+      case Mid::kItemType:    return "Mid";
+      case Rid::kItemType:    return "Rid";
+      default: {
+        break;
+      }
+    }
+    return "Unknown";
+  }
 
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getPayloadSpecificFeedbackMessageAFBAllocationSize(
-                                                                         BYTE fmt,
-                                                                         const BYTE *contents,
-                                                                         size_t contentSize
-                                                                         )
-    {
-      return true;
-    }
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::SDES::Chunk
+  #pragma mark
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getPayloadSpecificFeedbackMessageREMBAllocationSize(
-                                                                        BYTE fmt,
-                                                                        const BYTE *contents,
-                                                                        size_t contentSize
-                                                                        )
-    {
-      size_t remaining = contentSize;
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::CName *RTCPPacket::SDES::Chunk::cNameAtIndex(size_t index) const
+  {
+    ASSERT(index < mCNameCount)
+    return &(mFirstCName[index]);
+  }
 
-      if (remaining < (sizeof(DWORD)*3)) {
-        ZS_LOG_WARNING(Trace, debug("malformed REMB payload specific feedback message") + ZS_PARAM("remaining", remaining))
-        return false;
-      }
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::Name *RTCPPacket::SDES::Chunk::nameAtIndex(size_t index) const
+  {
+    ASSERT(index < mNameCount)
+    return &(mFirstName[index]);
+  }
 
-      size_t possibleSSRCs = (remaining - (sizeof(DWORD)*2)) / sizeof(DWORD);
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::Email *RTCPPacket::SDES::Chunk::emailAtIndex(size_t index) const
+  {
+    ASSERT(index < mEmailCount)
+    return &(mFirstEmail[index]);
+  }
 
-      mAllocationSize += (alignedSize(sizeof(DWORD)) * possibleSSRCs);
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getXRLossRLEReportBlockAllocationSize(
-                                                           BYTE typeSpecific,
-                                                           const BYTE *contents,
-                                                           size_t contentSize
-                                                           )
-    {
-      mAllocationSize += alignedSize(sizeof(XR::LossRLEReportBlock));
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::Phone *RTCPPacket::SDES::Chunk::phoneAtIndex(size_t index) const
+  {
+    ASSERT(index < mPhoneCount)
+    return &(mFirstPhone[index]);
+  }
 
-      const BYTE *pos = contents;
-      size_t remaining = contentSize;
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::Loc *RTCPPacket::SDES::Chunk::locAtIndex(size_t index) const
+  {
+    ASSERT(index < mLocCount)
+    return &(mFirstLoc[index]);
+  }
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Trace, debug("malformed loss RLE report block"))
-        return false;
-      }
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::Tool *RTCPPacket::SDES::Chunk::toolAtIndex(size_t index) const
+  {
+    ASSERT(index < mToolCount)
+    return &(mFirstTool[index]);
+  }
 
-      advancePos(pos, remaining, sizeof(DWORD)*2);
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::Note *RTCPPacket::SDES::Chunk::noteAtIndex(size_t index) const
+  {
+    ASSERT(index < mNoteCount)
+    return &(mFirstNote[index]);
+  }
 
-      size_t possibleChunks = remaining  / sizeof(WORD);
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::Priv *RTCPPacket::SDES::Chunk::privAtIndex(size_t index) const
+  {
+    ASSERT(index < mPrivCount)
+    return &(mFirstPriv[index]);
+  }
 
-      if (0 != possibleChunks) {
-        mAllocationSize += alignedSize(sizeof(XR::RLEChunk)) * possibleChunks;
-      }
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::Mid *RTCPPacket::SDES::Chunk::midAtIndex(size_t index) const
+  {
+    ASSERT(index < mMidCount)
+    return &(mFirstMid[index]);
+  }
 
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getXRDuplicateRLEReportBlockAllocationSize(
-                                                                BYTE typeSpecific,
-                                                                const BYTE *contents,
-                                                                size_t contentSize
-                                                                )
-    {
-      mAllocationSize += alignedSize(sizeof(XR::DuplicateRLEReportBlock));
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::Rid *RTCPPacket::SDES::Chunk::ridAtIndex(size_t index) const
+  {
+    ASSERT(index < mRidCount)
+    return &(mFirstRid[index]);
+  }
 
-      const BYTE *pos = contents;
-      size_t remaining = contentSize;
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES::Chunk::Unknown *RTCPPacket::SDES::Chunk::unknownAtIndex(size_t index) const
+  {
+    ASSERT(index < mUnknownCount)
+    return &(mFirstUnknown[index]);
+  }
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Trace, debug("malformed duplicate RLE report block"))
-        return false;
-      }
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::Bye
+  #pragma mark
 
-      advancePos(pos, remaining, sizeof(DWORD)*2);
+  //-------------------------------------------------------------------------
+  DWORD RTCPPacket::Bye::ssrc(size_t index) const
+  {
+    ASSERT(index < sc())
+    return mSSRCs[index];
+  }
 
-      size_t possibleChunks = remaining  / sizeof(WORD);
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::FeedbackMessage
+  #pragma mark
 
-      if (0 != possibleChunks) {
-        mAllocationSize += alignedSize(sizeof(XR::RLEChunk)) * possibleChunks;
+  //-------------------------------------------------------------------------
+  const char *RTCPPacket::FeedbackMessage::fmtToString(BYTE pt, BYTE fmt, DWORD subFmt)
+  {
+    switch (pt) {
+      case TransportLayerFeedbackMessage::kPayloadType:     {
+        switch (fmt) {
+          case TransportLayerFeedbackMessage::GenericNACK::kFmt:  return "GenericNACK";
+          case TransportLayerFeedbackMessage::TMMBR::kFmt:        return "TMMBR";
+          case TransportLayerFeedbackMessage::TMMBN::kFmt:        return "TMMBN";
+          default:                                                break;
+        }
+        break;
+      }
+      case PayloadSpecificFeedbackMessage::kPayloadType:    {
+        switch (fmt) {
+          case PayloadSpecificFeedbackMessage::PLI::kFmt:         return "PLI";
+          case PayloadSpecificFeedbackMessage::SLI::kFmt:         return "SLI";
+          case PayloadSpecificFeedbackMessage::RPSI::kFmt:        return "RPSI";
+          case PayloadSpecificFeedbackMessage::FIR::kFmt:         return "FIR";
+          case PayloadSpecificFeedbackMessage::TSTR::kFmt:        return "TSTR";
+          case PayloadSpecificFeedbackMessage::TSTN::kFmt:        return "TSTN";
+          case PayloadSpecificFeedbackMessage::VBCM::kFmt:        return "VBCM";
+          case PayloadSpecificFeedbackMessage::AFB::kFmt:         {
+            const char *tmp = "REMB";
+            if (subFmt == *(reinterpret_cast<const DWORD *>(tmp))) return "REMB";
+            return "AFB";
+          }
+          default:                                                break;
+        }
+        break;
+      }
+      default:                                              {
+        break;
       }
-
-      return true;
     }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getXRPacketReceiptTimesReportBlockAllocationSize(
-                                                                      BYTE typeSpecific,
-                                                                      const BYTE *contents,
-                                                                      size_t contentSize
-                                                                      )
-    {
-      mAllocationSize += alignedSize(sizeof(XR::PacketReceiptTimesReportBlock));
+    return "Unknown";
+  }
 
-      const BYTE *pos = contents;
-      size_t remaining = contentSize;
+  //-------------------------------------------------------------------------
+  const char *RTCPPacket::FeedbackMessage::fmtToString() const
+  {
+    if (PayloadSpecificFeedbackMessage::kPayloadType == mPT) {
+      if (PayloadSpecificFeedbackMessage::AFB::kFmt == mReportSpecific) {
+        auto result = reinterpret_cast<const PayloadSpecificFeedbackMessage *>(this);
+        const char tmp1[sizeof(DWORD)] {};
+        const char *tmp2 = "REMB";
+        const char *usingTmp = (result->mHasREMB ? tmp2 : (&(tmp1[0])));
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Trace, debug("malformed packet receipt times report block"))
-        return false;
+        return fmtToString(mPT, mReportSpecific, *(reinterpret_cast<const DWORD *>(usingTmp)));
       }
+    }
+    return fmtToString(mPT, mReportSpecific);
+  }
 
-      advancePos(pos, remaining, sizeof(DWORD)*2);
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::TransportLayerFeedbackMessage
+  #pragma mark
 
-      size_t possibleReceiptTimes = remaining  / sizeof(DWORD);
+  //-------------------------------------------------------------------------
+  RTCPPacket::TransportLayerFeedbackMessage::GenericNACK *RTCPPacket::TransportLayerFeedbackMessage::genericNACKAtIndex(size_t index) const
+  {
+    ASSERT(index < mGenericNACKCount)
+    return &(mFirstGenericNACK[index]);
+  }
 
-      if (0 != possibleReceiptTimes) {
-        mAllocationSize += alignedSize(sizeof(DWORD)) * possibleReceiptTimes;
-      }
+  //-------------------------------------------------------------------------
+  RTCPPacket::TransportLayerFeedbackMessage::TMMBR *RTCPPacket::TransportLayerFeedbackMessage::tmmbrAtIndex(size_t index) const
+  {
+    ASSERT(index < mTMMBRCount)
+    return &(mFirstTMMBR[index]);
+  }
 
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getXRReceiverReferenceTimeReportBlockAllocationSize(
-                                                                         BYTE typeSpecific,
-                                                                         const BYTE *contents,
-                                                                         size_t contentSize
-                                                                         )
-    {
-      mAllocationSize += alignedSize(sizeof(XR::ReceiverReferenceTimeReportBlock));
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getXRDLRRReportBlockAllocationSize(
-                                                        BYTE typeSpecific,
-                                                        const BYTE *contents,
-                                                        size_t contentSize
-                                                        )
-    {
-      mAllocationSize += alignedSize(sizeof(XR::DLRRReportBlock));
+  //-------------------------------------------------------------------------
+  RTCPPacket::TransportLayerFeedbackMessage::TMMBN *RTCPPacket::TransportLayerFeedbackMessage::tmmbnAtIndex(size_t index) const
+  {
+    ASSERT(index < mTMMBNCount)
+    return &(mFirstTMMBN[index]);
+  }
 
-      size_t possibleSubBlocks = contentSize / (sizeof(DWORD) + sizeof(DWORD) + sizeof(DWORD));
-      if (0 != possibleSubBlocks) {
-        mAllocationSize += alignedSize(sizeof(XR::DLRRReportBlock::SubBlock)) * possibleSubBlocks;
-      }
-      return true;
-    }
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::VBCM
+  #pragma mark
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getXRStatisticsSummaryReportBlockAllocationSize(
-                                                                     BYTE typeSpecific,
-                                                                     const BYTE *contents,
-                                                                     size_t contentSize
-                                                                     )
-    {
-      mAllocationSize += alignedSize(sizeof(XR::StatisticsSummaryReportBlock));
-      return true;
-    }
+  //-------------------------------------------------------------------------
+  BYTE RTCPPacket::PayloadSpecificFeedbackMessage::VBCM::zeroBit() const
+  {
+    return RTCP_GET_BITS(mControlSpecific, 0x1, 23);
+  }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getXRVoIPMetricsReportBlockAllocationSize(
-                                                               BYTE typeSpecific,
-                                                               const BYTE *contents,
-                                                               size_t contentSize
-                                                               )
-    {
-      mAllocationSize += alignedSize(sizeof(XR::VoIPMetricsReportBlock));
-      return true;
-    }
+  //-------------------------------------------------------------------------
+  BYTE RTCPPacket::PayloadSpecificFeedbackMessage::VBCM::payloadType() const
+  {
+    return RTCP_GET_BITS(mControlSpecific, 0x7F, 16);
+  }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::getXRUnknownReportBlockAllocationSize(
-                                                           BYTE typeSpecific,
-                                                           const BYTE *contents,
-                                                           size_t contentSize
-                                                           )
-    {
-      mAllocationSize += alignedSize(sizeof(XR::UnknownReportBlock));
-      return true;
-    }
+  //-------------------------------------------------------------------------
+  size_t RTCPPacket::PayloadSpecificFeedbackMessage::VBCM::vbcmOctetStringSize() const
+  {
+    return RTCP_GET_BITS(mControlSpecific, 0xFFFF, 0);
+  }
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket (parsing routines)
-    #pragma mark
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::REMB
+  #pragma mark
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(
-                           Report * &ioLastReport,
-                           BYTE version,
-                           BYTE padding,
-                           BYTE reportSpecific,
-                           BYTE pt,
-                           const BYTE *contents,
-                           size_t contentSize
-                           )
-    {
-      Report *usingReport = NULL;
-
-      switch (pt) {
-        case SenderReport::kPayloadType:                                {
-          auto temp = &(mFirstSenderReport[mSenderReportCount]);;
-          fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
-          if (!parse(temp)) return false;
-          usingReport = temp;
-          break;
-        }
-        case ReceiverReport::kPayloadType:                              {
-          auto temp = &(mFirstReceiverReport[mReceiverReportCount]);
-          fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
-          if (!parse(temp)) return false;
-          usingReport = temp;
-          break;
-        }
-        case SDES::kPayloadType:                                        {
-          auto temp = &(mFirstSDES[mSDESCount]);
-          fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
-          if (!parse(temp)) return false;
-          usingReport = temp;
-          break;
-        }
-        case Bye::kPayloadType:                                         {
-          auto temp = &(mFirstBye[mByeCount]);
-          fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
-          if (!parse(temp)) return false;
-          usingReport = temp;
-          break;
-        }
-        case App::kPayloadType:                                         {
-          auto temp = &(mFirstApp[mAppCount]);
-          fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
-          if (!parse(temp)) return false;
-          usingReport = temp;
-          break;
-        }
-        case TransportLayerFeedbackMessage::kPayloadType:               {
-          auto temp = &(mFirstTransportLayerFeedbackMessage[mTransportLayerFeedbackMessageCount]);
-          fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
-          if (!parse(temp)) return false;
-          usingReport = temp;
-          break;
-        }
-        case PayloadSpecificFeedbackMessage::kPayloadType:              {
-          auto temp = &(mFirstPayloadSpecificFeedbackMessage[mPayloadSpecificFeedbackMessageCount]);
-          fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
-          if (!parse(temp)) return false;
-          usingReport = temp;
-          break;
-        }
-        case XR::kPayloadType:                                          {
-          auto temp = &(mFirstXR[mXRCount]);
-          fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
-          if (!parse(temp)) return false;
-          usingReport = temp;
-          break;
-        }
-        default:
-        {
-          auto temp = &(mFirstUnknownReport[mUnknownReportCount]);
-          fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
-          if (!parse(temp)) return false;
-          usingReport = temp;
-          break;
-        }
-      }
+  //-------------------------------------------------------------------------
+  DWORD RTCPPacket::PayloadSpecificFeedbackMessage::REMB::ssrcAtIndex(size_t index) const
+  {
+    ASSERT(index < numSSRC())
+    return mSSRCs[index];
+  }
+
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage
+  #pragma mark
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::PayloadSpecificFeedbackMessage::PLI *RTCPPacket::PayloadSpecificFeedbackMessage::pli() const
+  {
+    if (PLI::kFmt != fmt()) return NULL;
+    return const_cast<PLI *>(&mPLI);
+  }
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::PayloadSpecificFeedbackMessage::SLI *RTCPPacket::PayloadSpecificFeedbackMessage::sliAtIndex(size_t index) const
+  {
+    ASSERT(index < mSLICount)
+    return &(mFirstSLI[index]);
+  }
 
-      if (NULL != ioLastReport) {
-        ioLastReport->mNext = usingReport;
-      }
+  //-------------------------------------------------------------------------
+  RTCPPacket::PayloadSpecificFeedbackMessage::FIR *RTCPPacket::PayloadSpecificFeedbackMessage::firAtIndex(size_t index) const
+  {
+    ASSERT(index < mFIRCount)
+    return &(mFirstFIR[index]);
+  }
 
-      ioLastReport = usingReport;
-      return true;
-    }
+  //-------------------------------------------------------------------------
+  RTCPPacket::PayloadSpecificFeedbackMessage::TSTR *RTCPPacket::PayloadSpecificFeedbackMessage::tstrAtIndex(size_t index) const
+  {
+    ASSERT(index < mTSTRCount)
+    return &(mFirstTSTR[index]);
+  }
 
-    //-------------------------------------------------------------------------
-    void RTCPPacket::fill(
-                          Report *report,
-                          BYTE version,
-                          BYTE padding,
-                          BYTE reportSpecific,
-                          BYTE pt,
-                          const BYTE *contents,
-                          size_t contentSize
-                          )
-    {
-      if (contentSize > 0) {
-        report->mPtr = contents;
-        report->mSize = contentSize;
+  //-------------------------------------------------------------------------
+  RTCPPacket::PayloadSpecificFeedbackMessage::TSTN *RTCPPacket::PayloadSpecificFeedbackMessage::tstnAtIndex(size_t index) const
+  {
+    ASSERT(index < mTSTNCount)
+    return &(mFirstTSTN[index]);
+  }
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::PayloadSpecificFeedbackMessage::VBCM *RTCPPacket::PayloadSpecificFeedbackMessage::vbcmAtIndex(size_t index) const
+  {
+    ASSERT(index < mVBCMCount)
+    return &(mFirstVBCM[index]);
+  }
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::PayloadSpecificFeedbackMessage::RPSI *RTCPPacket::PayloadSpecificFeedbackMessage::rpsi() const
+  {
+    if (RPSI::kFmt != fmt()) return NULL;
+    return const_cast<RPSI *>(&mRPSI);
+  }
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::PayloadSpecificFeedbackMessage::AFB *RTCPPacket::PayloadSpecificFeedbackMessage::afb() const
+  {
+    if (AFB::kFmt != fmt()) return NULL;
+    if (mHasREMB) return NULL;
+    return const_cast<AFB *>(&mAFB);
+  }
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::PayloadSpecificFeedbackMessage::REMB *RTCPPacket::PayloadSpecificFeedbackMessage::remb() const
+  {
+    if (REMB::kFmt != fmt()) return NULL;
+    if (!mHasREMB) return NULL;
+    return const_cast<REMB *>(&mREMB);
+  }
+
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR::ReportBlock
+  #pragma mark
+
+  //-------------------------------------------------------------------------
+  const char *RTCPPacket::XR::ReportBlock::blockTypeToString(BYTE blockType)
+  {
+    switch (blockType) {
+      case LossRLEReportBlock::kBlockType:                return "LossRLEReportBlock";
+      case DuplicateRLEReportBlock::kBlockType:           return "DuplicateRLEReportBlock";
+      case PacketReceiptTimesReportBlock::kBlockType:     return "PacketReceiptTimesReportBlock";
+      case ReceiverReferenceTimeReportBlock::kBlockType:  return "ReceiverReferenceTimeReportBlock";
+      case DLRRReportBlock::kBlockType:                   return "DLRRReportBlock";
+      case StatisticsSummaryReportBlock::kBlockType:      return "StatisticsSummaryReportBlock";
+      case VoIPMetricsReportBlock::kBlockType:            return "VoIPMetricsReportBlock";
+      default: {
+        break;
       }
-      report->mVersion = version;
-      report->mPadding = padding;
-      report->mReportSpecific = reportSpecific;
-      report->mPT = pt;
     }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseCommon(
-                                 SenderReceiverCommonReport *report,
-                                 size_t detailedHeaderSize
-                                 )
-    {
-      const BYTE *pos = report->ptr();
-      size_t remaining = report->size();
+    return "UnknownReportBlock";
+  }
 
-      {
-        if (remaining < sizeof(DWORD)) goto illegal_size;
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR::ReportBlockRange
+  #pragma mark
 
-        report->mSSRCOfSender = RTPUtils::getBE32(pos);
+  //-------------------------------------------------------------------------
+  BYTE RTCPPacket::XR::ReportBlockRange::reserved() const
+  {
+    return RTCP_GET_BITS(mTypeSpecific, 0xF, 4);
+  }
 
-        advancePos(pos, remaining, sizeof(DWORD));
+  //-------------------------------------------------------------------------
+  BYTE RTCPPacket::XR::ReportBlockRange::thinning() const
+  {
+    return RTCP_GET_BITS(mTypeSpecific, 0xF, 0);
+  }
 
-        if (remaining < detailedHeaderSize) goto illegal_size;
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR::RLEReportBlock
+  #pragma mark
 
-        advancePos(pos, remaining, detailedHeaderSize);
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::RLEChunk RTCPPacket::XR::RLEReportBlock::chunkAtIndex(size_t index) const
+  {
+    ASSERT(index < chunkCount())
+    return mChunks[index];
+  }
 
-        size_t count = 0;
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR::PacketReceiptTimesReportBlock
+  #pragma mark
 
-        if (report->rc() > 0) {
-          report->mFirstReportBlock = new (allocateBuffer(alignedSize(sizeof(SenderReceiverCommonReport::ReportBlock))*report->rc())) SenderReceiverCommonReport::ReportBlock[report->rc()];
+  //-------------------------------------------------------------------------
+  DWORD RTCPPacket::XR::PacketReceiptTimesReportBlock::receiptTimeAtIndex(size_t index) const
+  {
+    ASSERT(index < receiptTimeCount())
+    return mReceiptTimes[index];
+  }
 
-          while ((remaining >= (sizeof(DWORD)*6)) &&
-                 (count < report->rc()))
-          {
-            SenderReceiverCommonReport::ReportBlock *block = &(report->mFirstReportBlock[count]);
-            if (0 != count) {
-              report->mFirstReportBlock[count-1].mNext = block;
-            }
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR::ReceiverReferenceTimeReportBlock
+  #pragma mark
 
-            block->mSSRC = RTPUtils::getBE32(&(pos[0]));
-            block->mFractionLost = pos[4];
-            block->mCumulativeNumberOfPacketsLost = RTPUtils::getBE32(&(pos[4]));
-            block->mCumulativeNumberOfPacketsLost = block->mCumulativeNumberOfPacketsLost & 0x00FFFFFF;
-            block->mExtendedHighestSequenceNumberReceived = RTPUtils::getBE32(&(pos[8]));
-            block->mInterarrivalJitter = RTPUtils::getBE32(&(pos[12]));
-            block->mLSR = RTPUtils::getBE32(&(pos[16]));
-            block->mDLSR = RTPUtils::getBE32(&(pos[20]));
+  //-------------------------------------------------------------------------
+  Time RTCPPacket::XR::ReceiverReferenceTimeReportBlock::ntpTimestamp() const
+  {
+    return UseRTPUtils::ntpToTime(mNTPTimestampMS, mNTPTimestampLS);
+  }
 
-            advancePos(pos, remaining, sizeof(DWORD)*6);
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR::DLRRReportBlock
+  #pragma mark
 
-            ++count;
-          }
-        }
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::DLRRReportBlock::SubBlock *RTCPPacket::XR::DLRRReportBlock::subBlockAtIndex(size_t index) const
+  {
+    ASSERT(index < subBlockCount())
+    return &(mSubBlocks[index]);
+  }
 
-        if (count != report->rc()) goto illegal_size;
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR::StatisticsSummaryReportBlock
+  #pragma mark
 
-        if (0 != remaining) {
-          report->mExtension = pos;
-          report->mExtensionSize = remaining;
-        }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::XR::StatisticsSummaryReportBlock::lossReportFlag() const
+  {
+    return RTCP_IS_FLAG_SET(mTypeSpecific, 7);
+  }
 
-        return true;
-      }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::XR::StatisticsSummaryReportBlock::duplicateReportFlag() const
+  {
+    return RTCP_IS_FLAG_SET(mTypeSpecific, 6);
+  }
 
-    illegal_size:
-      {
-        ZS_LOG_WARNING(Trace, debug("unable to parse sender/receiver report (malformed packet)") + ZS_PARAM("remaining", remaining) + ZS_PARAM("detailed header size", detailedHeaderSize))
-      }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::XR::StatisticsSummaryReportBlock::jitterFlag() const
+  {
+    return RTCP_IS_FLAG_SET(mTypeSpecific, 5);
+  }
 
-      return false;
-    }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::XR::StatisticsSummaryReportBlock::ttlFlag() const
+  {
+    return (1 == RTCP_GET_BITS(mTypeSpecific, 0x3, 3));
+  }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(SenderReport *report)
-    {
-      if (0 != mSenderReportCount) {
-        (&(mFirstSenderReport[mSenderReportCount-1]))->mNextSenderReport = report;
-      }
-      ++mSenderReportCount;
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::XR::StatisticsSummaryReportBlock::hopLimitFlag() const
+  {
+    return (2 == RTCP_GET_BITS(mTypeSpecific, 0x3, 3));
+  }
 
-      if (!parseCommon(report, sizeof(DWORD)*5)) return false;
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR::VoIPMetricsReportBlock
+  #pragma mark
 
-      const BYTE *pos = report->ptr();
+  //-------------------------------------------------------------------------
+  BYTE RTCPPacket::XR::VoIPMetricsReportBlock::plc() const
+  {
+    return RTCP_GET_BITS(mRXConfig, 0x3, 6);
+  }
 
-      report->mNTPTimestampMS = RTPUtils::getBE32(&(pos[4]));
-      report->mNTPTimestampLS = RTPUtils::getBE32(&(pos[8]));
-      report->mRTPTimestamp = RTPUtils::getBE32(&(pos[12]));
-      report->mSenderPacketCount = RTPUtils::getBE32(&(pos[16]));
-      report->mSenderOctetCount = RTPUtils::getBE32(&(pos[20]));
+  //-------------------------------------------------------------------------
+  BYTE RTCPPacket::XR::VoIPMetricsReportBlock::jba() const
+  {
+    return RTCP_GET_BITS(mRXConfig, 0x3, 4);
+  }
 
-      return true;
-    }
+  //-------------------------------------------------------------------------
+  BYTE RTCPPacket::XR::VoIPMetricsReportBlock::jbRate() const
+  {
+    return RTCP_GET_BITS(mRXConfig, 0xF, 0);
+  }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(ReceiverReport *report)
-    {
-      if (0 != mReceiverReportCount) {
-        (&(mFirstReceiverReport[mReceiverReportCount-1]))->mNextReceiverReport = report;
-      }
-      ++mReceiverReportCount;
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR::RunLength
+  #pragma mark
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::RunLength::RunLength(RLEChunk chunk) :
+    mRunType(RTCP_GET_BITS(chunk, 0x1, 14)),
+    mRunLength(RTCP_GET_BITS(chunk, 0x3FFF, 0))
+  {
+  }
 
-      if (!parseCommon(report, 0)) return false;
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR::BitVector
+  #pragma mark
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::BitVector::BitVector(RLEChunk chunk) :
+    mBitVector(RTCP_GET_BITS(chunk, 0x7FFF, 0))
+  {
+  }
 
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(SDES *report)
-    {
-      if (0 != mSDESCount) {
-        (&(mFirstSDES[mSDESCount-1]))->mNextSDES = report;
-      }
-      ++mSDESCount;
+  //-------------------------------------------------------------------------
+  BYTE RTCPPacket::XR::BitVector::bitAtIndex(size_t index) const
+  {
+    ASSERT(index < (sizeof(WORD)*8))
+    return (mBitVector >> ((sizeof(WORD)*8)-index-1)) & 0x1;
+  }
 
-      if (0 == report->sc()) return true;
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket::XR
+  #pragma mark
 
-      size_t chunkCount = 0;
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::LossRLEReportBlock *RTCPPacket::XR::lossRLEReportBlockAtIndex(size_t index) const
+  {
+    ASSERT(index < mLossRLEReportBlockCount)
+    return &(mFirstLossRLEReportBlock[index]);
+  }
 
-      const BYTE *pos = report->ptr();
-      size_t remaining = report->size();
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::DuplicateRLEReportBlock *RTCPPacket::XR::duplicateRLEReportBlockAtIndex(size_t index) const
+  {
+    ASSERT(index < mDuplicateRLEReportBlockCount)
+    return &(mFirstDuplicateRLEReportBlock[index]);
+  }
 
-      report->mFirstChunk = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk))*(report->sc()))) SDES::Chunk[report->sc()];
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::PacketReceiptTimesReportBlock *RTCPPacket::XR::packetReceiptTimesReportBlockAtIndex(size_t index) const
+  {
+    ASSERT(index < mPacketReceiptTimesReportBlockCount)
+    return &(mFirstPacketReceiptTimesReportBlock[index]);
+  }
 
-      while ((remaining > sizeof(DWORD)) &&
-             ((chunkCount < report->sc())))
-      {
-        SDES::Chunk *chunk = &(report->mFirstChunk[chunkCount]);
-        if (0 != chunkCount) {
-          report->mFirstChunk[chunkCount-1].mNext = chunk;
-        }
-        ++chunkCount;
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::ReceiverReferenceTimeReportBlock *RTCPPacket::XR::receiverReferenceTimeReportBlockAtIndex(size_t index) const
+  {
+    ASSERT(index < mReceiverReferenceTimeReportBlockCount)
+    return &(mFirstReceiverReferenceTimeReportBlock[index]);
+  }
 
-        ZS_LOG_INSANE(log("parsing SDES chunk") + ZS_PARAM("chunk number", chunkCount-1))
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::DLRRReportBlock *RTCPPacket::XR::dlrrReportBlockAtIndex(size_t index) const
+  {
+    ASSERT(index < mDLRRReportBlockCount)
+    return &(mFirstDLRRReportBlock[index]);
+  }
 
-        chunk->mSSRC = RTPUtils::getBE32(pos);
-        advancePos(pos, remaining, sizeof(DWORD));
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::StatisticsSummaryReportBlock *RTCPPacket::XR::statisticsSummaryReportBlockAtIndex(size_t index) const
+  {
+    ASSERT(index < mStatisticsSummaryReportBlockCount)
+    return &(mFirstStatisticsSummaryReportBlock[index]);
+  }
 
-        const BYTE *startOfItems = pos;
-        size_t remainingAtStartOfItems = remaining;
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::VoIPMetricsReportBlock *RTCPPacket::XR::voIPMetricsReportBlockAtIndex(size_t index) const
+  {
+    ASSERT(index < mVoIPMetricsReportBlockCount)
+    return &(mFirstVoIPMetricsReportBlock[index]);
+  }
 
-        // first do an items count
-        while (remaining >= sizeof(BYTE)) {
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR::UnknownReportBlock *RTCPPacket::XR::unknownReportBlockAtIndex(size_t index) const
+  {
+    ASSERT(index < mUnknownReportBlockCount)
+    return &(mFirstUnknownReportBlock[index]);
+  }
 
-          BYTE type = *pos;
-          advancePos(pos, remaining);
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::XR::isRunLengthChunk(RLEChunk chunk)
+  {
+    return !RTCP_IS_FLAG_SET(chunk, 15);
+  }
 
-          if (SDES::Chunk::kEndOfItemsType == type) {
-            // stop now (going to retry parsing again anyway)
-            break;
-          }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::XR::isBitVectorChunk(RLEChunk chunk)
+  {
+    return RTCP_IS_FLAG_SET(chunk, 15);
+  }
 
-          ASSERT(remaining >= sizeof(BYTE))
-
-          size_t length = static_cast<size_t>(*pos);
-          advancePos(pos, remaining);
-
-          ASSERT(remaining >= length)
-
-          switch (type) {
-            case SDES::Chunk::CName::kItemType: ++(chunk->mCNameCount); break;
-            case SDES::Chunk::Name::kItemType:  ++(chunk->mNameCount); break;
-            case SDES::Chunk::Email::kItemType: ++(chunk->mEmailCount); break;
-            case SDES::Chunk::Phone::kItemType: ++(chunk->mPhoneCount); break;
-            case SDES::Chunk::Loc::kItemType:   ++(chunk->mLocCount); break;
-            case SDES::Chunk::Tool::kItemType:  ++(chunk->mToolCount); break;
-            case SDES::Chunk::Note::kItemType:  ++(chunk->mNoteCount); break;
-            case SDES::Chunk::Priv::kItemType:  ++(chunk->mPrivCount); break;
-            case SDES::Chunk::Mid::kItemType:   ++(chunk->mMidCount); break;
-            case SDES::Chunk::Rid::kItemType:   ++(chunk->mRidCount); break;
-            default:
-            {
-              ++(chunk->mUnknownCount);
-              ZS_LOG_WARNING(Insane, log("SDES item type is not understood") + ZS_PARAM("type", type))
-              break;
-            }
-          }
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket (public)
+  #pragma mark
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::RTCPPacket(
+                         const make_private &,
+                         MediaChannelID mediaChannelID
+                         ) :
+    mMediaChannelID(mediaChannelID)
+  {
+  }
 
-          advancePos(pos, remaining, length);
-        }
+  //-------------------------------------------------------------------------
+  RTCPPacket::~RTCPPacket()
+  {
+  }
 
-        // allocate space for items
+  //-------------------------------------------------------------------------
+  RTCPPacketPtr RTCPPacket::create(
+                                   const BYTE *buffer,
+                                   size_t bufferLengthInBytes,
+                                   MediaChannelID mediaChannelID
+                                   )
+  {
+    ORTC_THROW_INVALID_PARAMETERS_IF(!buffer)
+    ORTC_THROW_INVALID_PARAMETERS_IF(0 == bufferLengthInBytes)
+    return RTCPPacket::create(UseServicesHelper::convertToBuffer(buffer, bufferLengthInBytes), mediaChannelID);
+  }
 
-        if (0 != chunk->mCNameCount) {
-          chunk->mFirstCName = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::CName))*(chunk->mCNameCount))) SDES::Chunk::CName[chunk->mCNameCount];
-        }
-        if (0 != chunk->mNameCount) {
-          chunk->mFirstName = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::Name))*(chunk->mNameCount))) SDES::Chunk::Name[chunk->mNameCount];
-        }
-        if (0 != chunk->mEmailCount) {
-          chunk->mFirstEmail = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::Email))*(chunk->mEmailCount))) SDES::Chunk::Email[chunk->mEmailCount];
-        }
-        if (0 != chunk->mPhoneCount) {
-          chunk->mFirstPhone = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::Phone))*(chunk->mPhoneCount))) SDES::Chunk::Phone[chunk->mPhoneCount];
-        }
-        if (0 != chunk->mLocCount) {
-          chunk->mFirstLoc = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::Loc))*(chunk->mLocCount))) SDES::Chunk::Loc[chunk->mLocCount];
-        }
-        if (0 != chunk->mToolCount) {
-          chunk->mFirstTool = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::Tool))*(chunk->mToolCount))) SDES::Chunk::Tool[chunk->mToolCount];
-        }
-        if (0 != chunk->mNoteCount) {
-          chunk->mFirstNote = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::Note))*(chunk->mNoteCount))) SDES::Chunk::Note[chunk->mNoteCount];
-        }
-        if (0 != chunk->mPrivCount) {
-          chunk->mFirstPriv = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::Priv))*(chunk->mPrivCount))) SDES::Chunk::Priv[chunk->mPrivCount];
-        }
-        if (0 != chunk->mMidCount) {
-          chunk->mFirstMid = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::Mid))*(chunk->mMidCount))) SDES::Chunk::Mid[chunk->mMidCount];
-        }
-        if (0 != chunk->mRidCount) {
-          chunk->mFirstRid = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::Rid))*(chunk->mRidCount))) SDES::Chunk::Rid[chunk->mRidCount];
-        }
-        if (0 != chunk->mUnknownCount) {
-          chunk->mFirstUnknown = new (allocateBuffer(alignedSize(sizeof(SDES::Chunk::Unknown))*(chunk->mUnknownCount))) SDES::Chunk::Unknown[chunk->mUnknownCount];
-        }
+  //-------------------------------------------------------------------------
+  RTCPPacketPtr RTCPPacket::create(
+                                   const SecureByteBlock &buffer,
+                                   MediaChannelID mediaChannelID
+                                   )
+  {
+    return RTCPPacket::create(buffer.BytePtr(), buffer.SizeInBytes(), mediaChannelID);
+  }
 
-        chunk->mCNameCount = 0;
-        chunk->mNameCount = 0;
-        chunk->mEmailCount = 0;
-        chunk->mPhoneCount = 0;
-        chunk->mLocCount = 0;
-        chunk->mToolCount = 0;
-        chunk->mNoteCount = 0;
-        chunk->mPrivCount = 0;
-        chunk->mMidCount = 0;
-        chunk->mRidCount = 0;
-        chunk->mUnknownCount = 0;
+  //-------------------------------------------------------------------------
+  RTCPPacketPtr RTCPPacket::create(
+                                   SecureByteBlockPtr buffer,
+                                   MediaChannelID mediaChannelID
+                                   )
+  {
+    RTCPPacketPtr pThis(make_shared<RTCPPacket>(make_private{}, mediaChannelID));
+    pThis->mBuffer = buffer;
+    if (!pThis->parse()) {
+      ZS_EVENTING_4(x, w, Debug, RTCPPacketParseWarningNotParsed, ol, RtcpPacket, Parse,
+        string, message, "packet could not be parsed",
+        puid, mediaChannelID, mediaChannelID,
+        buffer, buffer, ((bool)buffer) ? buffer->BytePtr() : NULL,
+        size, size, ((bool)buffer) ? buffer->SizeInBytes() : 0
+      );
+      return RTCPPacketPtr();
+    }
+    return pThis;
+  }
 
-        // start over and now parse
-        pos = startOfItems;
-        remaining = remainingAtStartOfItems;
+  //-------------------------------------------------------------------------
+  RTCPPacketPtr RTCPPacket::create(
+                                   const Report *first,
+                                   MediaChannelID mediaChannelID
+                                   )
+  {
+    size_t allocationSize = getPacketSize(first);
+    SecureByteBlockPtr temp(make_shared<SecureByteBlock>(allocationSize));
 
-        while (remaining >= sizeof(BYTE)) {
+    BYTE *buffer = temp->BytePtr();
+    BYTE *pos = buffer;
+    writePacket(first, pos, allocationSize);
 
-          BYTE type = *pos;
-          advancePos(pos, remaining);
+    return create(temp, mediaChannelID);
+  }
 
-          if (SDES::Chunk::kEndOfItemsType == type) {
-            // skip NUL item (no length octet is present)
+  //-------------------------------------------------------------------------
+  SecureByteBlockPtr RTCPPacket::generateFrom(const Report *first)
+  {
+    size_t allocationSize = getPacketSize(first);
+    SecureByteBlockPtr temp(make_shared<SecureByteBlock>(allocationSize));
 
-            // skip to next DWORD alignment
-            auto diff = reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(ptr());
-            while ((0 != (diff % sizeof(DWORD))) &&
-                   (remaining > 0))
-            {
-              // only NUL chunks are allowed
-              ASSERT(SDES::Chunk::kEndOfItemsType == (*pos))
-              advancePos(pos, remaining);
-              ++diff;
-            }
-            break;
-          }
+    BYTE *buffer = temp->BytePtr();
+    BYTE *pos = buffer;
+    writePacket(first, pos, allocationSize);
 
-          ASSERT(remaining >= sizeof(BYTE))
+    return temp;
+  }
 
-          size_t length = static_cast<size_t>(*pos);
-          advancePos(pos, remaining);
+  //-------------------------------------------------------------------------
+  const BYTE *RTCPPacket::ptr() const
+  {
+    return mBuffer->BytePtr();
+  }
 
-          ASSERT(remaining >= length)
+  //-------------------------------------------------------------------------
+  size_t RTCPPacket::size() const
+  {
+    return mBuffer->SizeInBytes();
+  }
 
-          SDES::Chunk::StringItem *item {};
+  //-------------------------------------------------------------------------
+  SecureByteBlockPtr RTCPPacket::buffer() const
+  {
+    return mBuffer;
+  }
 
-          const char *prefixStr = NULL;
-          size_t prefixLen = 0;
+  //-------------------------------------------------------------------------
+  RTCPPacket::SenderReport *RTCPPacket::senderReportAtIndex(size_t index) const
+  {
+    ASSERT(index < mSenderReportCount)
+    return &(mFirstSenderReport[index]);
+  }
 
-          switch (type) {
-            case SDES::Chunk::CName::kItemType: {
-              item = &(chunk->mFirstCName[chunk->mCNameCount]);
-              if (0 != chunk->mCNameCount) {
-                (&(chunk->mFirstCName[chunk->mCNameCount-1]))->mNext = item;
-              }
-              ++(chunk->mCNameCount);
-              break;
-            }
-            case SDES::Chunk::Name::kItemType:  {
-              item = &(chunk->mFirstName[chunk->mNameCount]);
-              if (0 != chunk->mNameCount) {
-                (&(chunk->mFirstName[chunk->mNameCount-1]))->mNext = item;
-              }
-              ++(chunk->mNameCount);
-              break;
-            }
-            case SDES::Chunk::Email::kItemType: {
-              item = &(chunk->mFirstEmail[chunk->mEmailCount]);
-              if (0 != chunk->mEmailCount) {
-                (&(chunk->mFirstEmail[chunk->mEmailCount-1]))->mNext = item;
-              }
-              ++(chunk->mEmailCount);
-              break;
-            }
-            case SDES::Chunk::Phone::kItemType: {
-              item = &(chunk->mFirstPhone[chunk->mPhoneCount]);
-              if (0 != chunk->mPhoneCount) {
-                (&(chunk->mFirstPhone[chunk->mPhoneCount-1]))->mNext = item;
-              }
-              ++(chunk->mPhoneCount);
-              break;
-            }
-            case SDES::Chunk::Loc::kItemType:   {
-              item = &(chunk->mFirstLoc[chunk->mLocCount]);
-              if (0 != chunk->mLocCount) {
-                (&(chunk->mFirstLoc[chunk->mLocCount-1]))->mNext = item;
-              }
-              ++(chunk->mLocCount);
-              break;
-            }
-            case SDES::Chunk::Tool::kItemType:  {
-              item = &(chunk->mFirstTool[chunk->mToolCount]);
-              if (0 != chunk->mToolCount) {
-                (&(chunk->mFirstTool[chunk->mToolCount-1]))->mNext = item;
-              }
-              ++(chunk->mToolCount);
-              break;
-            }
-            case SDES::Chunk::Note::kItemType:  {
-              item = &(chunk->mFirstNote[chunk->mNoteCount]);
-              if (0 != chunk->mNoteCount) {
-                (&(chunk->mFirstNote[chunk->mNoteCount-1]))->mNext = item;
-              }
-              ++(chunk->mNoteCount);
-              break;
-            }
-            case SDES::Chunk::Priv::kItemType:  {
-              SDES::Chunk::Priv *priv = &(chunk->mFirstPriv[chunk->mPrivCount]);
-              if (0 != chunk->mPrivCount) {
-                (&(chunk->mFirstPriv[chunk->mPrivCount-1]))->mNext = priv;
-              }
+  //-------------------------------------------------------------------------
+  RTCPPacket::ReceiverReport *RTCPPacket::receiverReportAtIndex(size_t index) const
+  {
+    ASSERT(index < mReceiverReportCount)
+    return &(mFirstReceiverReport[index]);
+  }
 
-              if (length > 0) {
-                prefixLen = static_cast<size_t>(*pos);
-                advancePos(pos, remaining);
-                --length;
-                if (0 != prefixLen) {
-                  priv->mPrefix = new (allocateBuffer(sizeof(char)*(prefixLen+1))) char [prefixLen+1];
-                  priv->mPrefixLength = prefixLen;
-                  memcpy(const_cast<char *>(priv->mPrefix), pos, prefixLen);
-
-                  advancePos(pos, remaining, prefixLen);
-                  ASSERT(length >= prefixLen)
-
-                  length -= prefixLen;
-                }
-              }
+  //-------------------------------------------------------------------------
+  RTCPPacket::SDES *RTCPPacket::sdesAtIndex(size_t index) const
+  {
+    ASSERT(index < mSDESCount)
+    return &(mFirstSDES[index]);
+  }
 
-              item = priv;
+  //-------------------------------------------------------------------------
+  RTCPPacket::Bye *RTCPPacket::byeAtIndex(size_t index) const
+  {
+    ASSERT(index < mByeCount)
+    return &(mFirstBye[index]);
+  }
 
-              ++(chunk->mPrivCount);
-              break;
-            }
-            case SDES::Chunk::Mid::kItemType:  {
-              item = &(chunk->mFirstMid[chunk->mMidCount]);
-              if (0 != chunk->mMidCount) {
-                (&(chunk->mFirstMid[chunk->mMidCount-1]))->mNext = item;
-              }
-              ++(chunk->mMidCount);
-              break;
-            }
-            case SDES::Chunk::Rid::kItemType:  {
-              item = &(chunk->mFirstRid[chunk->mRidCount]);
-              if (0 != chunk->mRidCount) {
-                (&(chunk->mFirstRid[chunk->mRidCount-1]))->mNext = item;
-              }
-              ++(chunk->mRidCount);
-              break;
-            }
-            default:
-            {
-              item = &(chunk->mFirstUnknown[chunk->mUnknownCount]);
-              if (0 != chunk->mUnknownCount) {
-                (&(chunk->mFirstUnknown[chunk->mUnknownCount-1]))->mNext = item;
-              }
-              ++(chunk->mUnknownCount);
-              ZS_LOG_WARNING(Insane, log("SDES item type is not understood") + ZS_PARAM("type", type))
-              break;
-            }
-          }
+  //-------------------------------------------------------------------------
+  RTCPPacket::App *RTCPPacket::appAtIndex(size_t index) const
+  {
+    ASSERT(index < mAppCount)
+    return &(mFirstApp[index]);
+  }
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::TransportLayerFeedbackMessage *RTCPPacket::transportLayerFeedbackReportAtIndex(size_t index) const
+  {
+    ASSERT(index < mTransportLayerFeedbackMessageCount)
+    return &(mFirstTransportLayerFeedbackMessage[index]);
+  }
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::PayloadSpecificFeedbackMessage *RTCPPacket::payloadSpecificFeedbackReportAtIndex(size_t index) const
+  {
+    ASSERT(index < mPayloadSpecificFeedbackMessageCount)
+    return &(mFirstPayloadSpecificFeedbackMessage[index]);
+  }
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::XR *RTCPPacket::xrAtIndex(size_t index) const
+  {
+    ASSERT(index < mXRCount)
+    return &(mFirstXR[index]);
+  }
+
+  //-------------------------------------------------------------------------
+  RTCPPacket::UnknownReport *RTCPPacket::unknownAtIndex(size_t index) const
+  {
+    ASSERT(index < mUnknownReportCount)
+    return &(mFirstUnknownReport[index]);
+  }
+
+  //-------------------------------------------------------------------------
+  void RTCPPacket::trace(
+    const char *func,
+    const char *message
+    ) const
+  {
+    ZS_EVENTING_8(x, i, Basic, RTCPPacketTrace, ol, RtcpPacket, Info,
+      puid, mediaChannelID, mMediaChannelID,
+      string, func, func,
+      string, message, message,
+      buffer, buffer, ((bool)mBuffer) ? mBuffer->BytePtr() : NULL,
+      size, size, ((bool)mBuffer) ? mBuffer->SizeInBytes() : 0,
+      buffer, allocationBuffer, ((bool)mAllocationBuffer) ? mAllocationBuffer->BytePtr() : NULL,
+      size, allocationBuffersize, ((bool)mAllocationBuffer) ? mAllocationBuffer->SizeInBytes() : 0,
+      size_t, allocationPos, (NULL != mAllocationPos ? (mAllocationBuffer ? (reinterpret_cast<PTRNUMBER>(mAllocationPos) - reinterpret_cast<PTRNUMBER>(mAllocationBuffer->BytePtr())) : reinterpret_cast<PTRNUMBER>(mAllocationPos)) : 0)
+    );
+
+    for (Report *report = mFirst; NULL != report; report = report->next())
+    {
+      switch (report->pt()) {
+        case SenderReport::kPayloadType:
+        {
+          SenderReport *sr = static_cast<SenderReport *>(report);
+          internal::traceSenderReport(mMediaChannelID, sr);
+          break;
+        }
+        case ReceiverReport::kPayloadType:
+        {
+          ReceiverReport *rr = static_cast<ReceiverReport *>(report);
+          internal::traceReceiverReport(mMediaChannelID, rr);
+          break;
+        }
+        case SDES::kPayloadType:
+        {
+          SDES *sdes = static_cast<SDES *>(report);
+          internal::traceSDES(mMediaChannelID, sdes);
+          break;
+        }
+        case Bye::kPayloadType:
+        {
+          Bye *bye = static_cast<Bye *>(report);
+          internal::traceBye(mMediaChannelID, bye);
+          break;
+        }
+        case App::kPayloadType:
+        {
+          App *app = static_cast<App *>(report);
+          internal::traceApp(mMediaChannelID, app);
+          break;
+        }
+        case TransportLayerFeedbackMessage::kPayloadType:
+        {
+          TransportLayerFeedbackMessage *fm = static_cast<TransportLayerFeedbackMessage *>(report);
+          internal::traceTransportLayerFeedbackMessage(mMediaChannelID, fm);
+          break;
+        }
+        case PayloadSpecificFeedbackMessage::kPayloadType:
+        {
+          PayloadSpecificFeedbackMessage *fm = static_cast<PayloadSpecificFeedbackMessage *>(report);
+          internal::tracePayloadSpecificFeedbackMessage(mMediaChannelID, fm);
+          break;
+        }
+        case XR::kPayloadType:
+        {
+          XR *xr = static_cast<XR *>(report);
+          internal::traceXR(mMediaChannelID, xr);
+          break;
+        }
+        default:
+        {
+          UnknownReport *unknown = static_cast<UnknownReport *>(report);
+          ZS_EVENTING_2(x, i, Basic, RTCPPacketTraceUnknownReport, ol, RtcpPacket, Info,
+            puid, mediaChannelID, mMediaChannelID,
+            bool, next, (NULL != unknown->nextUnknown())
+          );
+          break;
+        }
+      }
+    }
+  }
 
-          if (NULL != item) {
-            item->mType = type;
-            if (length > 0) {
-              item->mValue = new (allocateBuffer(length+1)) char [length+1];
-              item->mLength = length;
-              memcpy(const_cast<char *>(item->mValue), pos, length);
-            }
-            if (ZS_IS_LOGGING(Insane)) {
-              if (NULL != prefixStr) {
-                ZS_LOG_INSANE(packet_slog("parsing SDES") + ZS_PARAM("type", item->typeToString()) + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("prefix len", prefixLen) + ZS_PARAM("prefix", prefixStr) + ZS_PARAM("len", length) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-              } else {
-                ZS_LOG_INSANE(packet_slog("parsing SDES") + ZS_PARAM("type", item->typeToString()) + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", length) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-              }
-            }
-          }
 
-          ++(chunk->mCount);
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket (internal)
+  #pragma mark
+
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse()
+  {
+    const BYTE *buffer = mBuffer->BytePtr();
+    size_t size = mBuffer->SizeInBytes();
+
+    if (size < internal::kMinRtcpPacketLen) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "packet length is too short",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, 0,
+        size_t, length, size
+      );
+      ZS_EVENTING_TRACE_OBJECT(Insane, *this, "packet length is too short");
+      return false;
+    }
+
+    bool foundPaddingBit = false;
+
+    // scope: calculate total memory allocation size needed to parse entire RTCP packet
+    {
+      size_t remaining = size;
+      const BYTE *pos = buffer;
 
-          advancePos(pos, remaining, length);
+      while (remaining >= internal::kMinRtcpPacketLen) {
+        BYTE version = RTCP_GET_BITS(*pos, 0x3, 6);
+        if (internal::kRtpVersion != version) {
+          ZS_EVENTING_3(x, w, Trace, RTCPPacketParseWarningIllegalVersion, ol, RtcpPacket, Parse,
+            string, message, "illegal version found",
+            puid, mediaChannelID, mMediaChannelID,
+            byte, version, version
+          );
+          ZS_EVENTING_TRACE_OBJECT(Insane, *this, "illegal version found");
+          return false;
         }
 
-      }
+        size_t length = sizeof(DWORD) + (static_cast<size_t>(UseRTPUtils::getBE16(&(pos[2]))) * sizeof(DWORD));
 
-      if (chunkCount != report->sc()) {
-        ZS_LOG_WARNING(Trace, debug("chunk count in SDES does not match packet count") + ZS_PARAM("chunk count", chunkCount) + ZS_PARAM("packet count", report->sc()))
-        return false;
-      }
+        size_t padding = 0;
 
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(Bye *report)
-    {
-      if (0 != mByeCount) {
-        (&(mFirstBye[mByeCount-1]))->mNextBye = report;
-      }
-      ++mByeCount;
+        if (RTCP_IS_FLAG_SET(*pos, 5)) {
+          if (foundPaddingBit) {
+            ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+              string, message, "found illegal second padding bit set in compound RTCP block",
+              puid, mediaChannelID, mMediaChannelID,
+              size_t, remaining, remaining,
+              size_t, length, length
+            );
+            ZS_EVENTING_TRACE_OBJECT(Insane, *this, "found illegal second padding bit set in compound RTCP block");
+            return false;
+          }
 
-      const BYTE *pos = report->ptr();
-      size_t remaining = report->size();
+          padding = buffer[size-1];
+        }
 
-      if (NULL == pos) {
-        if (0 != report->sc()) {
-          ZS_LOG_WARNING(Trace, debug("BYE report count > 0 but does not contain SSRCs") + ZS_PARAM("sc", report->sc()))
+        if ((sizeof(DWORD) + padding) > length) {
+          ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+            string, message, "malformed padding size in RTCP packet",
+            puid, mediaChannelID, mMediaChannelID,
+            size_t, remaining, remaining,
+            size_t, length, length
+          );
+          ZS_EVENTING_TRACE_OBJECT(Insane, *this, "malformed padding size in RTCP packet");
           return false;
         }
 
-        return true;
-      }
+        length -= padding;
 
-      if (0 != report->sc()) {
-        report->mSSRCs = new (allocateBuffer(alignedSize(sizeof(DWORD))*(report->sc()))) DWORD[report->sc()];
-      }
+        if (remaining < length) {
+          ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+            string, message, "insufficient length remaining for RTCP block",
+            puid, mediaChannelID, mMediaChannelID,
+            size_t, remaining, remaining,
+            size_t, length, length
+          );
+          ZS_EVENTING_TRACE_OBJECT(Insane, *this, "insufficient length remaining for RTCP block");
+          return false;
+        }
 
-      {
-        size_t index = 0;
+        BYTE reportSpecific = RTCP_GET_BITS(*pos, 0x1F, 0);
 
-        while (index < report->sc()) {
-          if (remaining < sizeof(DWORD)) goto illegal_remaining;
+        const BYTE *prePos = pos;
+        BYTE pt = pos[1];
 
-          report->mSSRCs[index] = RTPUtils::getBE32(pos);
-          advancePos(pos, remaining, sizeof(DWORD));
-          ++index;
-        }
+        internal::advancePos(pos, remaining, sizeof(DWORD));
 
-        if (remaining > sizeof(BYTE)) {
-          size_t length = static_cast<size_t>(*pos);
-          advancePos(pos, remaining);
+        size_t preAllocationSize = mAllocationSize;
 
-          if (remaining < length) goto illegal_remaining;
+        if (!getAllocationSize(static_cast<BYTE>(version), static_cast<BYTE>(padding), reportSpecific, pt, pos, static_cast<size_t>(length - sizeof(DWORD)))) return false;
 
-          if (length > 0) {
-            report->mReasonForLeaving = new (allocateBuffer(alignedSize((sizeof(char)*length)+sizeof(char)))) char[length+1];
-            memcpy(const_cast<char *>(report->mReasonForLeaving), pos, length);
-          }
+        internal::advancePos(pos, remaining, length - sizeof(DWORD));
+
+        if (0 != padding) {
+          internal::advancePos(pos, remaining, padding);
         }
 
-        return true;
+        ZS_EVENTING_6(x, i, Insane, RTCPPacketParseAllocationSize, ol, RtcpPacket, Parse,
+          puid, mediaChannelID, mMediaChannelID,
+          string, pt, Report::ptToString(pt),
+          size_t, consumed, static_cast<size_t>(reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(prePos)),
+          size_t, allocationSize, mAllocationSize - preAllocationSize,
+          size_t, remaining, remaining,
+          size_t, length, length
+        );
+        ++mCount;
       }
+    }
 
-    illegal_remaining:
-      {
-        ZS_LOG_WARNING(Trace, debug("malformed BYE") + ZS_PARAM("pos", reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->ptr()))  + ZS_PARAM("remaining", remaining))
-      }
-      return false;
+    if (0 == mAllocationSize) {
+      ZS_EVENTING_TRACE_OBJECT(Insane, *this, "no RTCP packets were processed");
+      return true;
     }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(App *report)
+    mAllocationBuffer = make_shared<SecureByteBlock>(internal::alignedSize(mAllocationSize));
+
+    mAllocationPos = mAllocationBuffer->BytePtr();
+
+    // scope: allocation size is now established; begin parsing all reports contained in RTCP packet
     {
+      size_t remaining = size;
+      const BYTE *pos = buffer;
+
+
+      if (0 != mSenderReportCount) {
+        mFirstSenderReport = new (allocateBuffer(internal::alignedSize(sizeof(SenderReport)) * mSenderReportCount)) SenderReport[mSenderReportCount];
+      }
+      if (0 != mReceiverReportCount) {
+        mFirstReceiverReport = new (allocateBuffer(internal::alignedSize(sizeof(ReceiverReport)) * mReceiverReportCount)) ReceiverReport[mReceiverReportCount];
+      }
+      if (0 != mSDESCount) {
+        mFirstSDES = new (allocateBuffer(internal::alignedSize(sizeof(SDES)) * mSDESCount)) SDES[mSDESCount];
+      }
+      if (0 != mByeCount) {
+        mFirstBye = new (allocateBuffer(internal::alignedSize(sizeof(Bye)) * mByeCount)) Bye[mByeCount];
+      }
       if (0 != mAppCount) {
-        (&(mFirstApp[mAppCount-1]))->mNextApp = report;
+        mFirstApp = new (allocateBuffer(internal::alignedSize(sizeof(App)) * mAppCount)) App[mAppCount];
+      }
+      if (0 != mTransportLayerFeedbackMessageCount) {
+        mFirstTransportLayerFeedbackMessage = new (allocateBuffer(internal::alignedSize(sizeof(TransportLayerFeedbackMessage)) * mTransportLayerFeedbackMessageCount)) TransportLayerFeedbackMessage[mTransportLayerFeedbackMessageCount];
+      }
+      if (0 != mPayloadSpecificFeedbackMessageCount) {
+        mFirstPayloadSpecificFeedbackMessage = new (allocateBuffer(internal::alignedSize(sizeof(PayloadSpecificFeedbackMessage)) * mPayloadSpecificFeedbackMessageCount)) PayloadSpecificFeedbackMessage[mPayloadSpecificFeedbackMessageCount];
+      }
+      if (0 != mXRCount) {
+        mFirstXR = new (allocateBuffer(internal::alignedSize(sizeof(XR)) * mXRCount)) XR[mXRCount];
+      }
+      if (0 != mUnknownReportCount) {
+        mFirstUnknownReport = new (allocateBuffer(internal::alignedSize(sizeof(UnknownReport)) * mUnknownReportCount)) UnknownReport[mUnknownReportCount];
       }
-      ++mAppCount;
 
-      const BYTE *pos = report->ptr();
-      size_t remaining = report->size();
+      mSenderReportCount = 0;
+      mReceiverReportCount = 0;
+      mSDESCount = 0;
+      mByeCount = 0;
+      mAppCount = 0;
+      mTransportLayerFeedbackMessageCount = 0;
+      mPayloadSpecificFeedbackMessageCount = 0;
+      mXRCount = 0;
+      mUnknownReportCount = 0;
 
-      {
-        if (remaining < sizeof(DWORD)) goto illegal_remaining;
+      Report *lastReport = NULL;
+      size_t count = 0;
 
-        report->mSSRC = RTPUtils::getBE32(pos);
-        advancePos(pos, remaining, sizeof(DWORD));
+      while (remaining >= internal::kMinRtcpPacketLen) {
+        BYTE version = RTCP_GET_BITS(*pos, 0x3, 6);
+        size_t length = sizeof(DWORD) + (static_cast<size_t>(UseRTPUtils::getBE16(&(pos[2]))) * sizeof(DWORD));
 
-        if (remaining < sizeof(DWORD)) goto illegal_remaining;
+        size_t padding = 0;
 
-        for (size_t index = 0; index < sizeof(DWORD); ++index) {
-          report->mName[index] = static_cast<char>(pos[index]);
+        if (RTCP_IS_FLAG_SET(*pos, 5)) {
+          padding = buffer[size-1];
+          length -= padding; // already protected during pre-parse against malformed padding length
         }
-        advancePos(pos, remaining, sizeof(DWORD));
 
-        if (0 != remaining) {
-          report->mData = pos;
-          report->mDataSize = remaining;
-        }
+        BYTE reportSpecific = RTCP_GET_BITS(*pos, 0x1F, 0);
 
-        return true;
-      }
+        const BYTE *prePos = pos;
+        BYTE pt = pos[1];
 
-    illegal_remaining:
-      {
-        ZS_LOG_WARNING(Trace, debug("malformed APP") + ZS_PARAM("pos", reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->ptr()))  + ZS_PARAM("remaining", remaining))
-      }
-      return false;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(TransportLayerFeedbackMessage *report)
-    {
-      if (0 != mTransportLayerFeedbackMessageCount) {
-        (&(mFirstTransportLayerFeedbackMessage[mTransportLayerFeedbackMessageCount-1]))->mNextTransportLayerFeedbackMessage = report;
-      }
-      ++mTransportLayerFeedbackMessageCount;
+        internal::advancePos(pos, remaining, sizeof(DWORD));
 
-      const BYTE *pos = report->ptr();
-      size_t remaining = report->size();
+        size_t preAllocationSize = mAllocationSize;
 
-      {
-        if (remaining < (sizeof(DWORD)*2)) goto illegal_remaining;
+        if (!parse(lastReport, version, static_cast<BYTE>(padding), reportSpecific, pt, pos, length - sizeof(DWORD))) return false;
 
-        fill(report, pos, remaining);
+        if (NULL == mFirst) {
+          mFirst = lastReport;
+        }
 
-        bool result = false;
+        internal::advancePos(pos, remaining, length - sizeof(DWORD));
 
-        switch (report->fmt()) {
-          case TransportLayerFeedbackMessage::GenericNACK::kFmt:  result = parseGenericNACK(report); break;
-          case TransportLayerFeedbackMessage::TMMBR::kFmt:        result = parseTMMBR(report); break;
-          case TransportLayerFeedbackMessage::TMMBN::kFmt:        result = parseTMMBN(report); break;
-          default: {
-            result = parseUnknown(report);
-            break;
-          }
+        if (0 != padding) {
+          internal::advancePos(pos, remaining, padding);
         }
 
-        ZS_LOG_INSANE(packet_slog("parsed transport layer feedback message") + ZS_PARAM("fmt", report->fmtToString()) + ZS_PARAM("fmt (number)", report->reportSpecific()))
+        ZS_EVENTING_5(x, i, Insane, RTCPPacketParsedReport, ol, RtcpPacket, Parse,
+          puid, mediaChannelID, mMediaChannelID,
+          byte, ptValue, pt,
+          string, pt, Report::ptToString(pt),
+          size_t, consumed, static_cast<size_t>(reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(prePos)),
+          size_t, consumedAllocation, preAllocationSize - mAllocationSize
+        );
 
-        return true;
+        ++count;
+        ASSERT(count <= mCount);
       }
+    }
+
+    ZS_EVENTING_TRACE_OBJECT(Insane, *this, "parsed");
+    return true;
+  }
 
-    illegal_remaining:
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket (parse allocation sizing routines)
+  #pragma mark
+
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getAllocationSize(
+                                      BYTE version,
+                                      BYTE padding,
+                                      BYTE reportSpecific,
+                                      BYTE pt,
+                                      const BYTE *contents,
+                                      size_t contentSize
+                                      )
+  {
+    bool result = false;
+
+    switch (pt) {
+      case SenderReport::kPayloadType:                    result = getSenderReportAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
+      case ReceiverReport::kPayloadType:                  result = getReceiverReportAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
+      case SDES::kPayloadType:                            result = getSDESAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
+      case Bye::kPayloadType:                             result = getByeAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
+      case App::kPayloadType:                             result = getAppAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
+      case TransportLayerFeedbackMessage::kPayloadType:   result = getTransportLayerFeedbackMessageAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
+      case PayloadSpecificFeedbackMessage::kPayloadType:  result = getPayloadSpecificFeedbackMessageAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
+      case XR::kPayloadType:                              result = getXRAllocationSize(version, padding, reportSpecific, contents, contentSize); break;
+      default:
       {
-        ZS_LOG_WARNING(Trace, debug("malformed transport layer feedback message") + ZS_PARAM("pos", reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->ptr()))  + ZS_PARAM("remaining", remaining))
+        result = getUnknownReportAllocationSize(version, padding, reportSpecific, contents, contentSize);
+        break;
       }
-      return false;
     }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(PayloadSpecificFeedbackMessage *report)
-    {
-      if (0 != mPayloadSpecificFeedbackMessageCount) {
-        (&(mFirstPayloadSpecificFeedbackMessage[mPayloadSpecificFeedbackMessageCount-1]))->mNextPayloadSpecificFeedbackMessage = report;
-      }
-      ++mPayloadSpecificFeedbackMessageCount;
+    return result;
+  }
 
-      const BYTE *pos = report->ptr();
-      size_t remaining = report->size();
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getSenderReportAllocationSize(
+                                                  BYTE version,
+                                                  BYTE padding,
+                                                  BYTE reportSpecific,
+                                                  const BYTE *contents,
+                                                  size_t contentSize
+                                                  )
+  {
+    ++mSenderReportCount;
 
-      {
-        if (remaining < (sizeof(DWORD)*2)) goto illegal_remaining;
-
-        fill(report, pos, remaining);
-        advancePos(pos, remaining, sizeof(DWORD)*2);
-
-        bool result = false;
-
-        switch (report->fmt()) {
-          case PayloadSpecificFeedbackMessage::PLI::kFmt:   result = parsePLI(report); break;
-          case PayloadSpecificFeedbackMessage::SLI::kFmt:   result = parseSLI(report); break;
-          case PayloadSpecificFeedbackMessage::RPSI::kFmt:  result = parseRPSI(report); break;
-          case PayloadSpecificFeedbackMessage::FIR::kFmt:   result = parseFIR(report); break;
-          case PayloadSpecificFeedbackMessage::TSTR::kFmt:  result = parseTSTR(report); break;
-          case PayloadSpecificFeedbackMessage::TSTN::kFmt:  result = parseTSTN(report); break;
-          case PayloadSpecificFeedbackMessage::VBCM::kFmt:  result = parseVBCM(report); break;
-          case PayloadSpecificFeedbackMessage::AFB::kFmt:   {
-            {
-              if (remaining < sizeof(DWORD)) goto generic_afb;
-              if (0 != memcmp(pos, reinterpret_cast<const BYTE *>("REMB"), sizeof(DWORD))) goto generic_afb;
+    mAllocationSize += internal::alignedSize(sizeof(SenderReport)) + (internal::alignedSize(sizeof(SenderReport::ReportBlock)) * static_cast<size_t>(reportSpecific));
+    return true;
+  }
 
-              result = parseREMB(report);
-              break;
-            }
-          generic_afb:
-            {
-              result = parseAFB(report);
-              break;
-            }
-          }
-          default: {
-            result = parseUnknown(report);
-            break;
-          }
-        }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getReceiverReportAllocationSize(
+                                                    BYTE version,
+                                                    BYTE padding,
+                                                    BYTE reportSpecific,
+                                                    const BYTE *contents,
+                                                    size_t contentSize
+                                                    )
+  {
+    ++mReceiverReportCount;
 
-        ZS_LOG_INSANE(packet_slog("parsed payload specific feedback message") + ZS_PARAM("fmt", report->fmtToString()) + ZS_PARAM("fmt (number)", report->reportSpecific()))
+    mAllocationSize += internal::alignedSize(sizeof(ReceiverReport)) + (internal::alignedSize(sizeof(ReceiverReport::ReportBlock)) * static_cast<size_t>(reportSpecific));
+    return true;
+  }
 
-        return true;
-      }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getSDESAllocationSize(
+                                          BYTE version,
+                                          BYTE padding,
+                                          BYTE reportSpecific,
+                                          const BYTE *contents,
+                                          size_t contentSize
+                                          )
+  {
+    ++mSDESCount;
 
-    illegal_remaining:
-      {
-        ZS_LOG_WARNING(Trace, debug("malformed payload specific feedback message") + ZS_PARAM("pos", reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->ptr()))  + ZS_PARAM("remaining", remaining))
-      }
-      return false;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(XR *report)
-    {
-      if (0 != mXRCount) {
-        (&(mFirstXR[mXRCount-1]))->mNextXR = report;
-      }
-      ++mXRCount;
+    size_t chunksCount = static_cast<size_t>(reportSpecific);
 
-      const BYTE *pos = report->ptr();
-      size_t remaining = report->size();
+    mAllocationSize += internal::alignedSize(sizeof(SDES)) + (internal::alignedSize(sizeof(SDES::Chunk)) * chunksCount);
 
-      {
-        if (remaining < sizeof(DWORD)) goto illegal_remaining;
+    size_t remaining = contentSize;
 
-        report->mSSRC = RTPUtils::getBE32(pos);
-        advancePos(pos, remaining, sizeof(DWORD));
+    const BYTE *pos = contents;
 
-        // first count the totals for each XR block type
-        while (remaining >= sizeof(DWORD)) {
+    while ((remaining > sizeof(DWORD)) &&
+            (chunksCount > 0))
+    {
+      internal::advancePos(pos, remaining, sizeof(DWORD));
 
-          BYTE bt = pos[0];
-          size_t blockLength = static_cast<size_t>(RTPUtils::getBE16(&(pos[2]))) * sizeof(DWORD);
+      ZS_EVENTING_3(x, i, Insane, RTCPPacketGetSDESAllocationSizeChunks, ol, RtcpPacket, Parse,
+        string, message, "getting SDES chunk allocation size",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, chunkNumber, static_cast<size_t>(reportSpecific) - chunksCount
+      );
 
-          advancePos(pos, remaining, sizeof(DWORD));
+      --chunksCount;
 
-          ++report->mReportBlockCount;
+      while (remaining >= sizeof(BYTE)) {
 
-          if (remaining < blockLength) {
-            ZS_LOG_WARNING(Trace, debug("illegal XR block length found") + ZS_PARAM("block length", blockLength) + ZS_PARAM("remaining", remaining))
-            return false;
-          }
+        size_t preAllocationSize = mAllocationSize;
 
-          switch (bt) {
-            case XR::LossRLEReportBlock::kBlockType:                ++(report->mLossRLEReportBlockCount); break;
-            case XR::DuplicateRLEReportBlock::kBlockType:           ++(report->mDuplicateRLEReportBlockCount); break;
-            case XR::PacketReceiptTimesReportBlock::kBlockType:     ++(report->mPacketReceiptTimesReportBlockCount); break;
-            case XR::ReceiverReferenceTimeReportBlock::kBlockType:  ++(report->mReceiverReferenceTimeReportBlockCount); break;
-            case XR::DLRRReportBlock::kBlockType:                   ++(report->mDLRRReportBlockCount); break;
-            case XR::StatisticsSummaryReportBlock::kBlockType:      ++(report->mStatisticsSummaryReportBlockCount); break;
-            case XR::VoIPMetricsReportBlock::kBlockType:            ++(report->mVoIPMetricsReportBlockCount); break;
-            default:
-            {
-              ++(report->mUnknownReportBlockCount); break;
-              break;
+        BYTE type = *pos;
+        internal::advancePos(pos, remaining);
+
+        if (SDES::Chunk::kEndOfItemsType == type) {
+          // skip NUL item (no length octet is present)
+
+          // skip to next DWORD alignment
+          auto diff = reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(contents);
+          while ((0 != (diff % sizeof(DWORD))) &&
+                  (remaining > 0))
+          {
+            // only NUL chunks are allowed
+            if (SDES::Chunk::kEndOfItemsType != (*pos)) {
+              ZS_EVENTING_3(x, w, Insane, RTCPPacketGetSDESAllocationSizeSDESTypeNotUnderstood, ol, RtcpPacket, Parse,
+                string, message, "SDES item type is not understood",
+                puid, mediaChannelID, mMediaChannelID,
+                byte, type, *pos
+              );
+              return false;
             }
+
+            internal::advancePos(pos, remaining);
+            ++diff;
           }
-          
-          advancePos(pos, remaining, blockLength);
+          break;
         }
 
-        if (0 != report->mLossRLEReportBlockCount) {
-          report->mFirstLossRLEReportBlock = new (allocateBuffer(alignedSize(sizeof(XR::LossRLEReportBlock))*(report->mLossRLEReportBlockCount))) XR::LossRLEReportBlock[report->mLossRLEReportBlockCount];
-        }
-        if (0 != report->mDuplicateRLEReportBlockCount) {
-          report->mFirstDuplicateRLEReportBlock = new (allocateBuffer(alignedSize(sizeof(XR::DuplicateRLEReportBlock))*(report->mDuplicateRLEReportBlockCount))) XR::DuplicateRLEReportBlock[report->mDuplicateRLEReportBlockCount];
-        }
-        if (0 != report->mPacketReceiptTimesReportBlockCount) {
-          report->mFirstPacketReceiptTimesReportBlock = new (allocateBuffer(alignedSize(sizeof(XR::PacketReceiptTimesReportBlock))*(report->mPacketReceiptTimesReportBlockCount))) XR::PacketReceiptTimesReportBlock[report->mPacketReceiptTimesReportBlockCount];
-        }
-        if (0 != report->mReceiverReferenceTimeReportBlockCount) {
-          report->mFirstReceiverReferenceTimeReportBlock = new (allocateBuffer(alignedSize(sizeof(XR::ReceiverReferenceTimeReportBlock))*(report->mReceiverReferenceTimeReportBlockCount))) XR::ReceiverReferenceTimeReportBlock[report->mReceiverReferenceTimeReportBlockCount];
-        }
-        if (0 != report->mDLRRReportBlockCount) {
-          report->mFirstDLRRReportBlock = new (allocateBuffer(alignedSize(sizeof(XR::DLRRReportBlock))*(report->mDLRRReportBlockCount))) XR::DLRRReportBlock[report->mDLRRReportBlockCount];
-        }
-        if (0 != report->mStatisticsSummaryReportBlockCount) {
-          report->mFirstStatisticsSummaryReportBlock = new (allocateBuffer(alignedSize(sizeof(XR::StatisticsSummaryReportBlock))*(report->mStatisticsSummaryReportBlockCount))) XR::StatisticsSummaryReportBlock[report->mStatisticsSummaryReportBlockCount];
-        }
-        if (0 != report->mVoIPMetricsReportBlockCount) {
-          report->mFirstVoIPMetricsReportBlock = new (allocateBuffer(alignedSize(sizeof(XR::VoIPMetricsReportBlock))*(report->mVoIPMetricsReportBlockCount))) XR::VoIPMetricsReportBlock[report->mVoIPMetricsReportBlockCount];
-        }
-        if (0 != report->mUnknownReportBlockCount) {
-          report->mFirstUnknownReportBlock = new (allocateBuffer(alignedSize(sizeof(XR::UnknownReportBlock))*(report->mUnknownReportBlockCount))) XR::UnknownReportBlock[report->mUnknownReportBlockCount];
+        if (remaining < sizeof(BYTE)) {
+          ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+            string, message, "no length of SDES entry present",
+            puid, mediaChannelID, mMediaChannelID,
+            size_t, remaining, remaining,
+            size_t, length, 0
+          );
+          return false;
         }
 
-        report->mLossRLEReportBlockCount = 0;
-        report->mDuplicateRLEReportBlockCount = 0;
-        report->mPacketReceiptTimesReportBlockCount = 0;
-        report->mReceiverReferenceTimeReportBlockCount = 0;
-        report->mDLRRReportBlockCount = 0;
-        report->mStatisticsSummaryReportBlockCount = 0;
-        report->mVoIPMetricsReportBlockCount = 0;
-        report->mUnknownReportBlockCount = 0;
-
-        XR::ReportBlock *previousReportBlock = NULL;
-
-        // reset to start of buffer
-        pos = report->ptr();
-        remaining = report->size();
+        size_t prefixLength = 0;
+        size_t length = static_cast<size_t>(*pos);
+        internal::advancePos(pos, remaining);
 
-        advancePos(pos, remaining, sizeof(DWORD));
-
-        // parse each XR report block
-        while (remaining >= sizeof(DWORD)) {
-          const BYTE *prePos = pos;
-          size_t preAllocationSize = mAllocationSize;
-
-          BYTE bt = pos[0];
-          BYTE typeSpecific = pos[1];
-          size_t blockLength = static_cast<size_t>(RTPUtils::getBE16(&(pos[2]))) * sizeof(DWORD);
+        if (remaining < length) {
+          ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+            string, message, "malformed SDES length found",
+            puid, mediaChannelID, mMediaChannelID,
+            size_t, remaining, remaining,
+            size_t, length, length
+          );
+          return false;
+        }
 
-          advancePos(pos, remaining, sizeof(DWORD));
+        switch (type) {
+          case SDES::Chunk::CName::kItemType: mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::CName)); break;
+          case SDES::Chunk::Name::kItemType:  mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::Name)); break;
+          case SDES::Chunk::Email::kItemType: mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::Email)); break;
+          case SDES::Chunk::Phone::kItemType: mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::Phone)); break;
+          case SDES::Chunk::Loc::kItemType:   mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::Loc)); break;
+          case SDES::Chunk::Tool::kItemType:  mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::Tool)); break;
+          case SDES::Chunk::Note::kItemType:  mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::Note)); break;
+          case SDES::Chunk::Priv::kItemType:
+          {
+            {
+              mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::Priv));
 
-          if (remaining < blockLength) {
-            ZS_LOG_WARNING(Trace, debug("malformed XR block length found") + ZS_PARAM("block length", blockLength) + ZS_PARAM("remaining", remaining))
-            return false;
-          }
+              if (length > 0) {
+                prefixLength = static_cast<size_t>(*pos);
 
-          XR::ReportBlock *usingBlock = NULL;
+                if (prefixLength > (length-1)) goto illegal_priv_prefix;
 
-          switch (bt) {
-            case XR::LossRLEReportBlock::kBlockType:                {
-              auto reportBlock = &(report->mFirstLossRLEReportBlock[report->mLossRLEReportBlockCount]);
-              usingBlock = reportBlock;
-              if (0 != report->mLossRLEReportBlockCount) {
-                (&(report->mFirstLossRLEReportBlock[report->mLossRLEReportBlockCount-1]))->mNextLossRLE = reportBlock;
-              }
-              ++(report->mLossRLEReportBlockCount);
-              fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
-              if (!parse(report, reportBlock)) return false;
-              break;
-            }
-            case XR::DuplicateRLEReportBlock::kBlockType:           {
-              auto reportBlock = &(report->mFirstDuplicateRLEReportBlock[report->mDuplicateRLEReportBlockCount]);
-              usingBlock = reportBlock;
-              if (0 != report->mDuplicateRLEReportBlockCount) {
-                (&(report->mFirstDuplicateRLEReportBlock[report->mDuplicateRLEReportBlockCount-1]))->mNextDuplicateRLE = reportBlock;
-              }
-              ++(report->mDuplicateRLEReportBlockCount);
-              fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
-              if (!parse(report, reportBlock)) return false;
-              break;
-            }
-            case XR::PacketReceiptTimesReportBlock::kBlockType:     {
-              auto reportBlock = &(report->mFirstPacketReceiptTimesReportBlock[report->mPacketReceiptTimesReportBlockCount]);
-              usingBlock = reportBlock;
-              if (0 != report->mPacketReceiptTimesReportBlockCount) {
-                (&(report->mFirstPacketReceiptTimesReportBlock[report->mPacketReceiptTimesReportBlockCount-1]))->mNextPacketReceiptTimesReportBlock = reportBlock;
-              }
-              ++(report->mPacketReceiptTimesReportBlockCount);
-              fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
-              if (!parse(report, reportBlock)) return false;
-              break;
-            }
-            case XR::ReceiverReferenceTimeReportBlock::kBlockType:  {
-              auto reportBlock = &(report->mFirstReceiverReferenceTimeReportBlock[report->mReceiverReferenceTimeReportBlockCount]);
-              usingBlock = reportBlock;
-              if (0 != report->mReceiverReferenceTimeReportBlockCount) {
-                (&(report->mFirstReceiverReferenceTimeReportBlock[report->mReceiverReferenceTimeReportBlockCount-1]))->mNextReceiverReferenceTimeReportBlock = reportBlock;
-              }
-              ++(report->mReceiverReferenceTimeReportBlockCount);
-              fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
-              if (!parse(report, reportBlock)) return false;
-              break;
-            }
-            case XR::DLRRReportBlock::kBlockType:                   {
-              auto reportBlock = &(report->mFirstDLRRReportBlock[report->mDLRRReportBlockCount]);
-              usingBlock = reportBlock;
-              if (0 != report->mDLRRReportBlockCount) {
-                (&(report->mFirstDLRRReportBlock[report->mDLRRReportBlockCount-1]))->mNextDLRRReportBlock = reportBlock;
-              }
-              ++(report->mDLRRReportBlockCount);
-              fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
-              if (!parse(report, reportBlock)) return false;
-              break;
-            }
-            case XR::StatisticsSummaryReportBlock::kBlockType:      {
-              auto reportBlock = &(report->mFirstStatisticsSummaryReportBlock[report->mStatisticsSummaryReportBlockCount]);
-              usingBlock = reportBlock;
-              if (0 != report->mStatisticsSummaryReportBlockCount) {
-                (&(report->mFirstStatisticsSummaryReportBlock[report->mStatisticsSummaryReportBlockCount-1]))->mNextStatisticsSummaryReportBlock = reportBlock;
-              }
-              ++(report->mStatisticsSummaryReportBlockCount);
-              fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
-              if (!parse(report, reportBlock)) return false;
-              break;
-            }
-            case XR::VoIPMetricsReportBlock::kBlockType:            {
-              auto reportBlock = &(report->mFirstVoIPMetricsReportBlock[report->mVoIPMetricsReportBlockCount]);
-              usingBlock = reportBlock;
-              if (0 != report->mVoIPMetricsReportBlockCount) {
-                (&(report->mFirstVoIPMetricsReportBlock[report->mVoIPMetricsReportBlockCount-1]))->mNextVoIPMetricsReportBlock = reportBlock;
+                if (0 != prefixLength) {
+                  mAllocationSize += internal::alignedSize(sizeof(char)*(prefixLength+1));
+                }
               }
-              ++(report->mVoIPMetricsReportBlockCount);
-              fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
-              if (!parse(report, reportBlock)) return false;
               break;
             }
-            default:                                                {
-              auto reportBlock = &(report->mFirstUnknownReportBlock[report->mUnknownReportBlockCount]);
-              usingBlock = reportBlock;
-              if (0 != report->mUnknownReportBlockCount) {
-                (&(report->mFirstUnknownReportBlock[report->mUnknownReportBlockCount-1]))->mNextUnknownReportBlock = reportBlock;
-              }
-              ++(report->mUnknownReportBlockCount);
-              fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
-              if (!parse(report, reportBlock)) return false;
-              break;
+          illegal_priv_prefix:
+            {
+              ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+                string, message, "malformed SDES Priv prefix found",
+                puid, mediaChannelID, mMediaChannelID,
+                size_t, remaining, remaining,
+                size_t, length, length
+              );
+              ZS_EVENTING_TRACE_OBJECT(Insane, *this, "malformed SDES Priv prefix found");
+              return false;
             }
+            break;
+          }
+          case SDES::Chunk::Mid::kItemType:  mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::Mid)); break;
+          case SDES::Chunk::Rid::kItemType:  mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::Rid)); break;
+          default:
+          {
+            mAllocationSize += internal::alignedSize(sizeof(SDES::Chunk::Unknown));
+            ZS_EVENTING_3(x, w, Insane, RTCPPacketGetSDESAllocationSizeSDESTypeNotUnderstood, ol, RtcpPacket, Parse,
+              string, message, "SDES item type is not understood",
+              puid, mediaChannelID, mMediaChannelID,
+              byte, type, type
+            );
+            ZS_EVENTING_TRACE_OBJECT(Insane, *this, "SDES item type is not understood");
+            break;
           }
-
-          advancePos(pos, remaining, blockLength);
-
-          ZS_LOG_INSANE(packet_slog("parsed XR block") + ZS_PARAM("block type", usingBlock->blockTypeToString()) + ZS_PARAM("block type (number)", usingBlock->blockType()) + ZS_PARAM("block size", blockLength) + ZS_PARAM("consumed", (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(prePos)))  + ZS_PARAM("allocation consumed", preAllocationSize - mAllocationSize))
         }
-        
-
-        return true;
-      }
-
-    illegal_remaining:
-      {
-        ZS_LOG_WARNING(Trace, debug("malformed XR when parsing") + ZS_PARAM("pos", reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->ptr()))  + ZS_PARAM("remaining", remaining))
-      }
-      return false;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(UnknownReport *report)
-    {
-      if (0 != mUnknownReportCount) {
-        (&(mFirstUnknownReport[mUnknownReportCount-1]))->mNextUnknown = report;
-      }
-      ++mUnknownReportCount;
-
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    void RTCPPacket::fill(FeedbackMessage *report, const BYTE *contents, size_t contentSize)
-    {
-      const BYTE *pos = contents;
-      size_t remaining = contentSize;
-
-      report->mSSRCOfPacketSender = RTPUtils::getBE32(&(pos[0]));
-      report->mSSRCOfMediaSource = RTPUtils::getBE32(&(pos[4]));
-
-      advancePos(pos, remaining, sizeof(DWORD)*2);
-
-      if (remaining > sizeof(BYTE)) {
-        report->mFCI = pos;
-        report->mFCISize = remaining;
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTCPPacket::fill(
-                          XR *report,
-                          XR::ReportBlock *reportBlock,
-                          XR::ReportBlock * &ioPreviousReportBlock,
-                          BYTE blockType,
-                          BYTE typeSpecific,
-                          const BYTE *contents,
-                          size_t contentSize
-                          )
-    {
-      reportBlock->mBlockType = blockType;
-      reportBlock->mTypeSpecific = typeSpecific;
-      if (0 != contentSize) {
-        reportBlock->mTypeSpecificContents = contents;
-        reportBlock->mTypeSpecificContentSize = contentSize;
-      }
-
-      if (NULL == report->mFirstReportBlock) {
-        report->mFirstReportBlock = reportBlock;
-      }
-      if (NULL != ioPreviousReportBlock) {
-        ioPreviousReportBlock->mNext = reportBlock;
-      }
-      ioPreviousReportBlock = reportBlock;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseGenericNACK(TransportLayerFeedbackMessage *report)
-    {
-      typedef TransportLayerFeedbackMessage::GenericNACK GenericNACK;
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
-
-      size_t possibleNACKs = remaining / sizeof(DWORD);
-
-      ASSERT(0 != possibleNACKs)
-
-      report->mFirstGenericNACK = new (allocateBuffer(alignedSize(sizeof(GenericNACK))*possibleNACKs)) GenericNACK[possibleNACKs];
 
-      while (remaining >= sizeof(DWORD)) {
-        GenericNACK *nack = &(report->mFirstGenericNACK[report->mGenericNACKCount]);
-
-        nack->mPID = RTPUtils::getBE16(&(pos[0]));
-        nack->mBLP = RTPUtils::getBE16(&(pos[2]));
-
-        advancePos(pos, remaining, sizeof(DWORD));
+        if (0 != length) {
+          mAllocationSize += internal::alignedSize((sizeof(char)*length)+sizeof(char));
+        }
 
-        ++(report->mGenericNACKCount);
+        ZS_EVENTING_7(x, i, Insane, RTCPPacketGetSDESAllocationSizeSDES, ol, RtcpPacket, Parse,
+          string, message, "get SDES item allocation size",
+          puid, mediaChannelID, mMediaChannelID,
+          string, type, SDES::Chunk::StringItem::typeToString(type),
+          byte, typeValue, type,
+          size_t, prefixLength, prefixLength,
+          size_t, length, length,
+          size_t, allocationSize, (mAllocationSize - preAllocationSize)
+        );
+        internal::advancePos(pos, remaining, length);
       }
 
-      ASSERT(possibleNACKs == report->mGenericNACKCount)
-
-      return true;
     }
-    
-    //-------------------------------------------------------------------------
-    void RTCPPacket::fillTMMBRCommon(
-                                      TransportLayerFeedbackMessage *report,
-                                      TransportLayerFeedbackMessage::TMMBRCommon *common,
-                                      const BYTE *pos
-                                      )
-    {
-      typedef TransportLayerFeedbackMessage::TMMBRCommon TMMBRCommon;
 
-      common->mSSRC = RTPUtils::getBE32(&(pos[0]));
-      common->mMxTBRExp = RTCP_GET_BITS(pos[4], 0x3F, 2);
-      common->mMxTBRMantissa = RTCP_GET_BITS(RTPUtils::getBE32(&(pos[4])), 0x1FFFF, 9);
-      common->mMeasuredOverhead = RTCP_GET_BITS(RTPUtils::getBE32(&(pos[4])), 0x1FF, 0);
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseTMMBR(TransportLayerFeedbackMessage *report)
-    {
-      typedef TransportLayerFeedbackMessage::TMMBR TMMBR;
+    return true;
+  }
 
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getByeAllocationSize(
+                                        BYTE version,
+                                        BYTE padding,
+                                        BYTE reportSpecific,
+                                        const BYTE *contents,
+                                        size_t contentSize
+                                        )
+  {
+    ++mByeCount;
 
-      size_t possibleTMMBRs = remaining / (sizeof(DWORD)*2);
+    size_t ssrcCount = static_cast<size_t>(reportSpecific);
 
-      ASSERT(0 != possibleTMMBRs)
+    mAllocationSize += internal::alignedSize(sizeof(Bye)) + (internal::alignedSize(sizeof(DWORD)) * ssrcCount);
 
-      report->mFirstTMMBR = new (allocateBuffer(alignedSize(sizeof(TMMBR))*possibleTMMBRs)) TMMBR[possibleTMMBRs];
+    const BYTE *pos = contents;
+    size_t remaining = contentSize;
 
-      while (remaining >= (sizeof(DWORD)*2)) {
-        TMMBR *tmmbr = &(report->mFirstTMMBR[report->mTMMBRCount]);
+    if (remaining < (ssrcCount * sizeof(DWORD))) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed BYE SSRC size",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-        fillTMMBRCommon(report, tmmbr, pos);
+    internal::advancePos(pos, remaining, sizeof(DWORD) * ssrcCount);
 
-        advancePos(pos, remaining, sizeof(DWORD)*2);
+    if (remaining < sizeof(BYTE)) return true;
 
-        ++(report->mTMMBRCount);
-      }
+    size_t length = static_cast<size_t>(*pos);
 
-      ASSERT(possibleTMMBRs == report->mTMMBRCount)
+    if (length < 1) return true;
 
-      return true;
+    if (length > remaining) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed BYE reason length",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, length
+      );
+      return false;
     }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseTMMBN(TransportLayerFeedbackMessage *report)
-    {
-      typedef TransportLayerFeedbackMessage::TMMBN TMMBN;
 
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
+    mAllocationSize += internal::alignedSize((sizeof(char)*(length+1)));
+    return true;
+  }
 
-      size_t possibleTMMBNs = remaining / (sizeof(DWORD)*2);
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getAppAllocationSize(
+                                          BYTE version,
+                                          BYTE padding,
+                                          BYTE reportSpecific,
+                                          const BYTE *contents,
+                                          size_t contentSize
+                                          )
+  {
+    ++mAppCount;
 
-      if (possibleTMMBNs < 1) {
-        report->mFirstTMMBN = NULL;
-        report->mTMMBNCount = 0;
-        return true;
-      }
+    mAllocationSize += internal::alignedSize(sizeof(App));
 
-      report->mFirstTMMBN = new (allocateBuffer(alignedSize(sizeof(TMMBN))*possibleTMMBNs)) TMMBN[possibleTMMBNs];
+    size_t remaining = contentSize;
 
-      while (remaining >= (sizeof(DWORD)*2)) {
-        TMMBN *tmmbr = &(report->mFirstTMMBN[report->mTMMBNCount]);
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed APP length",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-        fillTMMBRCommon(report, tmmbr, pos);
+    return true;
+  }
 
-        advancePos(pos, remaining, sizeof(DWORD)*2);
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getTransportLayerFeedbackMessageAllocationSize(
+                                                                  BYTE version,
+                                                                  BYTE padding,
+                                                                  BYTE reportSpecific,
+                                                                  const BYTE *contents,
+                                                                  size_t contentSize
+                                                                  )
+  {
+    ++mTransportLayerFeedbackMessageCount;
 
-        ++(report->mTMMBNCount);
-      }
+    mAllocationSize += internal::alignedSize(sizeof(TransportLayerFeedbackMessage));
 
-      ASSERT(possibleTMMBNs == report->mTMMBNCount)
+    const BYTE *pos = contents;
+    size_t remaining = contentSize;
 
-      return true;
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed transport layer feedback message length",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
     }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseUnknown(TransportLayerFeedbackMessage *report)
-    {
-      report->mUnknown = report;
-      return true;
-    }
+    internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parsePLI(PayloadSpecificFeedbackMessage *report)
-    {
-      return true;
+    bool result = false;
+
+    switch (reportSpecific) {
+      case TransportLayerFeedbackMessage::GenericNACK::kFmt:  result = getTransportLayerFeedbackMessageGenericNACKAllocationSize(reportSpecific, pos, remaining); break;
+      case TransportLayerFeedbackMessage::TMMBR::kFmt:        result = getTransportLayerFeedbackMessageTMMBRAllocationSize(reportSpecific, pos, remaining); break;
+      case TransportLayerFeedbackMessage::TMMBN::kFmt:        result = getTransportLayerFeedbackMessageTMMBNAllocationSize(reportSpecific, pos, remaining); break;
+      default: {
+        break;
+      }
     }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseSLI(PayloadSpecificFeedbackMessage *report)
-    {
-      typedef PayloadSpecificFeedbackMessage::SLI SLI;
+    ZS_EVENTING_3(x, i, Insane, RTCPPacketGetTransportLayerFeedbackMessageAllocationSize, ol, RtcpPacket, Parse,
+      puid, mediaChannelID, mMediaChannelID,
+      string, fmt, FeedbackMessage::fmtToString(TransportLayerFeedbackMessage::kPayloadType, reportSpecific),
+      byte, fmtNumber, reportSpecific
+    );
+    return true;
+  }
 
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getPayloadSpecificFeedbackMessageAllocationSize(
+                                                                    BYTE version,
+                                                                    BYTE padding,
+                                                                    BYTE reportSpecific,
+                                                                    const BYTE *contents,
+                                                                    size_t contentSize
+                                                                    )
+  {
+    ++mPayloadSpecificFeedbackMessageCount;
 
-      size_t possibleSLIs = remaining / (sizeof(DWORD));
+    mAllocationSize += internal::alignedSize(sizeof(PayloadSpecificFeedbackMessage));
 
-      ASSERT(0 != possibleSLIs)
+    const BYTE *pos = contents;
+    size_t remaining = contentSize;
 
-      report->mFirstSLI = new (allocateBuffer(alignedSize(sizeof(SLI))*possibleSLIs)) SLI[possibleSLIs];
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed transport layer feedback message length",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-      while (remaining >= (sizeof(DWORD))) {
-        SLI *sli = &(report->mFirstSLI[report->mSLICount]);
+    internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-        sli->mFirst = RTCP_GET_BITS(RTPUtils::getBE16(&(pos[0])), 0x1FFF, 3);
-        sli->mNumber = static_cast<WORD>(RTCP_GET_BITS(RTPUtils::getBE32(&(pos[0])), 0x1FFF, 6));
-        sli->mPictureID = RTCP_GET_BITS(pos[3], 0x3F, 0);
+    bool result = false;
 
-        advancePos(pos, remaining, sizeof(DWORD));
+    char bogus[sizeof(DWORD)] {};
+    const DWORD *usingSubType = reinterpret_cast<const DWORD *>(&(bogus[0]));
 
-        ++(report->mSLICount);
-      }
+    switch (reportSpecific) {
+      case PayloadSpecificFeedbackMessage::PLI::kFmt:   result = getPayloadSpecificFeedbackMessagePLIAllocationSize(reportSpecific, pos, remaining); break;
+      case PayloadSpecificFeedbackMessage::SLI::kFmt:   result = getPayloadSpecificFeedbackMessageSLIAllocationSize(reportSpecific, pos, remaining); break;
+      case PayloadSpecificFeedbackMessage::RPSI::kFmt:  result = getPayloadSpecificFeedbackMessageRPSIAllocationSize(reportSpecific, pos, remaining); break;
+      case PayloadSpecificFeedbackMessage::FIR::kFmt:   result = getPayloadSpecificFeedbackMessageFIRAllocationSize(reportSpecific, pos, remaining); break;
+      case PayloadSpecificFeedbackMessage::TSTR::kFmt:  result = getPayloadSpecificFeedbackMessageTSTRAllocationSize(reportSpecific, pos, remaining); break;
+      case PayloadSpecificFeedbackMessage::TSTN::kFmt:  result = getPayloadSpecificFeedbackMessageTSTNAllocationSize(reportSpecific, pos, remaining); break;
+      case PayloadSpecificFeedbackMessage::VBCM::kFmt:  result = getPayloadSpecificFeedbackMessageVBCMAllocationSize(reportSpecific, pos, remaining); break;
+      case PayloadSpecificFeedbackMessage::AFB::kFmt:   {
+        {
+          if (remaining < sizeof(DWORD)) goto generic_afb;
+          if (0 != memcmp(pos, reinterpret_cast<const BYTE *>("REMB"), sizeof(DWORD))) goto generic_afb;
 
-      ASSERT(possibleSLIs == report->mSLICount)
+          usingSubType = reinterpret_cast<const DWORD *>(pos);
 
-      return true;
+          result = getPayloadSpecificFeedbackMessageREMBAllocationSize(reportSpecific, pos, remaining);
+          break;
+        }
+      generic_afb:
+        {
+          result = getPayloadSpecificFeedbackMessageAFBAllocationSize(reportSpecific, pos, remaining);
+          break;
+        }
+      }
+      default: {
+        break;
+      }
     }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseRPSI(PayloadSpecificFeedbackMessage *report)
-    {
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
-
-      {
-        if (remaining < sizeof(WORD)) goto illegal_remaining;
-
-        BYTE pb = pos[0];
-        report->mRPSI.mZeroBit = RTCP_GET_BITS(pos[1], 0x1, 7);
-        report->mRPSI.mPayloadType = RTCP_GET_BITS(pos[1], 0x7F, 0);
 
-        advancePos(pos, remaining, sizeof(WORD));
+    ZS_EVENTING_3(x, i, Insane, RTCPPacketGetPayloadSpecificFeedbackMessageAllocationSize, ol, RtcpPacket, Parse,
+      puid, mediaChannelID, mMediaChannelID,
+      string, fmt, FeedbackMessage::fmtToString(TransportLayerFeedbackMessage::kPayloadType, reportSpecific, *usingSubType),
+      byte, fmtNumber, reportSpecific
+    );
+    return true;
+  }
 
-        if (remaining > 0) {
-          report->mRPSI.mNativeRPSIBitString = pos;
-          report->mRPSI.mNativeRPSIBitStringSizeInBits = (remaining*8);
-          if (pb > report->mRPSI.mNativeRPSIBitStringSizeInBits) goto illegal_remaining;
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getXRAllocationSize(
+                                        BYTE version,
+                                        BYTE padding,
+                                        BYTE reportSpecific,
+                                        const BYTE *contents,
+                                        size_t contentSize
+                                        )
+  {
+    ++mXRCount;
 
-          report->mRPSI.mNativeRPSIBitStringSizeInBits -= static_cast<size_t>(pb);
-          if (0 == report->mRPSI.mNativeRPSIBitStringSizeInBits) {
-            report->mRPSI.mNativeRPSIBitString = NULL;
-          }
-        }
+    mAllocationSize += internal::alignedSize(sizeof(XR));
 
-        return true;
-      }
+    const BYTE *pos = contents;
+    size_t remaining = contentSize;
 
-    illegal_remaining:
-      {
-        ZS_LOG_WARNING(Trace, debug("malformed RPSI payload specific feedback message") + ZS_PARAM("pos", reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->fci()))  + ZS_PARAM("remaining", remaining))
-      }
+    if (remaining < sizeof(DWORD)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "XR is not a valid length",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
       return false;
     }
-    
-    //-------------------------------------------------------------------------
-    void RTCPPacket::fillCodecControlCommon(
-                                            PayloadSpecificFeedbackMessage *report,
-                                            PayloadSpecificFeedbackMessage::CodecControlCommon *common,
-                                            const BYTE *pos
-                                            )
-    {
-      common->mSSRC = RTPUtils::getBE32(&(pos[0]));
-      common->mSeqNr = pos[4];
-      common->mReserved = RTCP_GET_BITS(RTPUtils::getBE32(&(pos[4])), 0xFFFFFF, 0);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseFIR(PayloadSpecificFeedbackMessage *report)
-    {
-      typedef PayloadSpecificFeedbackMessage::FIR FIR;
 
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
+    internal::advancePos(pos, remaining, sizeof(DWORD));
 
-      size_t possibleFIRs = remaining / (sizeof(DWORD)*2);
+    while (remaining >= sizeof(DWORD)) {
+      const BYTE *prePos = pos;
+      size_t preAllocationSize = mAllocationSize;
 
-      ASSERT(0 != possibleFIRs)
+      BYTE bt = pos[0];
+      BYTE typeSpecific = pos[1];
+      size_t blockLength = static_cast<size_t>(UseRTPUtils::getBE16(&(pos[2]))) * sizeof(DWORD);
 
-      report->mFirstFIR = new (allocateBuffer(alignedSize(sizeof(FIR))*possibleFIRs)) FIR[possibleFIRs];
+      internal::advancePos(pos, remaining, sizeof(DWORD));
 
-      while (remaining >= (sizeof(DWORD)*2)) {
-        FIR *fir = &(report->mFirstFIR[report->mFIRCount]);
-        fillCodecControlCommon(report, fir, pos);
+      if (remaining < blockLength) {
+        ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+          string, message, "malformed XR block length found",
+          puid, mediaChannelID, mMediaChannelID,
+          size_t, remaining, remaining,
+          size_t, length, blockLength
+        );
+        return false;
+      }
 
-        advancePos(pos, remaining, sizeof(DWORD)*2);
+      bool result = false;
 
-        ++(report->mFIRCount);
+      switch (bt) {
+        case XR::LossRLEReportBlock::kBlockType:                result = getXRLossRLEReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
+        case XR::DuplicateRLEReportBlock::kBlockType:           result = getXRDuplicateRLEReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
+        case XR::PacketReceiptTimesReportBlock::kBlockType:     result = getXRPacketReceiptTimesReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
+        case XR::ReceiverReferenceTimeReportBlock::kBlockType:  result = getXRReceiverReferenceTimeReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
+        case XR::DLRRReportBlock::kBlockType:                   result = getXRDLRRReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
+        case XR::StatisticsSummaryReportBlock::kBlockType:      result = getXRStatisticsSummaryReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
+        case XR::VoIPMetricsReportBlock::kBlockType:            result = getXRVoIPMetricsReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
+        default:
+        {
+          result = getXRUnknownReportBlockAllocationSize(typeSpecific, pos, blockLength); break;
+          break;
+        }
       }
 
-      ASSERT(possibleFIRs == report->mFIRCount)
+      if (!result) return false;
 
-      return true;
+      internal::advancePos(pos, remaining, blockLength);
+
+      ZS_EVENTING_5(x, i, Insane, RTCPPacketGetXRAllocationSize, ol, RtcpPacket, Parse,
+        puid, mediaChannelID, mMediaChannelID,
+        string, blockType, XR::ReportBlock::blockTypeToString(bt),
+        size_t, blockLength, blockLength,
+        uint64, consumed, (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(prePos)),
+        size_t, allocationSize, mAllocationSize - preAllocationSize
+      );
     }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseTSTR(PayloadSpecificFeedbackMessage *report)
-    {
-      typedef PayloadSpecificFeedbackMessage::TSTR TSTR;
 
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
+    return true;
+  }
 
-      size_t possibleTSTRs = remaining / (sizeof(DWORD)*2);
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getUnknownReportAllocationSize(
+                                                  BYTE version,
+                                                  BYTE padding,
+                                                  BYTE reportSpecific,
+                                                  const BYTE *contents,
+                                                  size_t contentSize
+                                                  )
+  {
+    ++mUnknownReportCount;
 
-      ASSERT(0 != possibleTSTRs)
+    mAllocationSize += internal::alignedSize(sizeof(UnknownReport));
+    return true;
+  }
 
-      report->mFirstTSTR = new (allocateBuffer(alignedSize(sizeof(TSTR))*possibleTSTRs)) TSTR[possibleTSTRs];
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getTransportLayerFeedbackMessageGenericNACKAllocationSize(
+                                                                              BYTE fmt,
+                                                                              const BYTE *contents,
+                                                                              size_t contentSize
+                                                                              )
+  {
+    size_t remaining = contentSize;
+
+    if (remaining < sizeof(DWORD)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed generic NACK transport layer feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-      while (remaining >= (sizeof(DWORD)*2)) {
-        TSTR *tstr = &(report->mFirstTSTR[report->mTSTRCount]);
-        fillCodecControlCommon(report, tstr, pos);
+    size_t possibleNACKs = remaining / sizeof(DWORD);
 
-        tstr->mControlSpecific = RTCP_GET_BITS(tstr->mReserved, 0x1F, 0);
-        tstr->mReserved = RTCP_GET_BITS(tstr->mReserved, 0x7FFFF, 5);
+    mAllocationSize += (internal::alignedSize(sizeof(TransportLayerFeedbackMessage::GenericNACK)) * possibleNACKs);
+    return true;
+  }
 
-        advancePos(pos, remaining, sizeof(DWORD)*2);
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getTransportLayerFeedbackMessageTMMBRAllocationSize(
+                                                                        BYTE fmt,
+                                                                        const BYTE *contents,
+                                                                        size_t contentSize
+                                                                        )
+  {
+    size_t remaining = contentSize;
+
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed TMMBR transport layer feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-        ++(report->mTSTRCount);
-      }
+    size_t possibleTMMBRs = remaining / (sizeof(DWORD)*2);
 
-      ASSERT(possibleTSTRs == report->mTSTRCount)
-      
-      return true;
-    }
+    mAllocationSize += (internal::alignedSize(sizeof(TransportLayerFeedbackMessage::TMMBR)) * possibleTMMBRs);
+    return true;
+  }
     
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseTSTN(PayloadSpecificFeedbackMessage *report)
-    {
-      typedef PayloadSpecificFeedbackMessage::TSTN TSTN;
-
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getTransportLayerFeedbackMessageTMMBNAllocationSize(
+                                                                        BYTE fmt,
+                                                                        const BYTE *contents,
+                                                                        size_t contentSize
+                                                                        )
+  {
+    size_t remaining = contentSize;
+
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed TMMBN transport layer feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-      size_t possibleTSTNs = remaining / (sizeof(DWORD)*2);
+    size_t possibleTMMBNs = remaining / (sizeof(DWORD)*2);
 
-      ASSERT(0 != possibleTSTNs)
+    mAllocationSize += (internal::alignedSize(sizeof(TransportLayerFeedbackMessage::TMMBN)) * possibleTMMBNs);
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getPayloadSpecificFeedbackMessagePLIAllocationSize(
+                                                                      BYTE fmt,
+                                                                      const BYTE *contents,
+                                                                      size_t contentSize
+                                                                      )
+  {
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getPayloadSpecificFeedbackMessageSLIAllocationSize(
+                                                                      BYTE fmt,
+                                                                      const BYTE *contents,
+                                                                      size_t contentSize
+                                                                      )
+  {
+    size_t remaining = contentSize;
+
+    if (remaining < sizeof(DWORD)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed SLI payload specific feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-      report->mFirstTSTN = new (allocateBuffer(alignedSize(sizeof(TSTN))*possibleTSTNs)) TSTN[possibleTSTNs];
+    size_t possibleSLIs = remaining / sizeof(DWORD);
 
-      while (remaining >= (sizeof(DWORD)*2)) {
-        TSTN *tstn = &(report->mFirstTSTN[report->mTSTNCount]);
-        fillCodecControlCommon(report, tstn, pos);
+    mAllocationSize += (internal::alignedSize(sizeof(PayloadSpecificFeedbackMessage::SLI)) * possibleSLIs);
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getPayloadSpecificFeedbackMessageRPSIAllocationSize(
+                                                                        BYTE fmt,
+                                                                        const BYTE *contents,
+                                                                        size_t contentSize
+                                                                        )
+  {
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getPayloadSpecificFeedbackMessageFIRAllocationSize(
+                                                                        BYTE fmt,
+                                                                        const BYTE *contents,
+                                                                        size_t contentSize
+                                                                        )
+  {
+    size_t remaining = contentSize;
+
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed FIR payload specific feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-        tstn->mControlSpecific = RTCP_GET_BITS(tstn->mReserved, 0x1F, 0);
-        tstn->mReserved = RTCP_GET_BITS(tstn->mReserved, 0x7FFFF, 5);
+    size_t possibleFIRs = remaining / (sizeof(DWORD)*2);
 
-        advancePos(pos, remaining, sizeof(DWORD)*2);
+    mAllocationSize += (internal::alignedSize(sizeof(PayloadSpecificFeedbackMessage::FIR)) * possibleFIRs);
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getPayloadSpecificFeedbackMessageTSTRAllocationSize(
+                                                                        BYTE fmt,
+                                                                        const BYTE *contents,
+                                                                        size_t contentSize
+                                                                        )
+  {
+    size_t remaining = contentSize;
+
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed TSTR payload specific feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-        ++(report->mTSTNCount);
-      }
+    size_t possibleTSTRs = remaining / (sizeof(DWORD)*2);
 
-      ASSERT(possibleTSTNs == report->mTSTNCount)
-      
-      return true;
-    }
+    mAllocationSize += (internal::alignedSize(sizeof(PayloadSpecificFeedbackMessage::TSTR)) * possibleTSTRs);
+    return true;
+  }
     
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseVBCM(PayloadSpecificFeedbackMessage *report)
-    {
-      typedef PayloadSpecificFeedbackMessage::VBCM VBCM;
-
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getPayloadSpecificFeedbackMessageTSTNAllocationSize(
+                                                                        BYTE fmt,
+                                                                        const BYTE *contents,
+                                                                        size_t contentSize
+                                                                        )
+  {
+    size_t remaining = contentSize;
+
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed TSTN payload specific feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-      size_t possibleVBCMs = 0;
+    size_t possibleTSTNs = remaining / (sizeof(DWORD)*2);
 
-      // first count the VBCM blocks
-      {
-        while (remaining >= (sizeof(DWORD)*2)) {
-          ++possibleVBCMs;
+    mAllocationSize += (internal::alignedSize(sizeof(PayloadSpecificFeedbackMessage::TSTN)) * possibleTSTNs);
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getPayloadSpecificFeedbackMessageVBCMAllocationSize(
+                                                                        BYTE fmt,
+                                                                        const BYTE *contents,
+                                                                        size_t contentSize
+                                                                        )
+  {
+    const BYTE *pos = contents;
+    size_t remaining = contentSize;
 
-          size_t length = RTPUtils::getBE16(&(pos[6]));
-          size_t modulas = length % sizeof(DWORD);
-          size_t padding = ((0 != modulas) ? (sizeof(DWORD)-modulas) : 0);
+    size_t possibleVBCMs = 0;
 
-          advancePos(pos, remaining, sizeof(DWORD)*2);
+    while (remaining >= (sizeof(DWORD)*2)) {
+      mAllocationSize += internal::alignedSize(sizeof(PayloadSpecificFeedbackMessage::VBCM));
+      ++possibleVBCMs;
 
-          ASSERT(remaining >= length)
+      size_t length = UseRTPUtils::getBE16(&(pos[6]));
+      size_t modulas = length % sizeof(DWORD);
+      size_t padding = ((0 != modulas) ? (sizeof(DWORD)-modulas) : 0);
 
-          size_t skipLength = (((length + padding) > remaining) ? remaining : (length + padding));
+      internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-          advancePos(pos, remaining, skipLength);
-        }
-        ASSERT(0 != possibleVBCMs)
+      if (remaining < length) {
+        ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+          string, message, "malformed VBCM payload specific feedback message",
+          puid, mediaChannelID, mMediaChannelID,
+          size_t, remaining, remaining,
+          size_t, length, length
+        );
+        return false;
       }
 
-      pos = report->fci();
-      remaining = report->fciSize();
-
-      {
-        ASSERT(0 != possibleVBCMs)
-
-        report->mFirstVBCM = new (allocateBuffer(alignedSize(sizeof(VBCM))*possibleVBCMs)) VBCM[possibleVBCMs];
+      size_t skipLength = (((length + padding) > remaining) ? remaining : (length + padding));
 
-        while (remaining >= (sizeof(DWORD)*2)) {
-          VBCM *vcbm = &(report->mFirstVBCM[report->mVBCMCount]);
-          fillCodecControlCommon(report, vcbm, pos);
+      internal::advancePos(pos, remaining, skipLength);
+    }
 
-          // move reserved to control specific
-          vcbm->mControlSpecific = vcbm->mReserved;
-          vcbm->mReserved = 0;
+    if (possibleVBCMs < 1) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed VBCM payload specific feedback message (possible VBCMs too small)",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, possibleVBCMs
+      );
+      return false;
+    }
 
-          size_t length = RTPUtils::getBE16(&(pos[6]));
-          size_t modulas = length % sizeof(DWORD);
-          size_t padding = ((0 != modulas) ? (sizeof(DWORD)-modulas) : 0);
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getPayloadSpecificFeedbackMessageAFBAllocationSize(
+                                                                        BYTE fmt,
+                                                                        const BYTE *contents,
+                                                                        size_t contentSize
+                                                                        )
+  {
+    return true;
+  }
 
-          advancePos(pos, remaining, sizeof(DWORD)*2);
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getPayloadSpecificFeedbackMessageREMBAllocationSize(
+                                                                      BYTE fmt,
+                                                                      const BYTE *contents,
+                                                                      size_t contentSize
+                                                                      )
+  {
+    size_t remaining = contentSize;
+
+    if (remaining < (sizeof(DWORD)*3)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed REMB payload specific feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-          ASSERT(remaining >= length)
+    size_t possibleSSRCs = (remaining - (sizeof(DWORD)*2)) / sizeof(DWORD);
 
-          if (length > 0) {
-            vcbm->mVBCMOctetString = pos;
-          }
+    mAllocationSize += (internal::alignedSize(sizeof(DWORD)) * possibleSSRCs);
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getXRLossRLEReportBlockAllocationSize(
+                                                          BYTE typeSpecific,
+                                                          const BYTE *contents,
+                                                          size_t contentSize
+                                                          )
+  {
+    mAllocationSize += internal::alignedSize(sizeof(XR::LossRLEReportBlock));
+
+    const BYTE *pos = contents;
+    size_t remaining = contentSize;
+
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed loss RLE report block",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-          size_t skipLength = (((length + padding) > remaining) ? remaining : (length + padding));
+    internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-          advancePos(pos, remaining, skipLength);
+    size_t possibleChunks = remaining  / sizeof(WORD);
 
-          ++(report->mVBCMCount);
-        }
+    if (0 != possibleChunks) {
+      mAllocationSize += internal::alignedSize(sizeof(XR::RLEChunk)) * possibleChunks;
+    }
 
-        ASSERT(possibleVBCMs == report->mVBCMCount)
-      }
-      return true;
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getXRDuplicateRLEReportBlockAllocationSize(
+                                                              BYTE typeSpecific,
+                                                              const BYTE *contents,
+                                                              size_t contentSize
+                                                              )
+  {
+    mAllocationSize += internal::alignedSize(sizeof(XR::DuplicateRLEReportBlock));
+
+    const BYTE *pos = contents;
+    size_t remaining = contentSize;
+
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed duplicate RLE report block",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
     }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseAFB(PayloadSpecificFeedbackMessage *report)
-    {
-      typedef PayloadSpecificFeedbackMessage::AFB AFB;
+    internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
+    size_t possibleChunks = remaining  / sizeof(WORD);
 
-      if (remaining > 0) {
-        report->mAFB.mData = pos;
-        report->mAFB.mDataSize = remaining;
-      }
-      return true;
+    if (0 != possibleChunks) {
+      mAllocationSize += internal::alignedSize(sizeof(XR::RLEChunk)) * possibleChunks;
     }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseREMB(PayloadSpecificFeedbackMessage *report)
-    {
-      typedef PayloadSpecificFeedbackMessage::REMB REMB;
 
-      if (!parseAFB(report)) return false;
-
-      const BYTE *pos = report->fci();
-      size_t remaining = report->fciSize();
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getXRPacketReceiptTimesReportBlockAllocationSize(
+                                                                    BYTE typeSpecific,
+                                                                    const BYTE *contents,
+                                                                    size_t contentSize
+                                                                    )
+  {
+    mAllocationSize += internal::alignedSize(sizeof(XR::PacketReceiptTimesReportBlock));
+
+    const BYTE *pos = contents;
+    size_t remaining = contentSize;
+
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed packet receipt times report block",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-      report->mHasREMB = true;
+    internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-      {
-        ASSERT(remaining >= sizeof(DWORD)*3)
+    size_t possibleReceiptTimes = remaining  / sizeof(DWORD);
 
-        report->mREMB.mNumSSRC = pos[4];
-        report->mREMB.mBRExp = RTCP_GET_BITS(pos[5], 0x3F, 2);
-        report->mREMB.mBRMantissa = RTCP_GET_BITS(RTPUtils::getBE32(&(pos[4])), 0x3FFFF, 0);
+    if (0 != possibleReceiptTimes) {
+      mAllocationSize += internal::alignedSize(sizeof(DWORD)) * possibleReceiptTimes;
+    }
 
-        size_t possibleSSRCs = (remaining - sizeof(DWORD)*2) / (sizeof(DWORD));
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getXRReceiverReferenceTimeReportBlockAllocationSize(
+                                                                        BYTE typeSpecific,
+                                                                        const BYTE *contents,
+                                                                        size_t contentSize
+                                                                        )
+  {
+    mAllocationSize += internal::alignedSize(sizeof(XR::ReceiverReferenceTimeReportBlock));
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getXRDLRRReportBlockAllocationSize(
+                                                      BYTE typeSpecific,
+                                                      const BYTE *contents,
+                                                      size_t contentSize
+                                                      )
+  {
+    mAllocationSize += internal::alignedSize(sizeof(XR::DLRRReportBlock));
 
-        advancePos(pos, remaining, sizeof(DWORD)*2);
+    size_t possibleSubBlocks = contentSize / (sizeof(DWORD) + sizeof(DWORD) + sizeof(DWORD));
+    if (0 != possibleSubBlocks) {
+      mAllocationSize += internal::alignedSize(sizeof(XR::DLRRReportBlock::SubBlock)) * possibleSubBlocks;
+    }
+    return true;
+  }
 
-        report->mREMB.mSSRCs = new (allocateBuffer(alignedSize(sizeof(DWORD))*possibleSSRCs)) DWORD[possibleSSRCs];
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getXRStatisticsSummaryReportBlockAllocationSize(
+                                                                    BYTE typeSpecific,
+                                                                    const BYTE *contents,
+                                                                    size_t contentSize
+                                                                    )
+  {
+    mAllocationSize += internal::alignedSize(sizeof(XR::StatisticsSummaryReportBlock));
+    return true;
+  }
 
-        size_t count = 0;
-        while ((possibleSSRCs > 0) &&
-               (count < report->mREMB.numSSRC()) &&
-               (remaining >= sizeof(DWORD)))
-        {
-          report->mREMB.mSSRCs[count] = RTPUtils::getBE32(pos);
-          advancePos(pos, remaining, sizeof(DWORD));
-          --possibleSSRCs;
-          ++count;
-        }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getXRVoIPMetricsReportBlockAllocationSize(
+                                                              BYTE typeSpecific,
+                                                              const BYTE *contents,
+                                                              size_t contentSize
+                                                              )
+  {
+    mAllocationSize += internal::alignedSize(sizeof(XR::VoIPMetricsReportBlock));
+    return true;
+  }
 
-        if (count != report->mREMB.numSSRC()) goto illegal_remaining;
-        return true;
-      }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::getXRUnknownReportBlockAllocationSize(
+                                                          BYTE typeSpecific,
+                                                          const BYTE *contents,
+                                                          size_t contentSize
+                                                          )
+  {
+    mAllocationSize += internal::alignedSize(sizeof(XR::UnknownReportBlock));
+    return true;
+  }
 
-    illegal_remaining:
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  //-------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTCPPacket (parsing routines)
+  #pragma mark
+
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(
+                          Report * &ioLastReport,
+                          BYTE version,
+                          BYTE padding,
+                          BYTE reportSpecific,
+                          BYTE pt,
+                          const BYTE *contents,
+                          size_t contentSize
+                          )
+  {
+    Report *usingReport = NULL;
+
+    switch (pt) {
+      case SenderReport::kPayloadType:                                {
+        auto temp = &(mFirstSenderReport[mSenderReportCount]);;
+        fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
+        if (!parse(temp)) return false;
+        usingReport = temp;
+        break;
+      }
+      case ReceiverReport::kPayloadType:                              {
+        auto temp = &(mFirstReceiverReport[mReceiverReportCount]);
+        fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
+        if (!parse(temp)) return false;
+        usingReport = temp;
+        break;
+      }
+      case SDES::kPayloadType:                                        {
+        auto temp = &(mFirstSDES[mSDESCount]);
+        fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
+        if (!parse(temp)) return false;
+        usingReport = temp;
+        break;
+      }
+      case Bye::kPayloadType:                                         {
+        auto temp = &(mFirstBye[mByeCount]);
+        fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
+        if (!parse(temp)) return false;
+        usingReport = temp;
+        break;
+      }
+      case App::kPayloadType:                                         {
+        auto temp = &(mFirstApp[mAppCount]);
+        fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
+        if (!parse(temp)) return false;
+        usingReport = temp;
+        break;
+      }
+      case TransportLayerFeedbackMessage::kPayloadType:               {
+        auto temp = &(mFirstTransportLayerFeedbackMessage[mTransportLayerFeedbackMessageCount]);
+        fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
+        if (!parse(temp)) return false;
+        usingReport = temp;
+        break;
+      }
+      case PayloadSpecificFeedbackMessage::kPayloadType:              {
+        auto temp = &(mFirstPayloadSpecificFeedbackMessage[mPayloadSpecificFeedbackMessageCount]);
+        fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
+        if (!parse(temp)) return false;
+        usingReport = temp;
+        break;
+      }
+      case XR::kPayloadType:                                          {
+        auto temp = &(mFirstXR[mXRCount]);
+        fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
+        if (!parse(temp)) return false;
+        usingReport = temp;
+        break;
+      }
+      default:
       {
-        ZS_LOG_WARNING(Trace, debug("malformed REMB payload specific feedback message") + ZS_PARAM("pos", reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->fci()))  + ZS_PARAM("remaining", remaining))
+        auto temp = &(mFirstUnknownReport[mUnknownReportCount]);
+        fill(temp, version, padding, reportSpecific, pt, contents, contentSize);
+        if (!parse(temp)) return false;
+        usingReport = temp;
+        break;
       }
-      return false;
     }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseUnknown(PayloadSpecificFeedbackMessage *report)
-    {
-      report->mUnknown = report;
-      return true;
+    if (NULL != ioLastReport) {
+      ioLastReport->mNext = usingReport;
     }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseCommonRange(
-                                      XR *xr,
-                                      XR::ReportBlockRange *reportBlock
-                                      )
-    {
-      const BYTE *pos = reportBlock->typeSpecificContents();
-      size_t remaining = reportBlock->typeSpecificContentSize();
 
-      {
-        if (remaining < (sizeof(DWORD)*2)) goto illegal_remaining;
-
-        reportBlock->mSSRCOfSource = RTPUtils::getBE32(&(pos[0]));
-        reportBlock->mBeginSeq = RTPUtils::getBE16(&(pos[4]));
-        reportBlock->mEndSeq = RTPUtils::getBE16(&(pos[6]));
+    ioLastReport = usingReport;
+    return true;
+  }
 
-        return true;
-      }
+  //-------------------------------------------------------------------------
+  void RTCPPacket::fill(
+                        Report *report,
+                        BYTE version,
+                        BYTE padding,
+                        BYTE reportSpecific,
+                        BYTE pt,
+                        const BYTE *contents,
+                        size_t contentSize
+                        )
+  {
+    if (contentSize > 0) {
+      report->mPtr = contents;
+      report->mSize = contentSize;
+    }
+    report->mVersion = version;
+    report->mPadding = padding;
+    report->mReportSpecific = reportSpecific;
+    report->mPT = pt;
+  }
 
-    illegal_remaining:
-      {
-        ZS_LOG_WARNING(Trace, debug("malformed report block range") + ZS_PARAM("pos", reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(reportBlock->typeSpecificContents()))  + ZS_PARAM("remaining", remaining))
-      }
-      return false;
-    }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseCommon(
+                                SenderReceiverCommonReport *report,
+                                size_t detailedHeaderSize
+                                )
+  {
+    const BYTE *pos = report->ptr();
+    size_t remaining = report->size();
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parseCommonRLE(
-                                    XR *xr,
-                                    XR::RLEReportBlock *reportBlock
-                                    )
     {
-      const BYTE *pos = reportBlock->typeSpecificContents();
-      size_t remaining = reportBlock->typeSpecificContentSize();
+      if (remaining < sizeof(DWORD)) goto illegal_size;
 
-      if (!parseCommonRange(xr, reportBlock)) return false;
+      report->mSSRCOfSender = UseRTPUtils::getBE32(pos);
 
-      advancePos(pos, remaining, sizeof(DWORD)*2);
+      internal::advancePos(pos, remaining, sizeof(DWORD));
+
+      if (remaining < detailedHeaderSize) goto illegal_size;
 
-      size_t possibleRLEsCount = (remaining / sizeof(WORD));
+      internal::advancePos(pos, remaining, detailedHeaderSize);
 
-      if (0 == possibleRLEsCount) return true;
+      size_t count = 0;
 
-      reportBlock->mChunks = new (allocateBuffer(alignedSize(sizeof(XR::RLEChunk)*possibleRLEsCount))) XR::RLEChunk[possibleRLEsCount];
+      if (report->rc() > 0) {
+        report->mFirstReportBlock = new (allocateBuffer(internal::alignedSize(sizeof(SenderReceiverCommonReport::ReportBlock))*report->rc())) SenderReceiverCommonReport::ReportBlock[report->rc()];
 
-      while (remaining >= sizeof(WORD))
-      {
-        XR::RLEChunk value = RTPUtils::getBE16(pos);
-        advancePos(pos, remaining, sizeof(WORD));
+        while ((remaining >= (sizeof(DWORD)*6)) &&
+                (count < report->rc()))
+        {
+          SenderReceiverCommonReport::ReportBlock *block = &(report->mFirstReportBlock[count]);
+          if (0 != count) {
+            report->mFirstReportBlock[count-1].mNext = block;
+          }
+
+          block->mSSRC = UseRTPUtils::getBE32(&(pos[0]));
+          block->mFractionLost = pos[4];
+          block->mCumulativeNumberOfPacketsLost = UseRTPUtils::getBE32(&(pos[4]));
+          block->mCumulativeNumberOfPacketsLost = block->mCumulativeNumberOfPacketsLost & 0x00FFFFFF;
+          block->mExtendedHighestSequenceNumberReceived = UseRTPUtils::getBE32(&(pos[8]));
+          block->mInterarrivalJitter = UseRTPUtils::getBE32(&(pos[12]));
+          block->mLSR = UseRTPUtils::getBE32(&(pos[16]));
+          block->mDLSR = UseRTPUtils::getBE32(&(pos[20]));
+
+          internal::advancePos(pos, remaining, sizeof(DWORD)*6);
 
-        if (0 == value) break;
-        reportBlock->mChunks[reportBlock->mChunkCount] = value;
-        ++(reportBlock->mChunkCount);
+          ++count;
+        }
       }
 
-      if (0 == reportBlock->mChunkCount) {
-        reportBlock->mChunks = NULL;
+      if (count != report->rc()) goto illegal_size;
+
+      if (0 != remaining) {
+        report->mExtension = pos;
+        report->mExtensionSize = remaining;
       }
 
       return true;
     }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(
-                           XR *xr,
-                           XR::LossRLEReportBlock *reportBlock
-                           )
-    {
-      return parseCommonRLE(xr, reportBlock);
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(
-                           XR *xr,
-                           XR::DuplicateRLEReportBlock *reportBlock
-                           )
-    {
-      return parseCommonRLE(xr, reportBlock);
-    }
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(
-                           XR *xr,
-                           XR::PacketReceiptTimesReportBlock *reportBlock
-                           )
+  illegal_size:
     {
-      if (!parseCommonRange(xr, reportBlock)) return false;
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "unable to parse sender/receiver report (malformed packet)",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, detailedHeaderSize
+      );
+    }
 
-      const BYTE *pos = reportBlock->typeSpecificContents();
-      size_t remaining = reportBlock->typeSpecificContentSize();
+    return false;
+  }
 
-      advancePos(pos, remaining, sizeof(DWORD)*2);
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(SenderReport *report)
+  {
+    if (0 != mSenderReportCount) {
+      (&(mFirstSenderReport[mSenderReportCount-1]))->mNextSenderReport = report;
+    }
+    ++mSenderReportCount;
 
-      size_t possibleTimes = remaining / sizeof(DWORD);
+    if (!parseCommon(report, sizeof(DWORD)*5)) return false;
 
-      if (0 == possibleTimes) return true;
+    const BYTE *pos = report->ptr();
 
-      reportBlock->mReceiptTimes = new (allocateBuffer(alignedSize(sizeof(DWORD))*possibleTimes)) DWORD[possibleTimes];
+    report->mNTPTimestampMS = UseRTPUtils::getBE32(&(pos[4]));
+    report->mNTPTimestampLS = UseRTPUtils::getBE32(&(pos[8]));
+    report->mRTPTimestamp = UseRTPUtils::getBE32(&(pos[12]));
+    report->mSenderPacketCount = UseRTPUtils::getBE32(&(pos[16]));
+    report->mSenderOctetCount = UseRTPUtils::getBE32(&(pos[20]));
 
-      while (remaining >= sizeof(DWORD)) {
-        reportBlock->mReceiptTimes[reportBlock->mReceiptTimeCount] = RTPUtils::getBE32(pos);
-        advancePos(pos, remaining, sizeof(DWORD));
-        ++(reportBlock->mReceiptTimeCount);
-      }
+    return true;
+  }
 
-      return true;
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(ReceiverReport *report)
+  {
+    if (0 != mReceiverReportCount) {
+      (&(mFirstReceiverReport[mReceiverReportCount-1]))->mNextReceiverReport = report;
     }
+    ++mReceiverReportCount;
 
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(
-                           XR *xr,
-                           XR::ReceiverReferenceTimeReportBlock *reportBlock
-                           )
-    {
-      const BYTE *pos = reportBlock->typeSpecificContents();
-      size_t remaining = reportBlock->typeSpecificContentSize();
+    if (!parseCommon(report, 0)) return false;
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Trace, debug("malformed receiver reference time report block") + ZS_PARAM("remain", remaining))
-        return false;
-      }
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(SDES *report)
+  {
+    if (0 != mSDESCount) {
+      (&(mFirstSDES[mSDESCount-1]))->mNextSDES = report;
+    }
+    ++mSDESCount;
 
-      reportBlock->mNTPTimestampMS = RTPUtils::getBE32(&(pos[0]));
-      reportBlock->mNTPTimestampLS = RTPUtils::getBE32(&(pos[4]));
+    if (0 == report->sc()) return true;
 
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(
-                           XR *xr,
-                           XR::DLRRReportBlock *reportBlock
-                           )
-    {
-      const BYTE *pos = reportBlock->typeSpecificContents();
-      size_t remaining = reportBlock->typeSpecificContentSize();
+    size_t chunkCount = 0;
 
-      size_t possibleSubBlockCount = remaining / (sizeof(DWORD)*3);
+    const BYTE *pos = report->ptr();
+    size_t remaining = report->size();
 
-      if (0 == possibleSubBlockCount) return true;
+    report->mFirstChunk = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk))*(report->sc()))) SDES::Chunk[report->sc()];
 
-      if (remaining < (sizeof(DWORD)*2)) {
-        ZS_LOG_WARNING(Trace, debug("malformed dlr report block") + ZS_PARAM("remain", remaining))
-        return false;
+    while ((remaining > sizeof(DWORD)) &&
+            ((chunkCount < report->sc())))
+    {
+      SDES::Chunk *chunk = &(report->mFirstChunk[chunkCount]);
+      if (0 != chunkCount) {
+        report->mFirstChunk[chunkCount-1].mNext = chunk;
       }
+      ++chunkCount;
 
-      reportBlock->mSubBlocks = new (allocateBuffer(alignedSize(sizeof(XR::DLRRReportBlock::SubBlock))*possibleSubBlockCount)) XR::DLRRReportBlock::SubBlock[possibleSubBlockCount];
-
-      while (remaining >= (sizeof(DWORD)*3))
-      {
-        auto subBlock = &(reportBlock->mSubBlocks[reportBlock->mSubBlockCount]);
+      ZS_EVENTING_2(x, i, Insane, RTCPPacketParseSDES, ol, RtcpPacket, Parse,
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, chunkCount, chunkCount - 1
+      );
 
-        subBlock->mSSRC = RTPUtils::getBE32(&(pos[0]));
-        subBlock->mLRR = RTPUtils::getBE32(&(pos[4]));
-        subBlock->mDLRR = RTPUtils::getBE32(&(pos[8]));
+      chunk->mSSRC = UseRTPUtils::getBE32(pos);
+      internal::advancePos(pos, remaining, sizeof(DWORD));
 
-        advancePos(pos, remaining, sizeof(DWORD)*3);
+      const BYTE *startOfItems = pos;
+      size_t remainingAtStartOfItems = remaining;
 
-        ++(reportBlock->mSubBlockCount);
-      }
+      // first do an items count
+      while (remaining >= sizeof(BYTE)) {
 
-      ASSERT(reportBlock->mSubBlockCount == possibleSubBlockCount)
+        BYTE type = *pos;
+        internal::advancePos(pos, remaining);
 
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(
-                           XR *xr,
-                           XR::StatisticsSummaryReportBlock *reportBlock
-                           )
-    {
-      const BYTE *pos = reportBlock->typeSpecificContents();
-      size_t remaining = reportBlock->typeSpecificContentSize();
+        if (SDES::Chunk::kEndOfItemsType == type) {
+          // stop now (going to retry parsing again anyway)
+          break;
+        }
 
-      parseCommonRange(xr, reportBlock);
+        ASSERT(remaining >= sizeof(BYTE))
 
-      if (remaining < (sizeof(DWORD)*9)) {
-        ZS_LOG_TRACE(debug("malformed statistics summary report block") + ZS_PARAM("remaining", remaining))
-        return false;
-      }
+        size_t length = static_cast<size_t>(*pos);
+        internal::advancePos(pos, remaining);
 
-      advancePos(pos, remaining, sizeof(DWORD)*2);
+        ASSERT(remaining >= length)
 
-      reportBlock->mLostPackets = RTPUtils::getBE32(&(pos[0]));
-      reportBlock->mDupPackets = RTPUtils::getBE32(&(pos[4]));
-      reportBlock->mMinJitter = RTPUtils::getBE32(&(pos[8]));
-      reportBlock->mMaxJitter = RTPUtils::getBE32(&(pos[12]));
-      reportBlock->mMeanJitter = RTPUtils::getBE32(&(pos[16]));
-      reportBlock->mDevJitter = RTPUtils::getBE32(&(pos[20]));
+        switch (type) {
+          case SDES::Chunk::CName::kItemType: ++(chunk->mCNameCount); break;
+          case SDES::Chunk::Name::kItemType:  ++(chunk->mNameCount); break;
+          case SDES::Chunk::Email::kItemType: ++(chunk->mEmailCount); break;
+          case SDES::Chunk::Phone::kItemType: ++(chunk->mPhoneCount); break;
+          case SDES::Chunk::Loc::kItemType:   ++(chunk->mLocCount); break;
+          case SDES::Chunk::Tool::kItemType:  ++(chunk->mToolCount); break;
+          case SDES::Chunk::Note::kItemType:  ++(chunk->mNoteCount); break;
+          case SDES::Chunk::Priv::kItemType:  ++(chunk->mPrivCount); break;
+          case SDES::Chunk::Mid::kItemType:   ++(chunk->mMidCount); break;
+          case SDES::Chunk::Rid::kItemType:   ++(chunk->mRidCount); break;
+          default:
+          {
+            ++(chunk->mUnknownCount);
+            ZS_EVENTING_2(x, w, Insane, RTCPPacketParseWarningSDESItemNotUnderstood, ol, RtcpPacket, Parse,
+              puid, mediaChannelID, mMediaChannelID,
+              byte, type, type
+            );
+            break;
+          }
+        }
 
-      reportBlock->mMinTTLOrHL = pos[24];
-      reportBlock->mMaxTTLOrHL = pos[25];
-      reportBlock->mMeanTTLOrHL = pos[26];
-      reportBlock->mDevTTLOrHL = pos[27];
+        internal::advancePos(pos, remaining, length);
+      }
 
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(
-                           XR *xr,
-                           XR::VoIPMetricsReportBlock *reportBlock
-                           )
-    {
-      const BYTE *pos = reportBlock->typeSpecificContents();
-      size_t remaining = reportBlock->typeSpecificContentSize();
+      // allocate space for items
 
-      if (remaining < (sizeof(DWORD)*8)) {
-        ZS_LOG_TRACE(debug("malformed voip metrics report block") + ZS_PARAM("remaining", remaining))
-        return false;
+      if (0 != chunk->mCNameCount) {
+        chunk->mFirstCName = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::CName))*(chunk->mCNameCount))) SDES::Chunk::CName[chunk->mCNameCount];
+      }
+      if (0 != chunk->mNameCount) {
+        chunk->mFirstName = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::Name))*(chunk->mNameCount))) SDES::Chunk::Name[chunk->mNameCount];
+      }
+      if (0 != chunk->mEmailCount) {
+        chunk->mFirstEmail = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::Email))*(chunk->mEmailCount))) SDES::Chunk::Email[chunk->mEmailCount];
+      }
+      if (0 != chunk->mPhoneCount) {
+        chunk->mFirstPhone = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::Phone))*(chunk->mPhoneCount))) SDES::Chunk::Phone[chunk->mPhoneCount];
+      }
+      if (0 != chunk->mLocCount) {
+        chunk->mFirstLoc = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::Loc))*(chunk->mLocCount))) SDES::Chunk::Loc[chunk->mLocCount];
+      }
+      if (0 != chunk->mToolCount) {
+        chunk->mFirstTool = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::Tool))*(chunk->mToolCount))) SDES::Chunk::Tool[chunk->mToolCount];
+      }
+      if (0 != chunk->mNoteCount) {
+        chunk->mFirstNote = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::Note))*(chunk->mNoteCount))) SDES::Chunk::Note[chunk->mNoteCount];
+      }
+      if (0 != chunk->mPrivCount) {
+        chunk->mFirstPriv = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::Priv))*(chunk->mPrivCount))) SDES::Chunk::Priv[chunk->mPrivCount];
+      }
+      if (0 != chunk->mMidCount) {
+        chunk->mFirstMid = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::Mid))*(chunk->mMidCount))) SDES::Chunk::Mid[chunk->mMidCount];
+      }
+      if (0 != chunk->mRidCount) {
+        chunk->mFirstRid = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::Rid))*(chunk->mRidCount))) SDES::Chunk::Rid[chunk->mRidCount];
+      }
+      if (0 != chunk->mUnknownCount) {
+        chunk->mFirstUnknown = new (allocateBuffer(internal::alignedSize(sizeof(SDES::Chunk::Unknown))*(chunk->mUnknownCount))) SDES::Chunk::Unknown[chunk->mUnknownCount];
       }
 
-      reportBlock->mSSRCOfSource = RTPUtils::getBE32(&(pos[0]));
-      reportBlock->mLossRate = pos[4];
-      reportBlock->mDiscardRate = pos[5];
-      reportBlock->mBurstDensity = pos[6];
-      reportBlock->mGapDensity = pos[7];
-      reportBlock->mBurstDuration = RTPUtils::getBE16(&(pos[8]));
-      reportBlock->mGapDuration = RTPUtils::getBE16(&(pos[10]));
-      reportBlock->mRoundTripDelay = RTPUtils::getBE16(&(pos[12]));
-      reportBlock->mEndSystemDelay = RTPUtils::getBE16(&(pos[14]));
-      reportBlock->mSignalLevel = pos[16];
-      reportBlock->mNoiseLevel = pos[17];
-      reportBlock->mRERL = pos[18];
-      reportBlock->mGmin = pos[19];
-      reportBlock->mRFactor = pos[20];
-      reportBlock->mExtRFactor = pos[21];
-      reportBlock->mMOSLQ = pos[22];
-      reportBlock->mMOSCQ = pos[23];
-      reportBlock->mRXConfig = pos[24];
-      reportBlock->mReservedVoIP = pos[25];
-      reportBlock->mJBNominal = RTPUtils::getBE16(&(pos[26]));
-      reportBlock->mJBMaximum = RTPUtils::getBE16(&(pos[28]));
-      reportBlock->mJBAbsMax = RTPUtils::getBE16(&(pos[30]));
-
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTCPPacket::parse(
-                           XR *xr,
-                           XR::UnknownReportBlock *reportBlock
-                           )
-    {
-      return true;
-    }
+      chunk->mCNameCount = 0;
+      chunk->mNameCount = 0;
+      chunk->mEmailCount = 0;
+      chunk->mPhoneCount = 0;
+      chunk->mLocCount = 0;
+      chunk->mToolCount = 0;
+      chunk->mNoteCount = 0;
+      chunk->mPrivCount = 0;
+      chunk->mMidCount = 0;
+      chunk->mRidCount = 0;
+      chunk->mUnknownCount = 0;
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket (writing sizing routines)
-    #pragma mark
+      // start over and now parse
+      pos = startOfItems;
+      remaining = remainingAtStartOfItems;
 
-    //-------------------------------------------------------------------------
-    void *RTCPPacket::allocateBuffer(size_t size)
-    {
-      return internal::allocateBuffer(mAllocationPos, mAllocationSize, size);
-    }
+      while (remaining >= sizeof(BYTE)) {
 
-    //-------------------------------------------------------------------------
-    static size_t getPacketSizeSenderReport(const RTCPPacket::SenderReport *report)
-    {
-      auto rc = report->rc();
-      throwIfGreaterThanBitsAllow(rc, 5);
-      return (sizeof(DWORD)*2) + (sizeof(DWORD)*5) + ((sizeof(DWORD)*6)*rc) + boundarySize(report->extensionSize());
-    }
+        BYTE type = *pos;
+        internal::advancePos(pos, remaining);
 
-    //-------------------------------------------------------------------------
-    static size_t getPacketSizeReceiverReport(const RTCPPacket::ReceiverReport *report)
-    {
-      auto rc = report->rc();
-      throwIfGreaterThanBitsAllow(rc, 5);
-      return (sizeof(DWORD)*2) + ((sizeof(DWORD)*6)*rc) + boundarySize(report->extensionSize());
-    }
+        if (SDES::Chunk::kEndOfItemsType == type) {
+          // skip NUL item (no length octet is present)
 
-    //-------------------------------------------------------------------------
-    static size_t getPacketSizeSDES(const RTCPPacket::SDES *report)
-    {
-      typedef RTCPPacket::SDES::Chunk Chunk;
+          // skip to next DWORD alignment
+          auto diff = reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(ptr());
+          while ((0 != (diff % sizeof(DWORD))) &&
+                  (remaining > 0))
+          {
+            // only NUL chunks are allowed
+            ASSERT(SDES::Chunk::kEndOfItemsType == (*pos));
+            internal::advancePos(pos, remaining);
+            ++diff;
+          }
+          break;
+        }
 
-      size_t result = (sizeof(DWORD));
+        ASSERT(remaining >= sizeof(BYTE))
 
-      size_t chunkCount = 0;
+        size_t length = static_cast<size_t>(*pos);
+        internal::advancePos(pos, remaining);
 
-      for (Chunk *chunk = report->firstChunk(); NULL != chunk; chunk = chunk->next(), ++chunkCount)
-      {
-        size_t chunkSize = sizeof(DWORD);
+        ASSERT(remaining >= length)
 
-        for (auto *item = chunk->firstCName(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          throwIfGreaterThanBitsAllow(len, 8);
-          chunkSize += ((sizeof(BYTE))*len);
-          ZS_LOG_INSANE(packet_slog("get packet SDES CName size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+        SDES::Chunk::StringItem *item {};
 
-        for (auto *item = chunk->firstName(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          throwIfGreaterThanBitsAllow(len, 8);
-          chunkSize += ((sizeof(BYTE))*len);
-          ZS_LOG_INSANE(packet_slog("get packet SDES Name size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+        const char *prefixStr = NULL;
+        size_t prefixLen = 0;
 
-        for (auto *item = chunk->firstEmail(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          throwIfGreaterThanBitsAllow(len, 8);
-          chunkSize += ((sizeof(BYTE))*len);
-          ZS_LOG_INSANE(packet_slog("get packet SDES Email size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+        switch (type) {
+          case SDES::Chunk::CName::kItemType: {
+            item = &(chunk->mFirstCName[chunk->mCNameCount]);
+            if (0 != chunk->mCNameCount) {
+              (&(chunk->mFirstCName[chunk->mCNameCount-1]))->mNext = item;
+            }
+            ++(chunk->mCNameCount);
+            break;
+          }
+          case SDES::Chunk::Name::kItemType:  {
+            item = &(chunk->mFirstName[chunk->mNameCount]);
+            if (0 != chunk->mNameCount) {
+              (&(chunk->mFirstName[chunk->mNameCount-1]))->mNext = item;
+            }
+            ++(chunk->mNameCount);
+            break;
+          }
+          case SDES::Chunk::Email::kItemType: {
+            item = &(chunk->mFirstEmail[chunk->mEmailCount]);
+            if (0 != chunk->mEmailCount) {
+              (&(chunk->mFirstEmail[chunk->mEmailCount-1]))->mNext = item;
+            }
+            ++(chunk->mEmailCount);
+            break;
+          }
+          case SDES::Chunk::Phone::kItemType: {
+            item = &(chunk->mFirstPhone[chunk->mPhoneCount]);
+            if (0 != chunk->mPhoneCount) {
+              (&(chunk->mFirstPhone[chunk->mPhoneCount-1]))->mNext = item;
+            }
+            ++(chunk->mPhoneCount);
+            break;
+          }
+          case SDES::Chunk::Loc::kItemType:   {
+            item = &(chunk->mFirstLoc[chunk->mLocCount]);
+            if (0 != chunk->mLocCount) {
+              (&(chunk->mFirstLoc[chunk->mLocCount-1]))->mNext = item;
+            }
+            ++(chunk->mLocCount);
+            break;
+          }
+          case SDES::Chunk::Tool::kItemType:  {
+            item = &(chunk->mFirstTool[chunk->mToolCount]);
+            if (0 != chunk->mToolCount) {
+              (&(chunk->mFirstTool[chunk->mToolCount-1]))->mNext = item;
+            }
+            ++(chunk->mToolCount);
+            break;
+          }
+          case SDES::Chunk::Note::kItemType:  {
+            item = &(chunk->mFirstNote[chunk->mNoteCount]);
+            if (0 != chunk->mNoteCount) {
+              (&(chunk->mFirstNote[chunk->mNoteCount-1]))->mNext = item;
+            }
+            ++(chunk->mNoteCount);
+            break;
+          }
+          case SDES::Chunk::Priv::kItemType:  {
+            SDES::Chunk::Priv *priv = &(chunk->mFirstPriv[chunk->mPrivCount]);
+            if (0 != chunk->mPrivCount) {
+              (&(chunk->mFirstPriv[chunk->mPrivCount-1]))->mNext = priv;
+            }
 
-        for (auto *item = chunk->firstPhone(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          throwIfGreaterThanBitsAllow(len, 8);
-          chunkSize += ((sizeof(BYTE))*len);
-          ZS_LOG_INSANE(packet_slog("get packet SDES Phone size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+            if (length > 0) {
+              prefixLen = static_cast<size_t>(*pos);
+              internal::advancePos(pos, remaining);
+              --length;
+              if (0 != prefixLen) {
+                priv->mPrefix = new (allocateBuffer(sizeof(char)*(prefixLen+1))) char [prefixLen+1];
+                priv->mPrefixLength = prefixLen;
+                memcpy(const_cast<char *>(priv->mPrefix), pos, prefixLen);
+
+                internal::advancePos(pos, remaining, prefixLen);
+                ASSERT(length >= prefixLen)
+
+                length -= prefixLen;
+              }
+            }
 
-        for (auto *item = chunk->firstLoc(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          throwIfGreaterThanBitsAllow(len, 8);
-          chunkSize += ((sizeof(BYTE))*len);
-          ZS_LOG_INSANE(packet_slog("get packet SDES Loc size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+            item = priv;
 
-        for (auto *item = chunk->firstTool(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          throwIfGreaterThanBitsAllow(len, 8);
-          chunkSize += ((sizeof(BYTE))*len);
-          ZS_LOG_INSANE(packet_slog("get packet SDES Tool size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+            ++(chunk->mPrivCount);
+            break;
+          }
+          case SDES::Chunk::Mid::kItemType:  {
+            item = &(chunk->mFirstMid[chunk->mMidCount]);
+            if (0 != chunk->mMidCount) {
+              (&(chunk->mFirstMid[chunk->mMidCount-1]))->mNext = item;
+            }
+            ++(chunk->mMidCount);
+            break;
+          }
+          case SDES::Chunk::Rid::kItemType:  {
+            item = &(chunk->mFirstRid[chunk->mRidCount]);
+            if (0 != chunk->mRidCount) {
+              (&(chunk->mFirstRid[chunk->mRidCount-1]))->mNext = item;
+            }
+            ++(chunk->mRidCount);
+            break;
+          }
+          default:
+          {
+            item = &(chunk->mFirstUnknown[chunk->mUnknownCount]);
+            if (0 != chunk->mUnknownCount) {
+              (&(chunk->mFirstUnknown[chunk->mUnknownCount-1]))->mNext = item;
+            }
+            ++(chunk->mUnknownCount);
+            ZS_EVENTING_2(x, w, Insane, RTCPPacketParseSDESItemTypeNotUnderstood, ol, RtcpPacket, Parse,
+              puid, mediaChannelID, mMediaChannelID,
+              byte, type, type
+            );
+            break;
+          }
         }
 
-        for (auto *item = chunk->firstNote(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          throwIfGreaterThanBitsAllow(len, 8);
-          chunkSize += ((sizeof(BYTE))*len);
-          ZS_LOG_INSANE(packet_slog("get packet SDES Note size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        if (NULL != item) {
+          item->mType = type;
+          if (length > 0) {
+            item->mValue = new (allocateBuffer(length+1)) char [length+1];
+            item->mLength = length;
+            memcpy(const_cast<char *>(item->mValue), pos, length);
+          }
+          if (NULL != prefixStr) {
+            ZS_EVENTING_7(x, i, Insane, RTCPPacketParseSDESPrefixItemPrefix, ol, RtcpPacket, Parse,
+              puid, mediaChannelID, mMediaChannelID,
+              string, type, item->typeToString(),
+              size_t, chunkCount, chunkCount,
+              size_t, prefixLen, prefixLen,
+              string, prefixStr, prefixStr,
+              size_t, length, length,
+              string, value, (NULL != item->mValue ? item->mValue : NULL)
+            );
+          } else {
+            ZS_EVENTING_5(x, i, Insane, RTCPPacketParseSDESItemPrefix, ol, RtcpPacket, Parse,
+              puid, mediaChannelID, mMediaChannelID,
+              string, type, item->typeToString(),
+              size_t, chunkCount, chunkCount,
+              size_t, length, length,
+              string, value, (NULL != item->mValue ? item->mValue : NULL)
+            );
+          }
         }
 
-        for (auto *item = chunk->firstPriv(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len1 = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          size_t len2 = (NULL != item->mPrefix ? strlen(item->mPrefix) : 0);
-
-          size_t totalLen = len1 + len2;
-          if (0 != totalLen) ++totalLen;
+        ++(chunk->mCount);
 
-          throwIfGreaterThanBitsAllow(totalLen, 8);
-          chunkSize += ((sizeof(BYTE))*totalLen);
-          ZS_LOG_INSANE(packet_slog("get packet SDES Priv size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("prefix len", len2) + ZS_PARAM("prefix", (NULL != item->mPrefix ? item->mPrefix : NULL)) + ZS_PARAM("len", len1) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+        internal::advancePos(pos, remaining, length);
+      }
 
-        for (auto *item = chunk->firstMid(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          throwIfGreaterThanBitsAllow(len, 8);
-          chunkSize += ((sizeof(BYTE))*len);
-          ZS_LOG_INSANE(packet_slog("get packet SDES Mid size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+    }
 
-        for (auto *item = chunk->firstRid(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          throwIfGreaterThanBitsAllow(len, 8);
-          chunkSize += ((sizeof(BYTE))*len);
-          ZS_LOG_INSANE(packet_slog("get packet SDES Rid size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
-        for (auto *item = chunk->firstUnknown(); NULL != item; item = item->next())
-        {
-          chunkSize += (sizeof(BYTE)*2);
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          throwIfGreaterThanBitsAllow(len, 8);
-          chunkSize += ((sizeof(BYTE))*len);
-          ZS_LOG_INSANE(packet_slog("get packet SDES Unknown size") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+    if (chunkCount != report->sc()) {
+      ZS_EVENTING_3(x, w, Trace, RTCPPacketParseSDESChunkCountAndPacketCountMismatch, ol, RtcpPacket, Parse,
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, chunkCount, chunkCount,
+        size_t, sc, report->sc()
+      );
+      return false;
+    }
 
-        size_t modulas = chunkSize % sizeof(DWORD);
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(Bye *report)
+  {
+    if (0 != mByeCount) {
+      (&(mFirstBye[mByeCount-1]))->mNextBye = report;
+    }
+    ++mByeCount;
 
-        if ((chunkSize == sizeof(DWORD)) ||
-            (0 == modulas)) {
-          chunkSize += sizeof(DWORD);
-        }
+    const BYTE *pos = report->ptr();
+    size_t remaining = report->size();
 
-        result += boundarySize(chunkSize);
+    if (NULL == pos) {
+      if (0 != report->sc()) {
+        ZS_EVENTING_2(x, w, Trace, RTCPPacketParseByeReportCountMissingSSRCs, ol, RtcpPacket, Parse,
+          puid, mediaChannelID, mMediaChannelID,
+          size_t, sc, report->sc()
+        );
+        ZS_EVENTING_TRACE_OBJECT(Insane, *this, "BYE report count > 0 but does not contain SSRCs");
+        return false;
       }
 
-      throwIfGreaterThanBitsAllow(chunkCount, 5);
-      return result;
+      return true;
+    }
+
+    if (0 != report->sc()) {
+      report->mSSRCs = new (allocateBuffer(internal::alignedSize(sizeof(DWORD))*(report->sc()))) DWORD[report->sc()];
     }
 
-    //-------------------------------------------------------------------------
-    static size_t getPacketSizeBye(const RTCPPacket::Bye *report)
     {
-      auto sc = report->sc();
-      throwIfGreaterThanBitsAllow(sc, 5);
+      size_t index = 0;
 
-      size_t result = (sizeof(DWORD)) + (sizeof(DWORD)*sc);
+      while (index < report->sc()) {
+        if (remaining < sizeof(DWORD)) goto illegal_remaining;
 
-      if (NULL != report->reasonForLeaving()) {
-        size_t len = strlen(report->reasonForLeaving());
-        if (len > 0) {
-          throwIfGreaterThanBitsAllow(len, 8);
-          result += sizeof(BYTE)+(sizeof(BYTE)*len);
+        report->mSSRCs[index] = UseRTPUtils::getBE32(pos);
+        internal::advancePos(pos, remaining, sizeof(DWORD));
+        ++index;
+      }
+
+      if (remaining > sizeof(BYTE)) {
+        size_t length = static_cast<size_t>(*pos);
+        internal::advancePos(pos, remaining);
+
+        if (remaining < length) goto illegal_remaining;
+
+        if (length > 0) {
+          report->mReasonForLeaving = new (allocateBuffer(internal::alignedSize((sizeof(char)*length)+sizeof(char)))) char[length+1];
+          memcpy(const_cast<char *>(report->mReasonForLeaving), pos, length);
         }
       }
 
-      return boundarySize(result);
+      return true;
     }
 
-    //-------------------------------------------------------------------------
-    static size_t getPacketSizeApp(const RTCPPacket::App *report)
+  illegal_remaining:
     {
-      size_t result = (sizeof(DWORD)*3);
-
-      auto dataSize = report->dataSize();
-      if (0 != dataSize) {
-        ORTC_THROW_INVALID_PARAMETERS_IF(NULL == report->mData)
-        result += dataSize;
-      }
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed BYE",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->ptr()))
+      );
+    }
+    return false;
+  }
 
-      return boundarySize(result);
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(App *report)
+  {
+    if (0 != mAppCount) {
+      (&(mFirstApp[mAppCount-1]))->mNextApp = report;
     }
-    
-    //-------------------------------------------------------------------------
-    static size_t getPacketSizeTransportLayerFeedbackMessage(const RTCPPacket::TransportLayerFeedbackMessage *fm)
+    ++mAppCount;
+
+    const BYTE *pos = report->ptr();
+    size_t remaining = report->size();
+
     {
-      typedef RTCPPacket::TransportLayerFeedbackMessage TransportLayerFeedbackMessage;
-      typedef RTCPPacket::TransportLayerFeedbackMessage::GenericNACK GenericNACK;
-      typedef RTCPPacket::TransportLayerFeedbackMessage::TMMBR TMMBR;
-      typedef RTCPPacket::TransportLayerFeedbackMessage::TMMBN TMMBN;
+      if (remaining < sizeof(DWORD)) goto illegal_remaining;
 
-      size_t result = (sizeof(DWORD)*3);
+      report->mSSRC = UseRTPUtils::getBE32(pos);
+      internal::advancePos(pos, remaining, sizeof(DWORD));
 
-      switch (fm->fmt()) {
-        case GenericNACK::kFmt:
-        {
-          auto count = fm->genericNACKCount();
-          throwIfLessThan(count, 1);
-          result += ((sizeof(DWORD))*(count));
-          break;
-        }
-        case TMMBR::kFmt:
-        {
-          auto count = fm->tmmbrCount();
-          throwIfLessThan(count, 1);
-          result += ((sizeof(DWORD)*2)*(count));
-          break;
-        }
-        case TMMBN::kFmt:
-        {
-          auto count = fm->tmmbnCount();
-          result += ((sizeof(DWORD)*2)*(count));
-          break;
-        }
-        default:
-        {
-          auto fciSize = fm->fciSize();
-          if (0 != fciSize) {
-            ORTC_THROW_INVALID_PARAMETERS_IF(NULL == fm->fci())
-            result += fciSize;
-          }
-          break;
-        }
+      if (remaining < sizeof(DWORD)) goto illegal_remaining;
+
+      for (size_t index = 0; index < sizeof(DWORD); ++index) {
+        report->mName[index] = static_cast<char>(pos[index]);
       }
+      internal::advancePos(pos, remaining, sizeof(DWORD));
 
-      ZS_LOG_INSANE(packet_slog("getting transport layer feedback message packet size") + ZS_PARAM("fmt", fm->fmtToString()) + ZS_PARAM("fmt (number)", fm->reportSpecific()) + ZS_PARAM("size", result))
+      if (0 != remaining) {
+        report->mData = pos;
+        report->mDataSize = remaining;
+      }
 
-      return boundarySize(result);
+      return true;
     }
 
-    //-------------------------------------------------------------------------
-    static size_t getPacketSizePayloadSpecificFeedbackMessage(const RTCPPacket::PayloadSpecificFeedbackMessage *fm)
+  illegal_remaining:
     {
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage PayloadSpecificFeedbackMessage;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::PLI PLI;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::SLI SLI;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::RPSI RPSI;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::FIR FIR;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::TSTR TSTR;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::TSTN TSTN;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::VBCM VBCM;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::AFB AFB;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::REMB REMB;
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed APP",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->ptr()))
+      );
+    }
+    return false;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(TransportLayerFeedbackMessage *report)
+  {
+    if (0 != mTransportLayerFeedbackMessageCount) {
+      (&(mFirstTransportLayerFeedbackMessage[mTransportLayerFeedbackMessageCount-1]))->mNextTransportLayerFeedbackMessage = report;
+    }
+    ++mTransportLayerFeedbackMessageCount;
 
-      size_t result = (sizeof(DWORD)*3);
+    const BYTE *pos = report->ptr();
+    size_t remaining = report->size();
 
-      switch (fm->fmt()) {
-        case PLI::kFmt:
-        {
-          break;
-        }
-        case SLI::kFmt:
-        {
-          auto count = fm->sliCount();
-          throwIfLessThan(count, 1);
-          result += (sizeof(DWORD)*(count));
-          break;
-        }
-        case RPSI::kFmt:
-        {
-          auto rpsi = fm->rpsi();
-          ORTC_THROW_INVALID_PARAMETERS_IF(NULL == rpsi)
-          result += sizeof(WORD) + (rpsi->nativeRPSIBitStringSizeInBits()/8);
-          if (0 != (rpsi->nativeRPSIBitStringSizeInBits()%8)) ++result;
-          break;
-        }
-        case FIR::kFmt:
-        {
-          auto count = fm->firCount();
-          throwIfLessThan(count, 1);
-          result += ((sizeof(DWORD)*2)*(count));
-          break;
-        }
-        case TSTR::kFmt:
-        {
-          auto count = fm->tstrCount();
-          throwIfLessThan(count, 1);
-          result += ((sizeof(DWORD)*2)*(count));
-          break;
-        }
-        case TSTN::kFmt:
-        {
-          auto count = fm->tstnCount();
-          throwIfLessThan(count, 1);
-          result += ((sizeof(DWORD)*2)*(count));
-          break;
-        }
-        case VBCM::kFmt:
-        {
-          auto count = fm->vbcmCount();
-          throwIfLessThan(count, 1);
-          for (size_t index = 0; index < count; ++index)
-          {
-            auto vbcm = fm->vbcmAtIndex(index);
-            ORTC_THROW_INVALID_PARAMETERS_IF(NULL == vbcm)
+    {
+      if (remaining < (sizeof(DWORD)*2)) goto illegal_remaining;
 
-            size_t size = (sizeof(DWORD)*2) + (vbcm->vbcmOctetStringSize()*sizeof(BYTE));
-            result += boundarySize(size);
-          }
-          break;
-        }
-        case AFB::kFmt:
-        {
-          auto remb = fm->remb();
-          if (NULL == remb) {
-            auto afb = fm->afb();
-            ORTC_THROW_INVALID_PARAMETERS_IF(NULL == afb)
+      fill(report, pos, remaining);
 
-            result += afb->dataSize();
-          } else {
-            result += (sizeof(DWORD)*2);
-            size_t numSSRCs = remb->numSSRC();
-            throwIfGreaterThanBitsAllow(numSSRCs, 8);
-            throwIfLessThan(numSSRCs, 1);
-            result += ((sizeof(DWORD))*numSSRCs);
-          }
-          break;
-        }
-        default:
-        {
-          auto fciSize = fm->fciSize();
-          if (0 != fciSize) {
-            ORTC_THROW_INVALID_PARAMETERS_IF(NULL == fm->fci())
-            result += fciSize;
-          }
+      bool result = false;
+
+      switch (report->fmt()) {
+        case TransportLayerFeedbackMessage::GenericNACK::kFmt:  result = parseGenericNACK(report); break;
+        case TransportLayerFeedbackMessage::TMMBR::kFmt:        result = parseTMMBR(report); break;
+        case TransportLayerFeedbackMessage::TMMBN::kFmt:        result = parseTMMBN(report); break;
+        default: {
+          result = parseUnknown(report);
           break;
         }
       }
 
-      ZS_LOG_INSANE(packet_slog("getting payload specific feedback message packet size") + ZS_PARAM("fmt", fm->fmtToString()) + ZS_PARAM("fmt (number)", fm->reportSpecific()) + ZS_PARAM("size", result))
+      ZS_EVENTING_3(x, i, Insane, RTCPPacketParseTransportLayerFeedbackMessage, ol, RtcpPacket, Parse,
+        puid, mediaChannelID, mMediaChannelID,
+        string, fmt, report->fmtToString(),
+        byte, fmtNumber, report->reportSpecific()
+      );
+      return true;
+    }
 
-      return boundarySize(result);
+  illegal_remaining:
+    {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed transport layer feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->ptr()))
+      );
+    }
+    return false;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(PayloadSpecificFeedbackMessage *report)
+  {
+    if (0 != mPayloadSpecificFeedbackMessageCount) {
+      (&(mFirstPayloadSpecificFeedbackMessage[mPayloadSpecificFeedbackMessageCount-1]))->mNextPayloadSpecificFeedbackMessage = report;
     }
+    ++mPayloadSpecificFeedbackMessageCount;
+
+    const BYTE *pos = report->ptr();
+    size_t remaining = report->size();
 
-    //-------------------------------------------------------------------------
-    static size_t getPacketSizeXR(const RTCPPacket::XR *report)
     {
-      typedef RTCPPacket::XR XR;
-      typedef RTCPPacket::XR::ReportBlock ReportBlock;
-      typedef RTCPPacket::XR::LossRLEReportBlock LossRLEReportBlock;
-      typedef RTCPPacket::XR::DuplicateRLEReportBlock DuplicateRLEReportBlock;
-      typedef RTCPPacket::XR::PacketReceiptTimesReportBlock PacketReceiptTimesReportBlock;
-      typedef RTCPPacket::XR::ReceiverReferenceTimeReportBlock ReceiverReferenceTimeReportBlock;
-      typedef RTCPPacket::XR::DLRRReportBlock DLRRReportBlock;
-      typedef RTCPPacket::XR::StatisticsSummaryReportBlock StatisticsSummaryReportBlock;
-      typedef RTCPPacket::XR::VoIPMetricsReportBlock VoIPMetricsReportBlock;
-      typedef RTCPPacket::XR::UnknownReportBlock UnknownReportBlock;
+      if (remaining < (sizeof(DWORD)*2)) goto illegal_remaining;
 
-      size_t result = (sizeof(DWORD)*2);
+      fill(report, pos, remaining);
+      internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-      for (const ReportBlock *reportBlock = report->firstReportBlock(); NULL != reportBlock; reportBlock = reportBlock->next())
-      {
-        size_t preSize = result;
+      bool result = false;
 
-        switch (reportBlock->mBlockType) {
-          case LossRLEReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const LossRLEReportBlock *>(reportBlock);
-            result += (sizeof(DWORD)*3);
-            result += boundarySize(sizeof(WORD)*(block->chunkCount()));
-            break;
-          }
-          case DuplicateRLEReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const DuplicateRLEReportBlock *>(reportBlock);
-            result += (sizeof(DWORD)*3);
-            result += boundarySize(sizeof(WORD)*(block->chunkCount()));
-            break;
-          }
-          case PacketReceiptTimesReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const PacketReceiptTimesReportBlock *>(reportBlock);
-            result += (sizeof(DWORD)*3);
-            result += (sizeof(DWORD)*(block->receiptTimeCount()));
-            break;
-          }
-          case ReceiverReferenceTimeReportBlock::kBlockType:
-          {
-            result += (sizeof(DWORD)*3);
-            break;
-          }
-          case DLRRReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const DLRRReportBlock *>(reportBlock);
-            result += (sizeof(DWORD));
-            result += ((sizeof(DWORD)*3)*(block->subBlockCount()));
-            break;
-          }
-          case StatisticsSummaryReportBlock::kBlockType:
+      switch (report->fmt()) {
+        case PayloadSpecificFeedbackMessage::PLI::kFmt:   result = parsePLI(report); break;
+        case PayloadSpecificFeedbackMessage::SLI::kFmt:   result = parseSLI(report); break;
+        case PayloadSpecificFeedbackMessage::RPSI::kFmt:  result = parseRPSI(report); break;
+        case PayloadSpecificFeedbackMessage::FIR::kFmt:   result = parseFIR(report); break;
+        case PayloadSpecificFeedbackMessage::TSTR::kFmt:  result = parseTSTR(report); break;
+        case PayloadSpecificFeedbackMessage::TSTN::kFmt:  result = parseTSTN(report); break;
+        case PayloadSpecificFeedbackMessage::VBCM::kFmt:  result = parseVBCM(report); break;
+        case PayloadSpecificFeedbackMessage::AFB::kFmt:   {
           {
-            result += (sizeof(DWORD)*10);
+            if (remaining < sizeof(DWORD)) goto generic_afb;
+            if (0 != memcmp(pos, reinterpret_cast<const BYTE *>("REMB"), sizeof(DWORD))) goto generic_afb;
+
+            result = parseREMB(report);
             break;
           }
-          case VoIPMetricsReportBlock::kBlockType:
+        generic_afb:
           {
-            result += (sizeof(DWORD)*9);
+            result = parseAFB(report);
             break;
           }
-          default:
-          {
-            result += (sizeof(DWORD)) + boundarySize(reportBlock->mTypeSpecificContentSize);
-          }
         }
-
-        ZS_LOG_INSANE(packet_slog("XR block packet size") + ZS_PARAM("block type", reportBlock->blockTypeToString()) + ZS_PARAM("block type (number)", reportBlock->blockType()) + ZS_PARAM("size", result - preSize))
+        default: {
+          result = parseUnknown(report);
+          break;
+        }
       }
 
-      return boundarySize(result);
+      ZS_EVENTING_3(x, i, Insane, RTCPPacketParsePayloadSpecificFeedbackMessage, ol, RtcpPacket, Parse,
+        puid, mediaChannelID, mMediaChannelID,
+        string, fmt, report->fmtToString(),
+        byte, fmtNumber, report->reportSpecific()
+      );
+      return true;
     }
 
-    //-------------------------------------------------------------------------
-    size_t RTCPPacket::getPacketSize(const Report *first)
+  illegal_remaining:
+    {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed payload specific feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->ptr()))
+      );
+    }
+    return false;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(XR *report)
+  {
+    if (0 != mXRCount) {
+      (&(mFirstXR[mXRCount-1]))->mNextXR = report;
+    }
+    ++mXRCount;
+
+    const BYTE *pos = report->ptr();
+    size_t remaining = report->size();
+
     {
-      size_t result = 0;
+      if (remaining < sizeof(DWORD)) goto illegal_remaining;
 
-      const Report *final = NULL;
+      report->mSSRC = UseRTPUtils::getBE32(pos);
+      internal::advancePos(pos, remaining, sizeof(DWORD));
 
-      for (const Report *report = first; NULL != report; report = report->next())
-      {
-        final = report;
+      // first count the totals for each XR block type
+      while (remaining >= sizeof(DWORD)) {
+
+        BYTE bt = pos[0];
+        size_t blockLength = static_cast<size_t>(UseRTPUtils::getBE16(&(pos[2]))) * sizeof(DWORD);
+
+        internal::advancePos(pos, remaining, sizeof(DWORD));
 
-        size_t beforeSize = result;
+        ++report->mReportBlockCount;
+
+        if (remaining < blockLength) {
+          ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+            string, message, "illegal XR block length found",
+            puid, mediaChannelID, mMediaChannelID,
+            size_t, remaining, remaining,
+            size_t, length, blockLength
+          );
+          return false;
+        }
 
-        switch (report->pt()) {
-          case SenderReport::kPayloadType:
+        switch (bt) {
+          case XR::LossRLEReportBlock::kBlockType:                ++(report->mLossRLEReportBlockCount); break;
+          case XR::DuplicateRLEReportBlock::kBlockType:           ++(report->mDuplicateRLEReportBlockCount); break;
+          case XR::PacketReceiptTimesReportBlock::kBlockType:     ++(report->mPacketReceiptTimesReportBlockCount); break;
+          case XR::ReceiverReferenceTimeReportBlock::kBlockType:  ++(report->mReceiverReferenceTimeReportBlockCount); break;
+          case XR::DLRRReportBlock::kBlockType:                   ++(report->mDLRRReportBlockCount); break;
+          case XR::StatisticsSummaryReportBlock::kBlockType:      ++(report->mStatisticsSummaryReportBlockCount); break;
+          case XR::VoIPMetricsReportBlock::kBlockType:            ++(report->mVoIPMetricsReportBlockCount); break;
+          default:
           {
-            const SenderReport *sr = static_cast<const SenderReport *>(report);
-            result += internal::getPacketSizeSenderReport(sr);
+            ++(report->mUnknownReportBlockCount); break;
             break;
           }
-          case ReceiverReport::kPayloadType:
-          {
-            const ReceiverReport *rr = static_cast<const ReceiverReport *>(report);
-            result += internal::getPacketSizeReceiverReport(rr);
+        }
+          
+        internal::advancePos(pos, remaining, blockLength);
+      }
+
+      if (0 != report->mLossRLEReportBlockCount) {
+        report->mFirstLossRLEReportBlock = new (allocateBuffer(internal::alignedSize(sizeof(XR::LossRLEReportBlock))*(report->mLossRLEReportBlockCount))) XR::LossRLEReportBlock[report->mLossRLEReportBlockCount];
+      }
+      if (0 != report->mDuplicateRLEReportBlockCount) {
+        report->mFirstDuplicateRLEReportBlock = new (allocateBuffer(internal::alignedSize(sizeof(XR::DuplicateRLEReportBlock))*(report->mDuplicateRLEReportBlockCount))) XR::DuplicateRLEReportBlock[report->mDuplicateRLEReportBlockCount];
+      }
+      if (0 != report->mPacketReceiptTimesReportBlockCount) {
+        report->mFirstPacketReceiptTimesReportBlock = new (allocateBuffer(internal::alignedSize(sizeof(XR::PacketReceiptTimesReportBlock))*(report->mPacketReceiptTimesReportBlockCount))) XR::PacketReceiptTimesReportBlock[report->mPacketReceiptTimesReportBlockCount];
+      }
+      if (0 != report->mReceiverReferenceTimeReportBlockCount) {
+        report->mFirstReceiverReferenceTimeReportBlock = new (allocateBuffer(internal::alignedSize(sizeof(XR::ReceiverReferenceTimeReportBlock))*(report->mReceiverReferenceTimeReportBlockCount))) XR::ReceiverReferenceTimeReportBlock[report->mReceiverReferenceTimeReportBlockCount];
+      }
+      if (0 != report->mDLRRReportBlockCount) {
+        report->mFirstDLRRReportBlock = new (allocateBuffer(internal::alignedSize(sizeof(XR::DLRRReportBlock))*(report->mDLRRReportBlockCount))) XR::DLRRReportBlock[report->mDLRRReportBlockCount];
+      }
+      if (0 != report->mStatisticsSummaryReportBlockCount) {
+        report->mFirstStatisticsSummaryReportBlock = new (allocateBuffer(internal::alignedSize(sizeof(XR::StatisticsSummaryReportBlock))*(report->mStatisticsSummaryReportBlockCount))) XR::StatisticsSummaryReportBlock[report->mStatisticsSummaryReportBlockCount];
+      }
+      if (0 != report->mVoIPMetricsReportBlockCount) {
+        report->mFirstVoIPMetricsReportBlock = new (allocateBuffer(internal::alignedSize(sizeof(XR::VoIPMetricsReportBlock))*(report->mVoIPMetricsReportBlockCount))) XR::VoIPMetricsReportBlock[report->mVoIPMetricsReportBlockCount];
+      }
+      if (0 != report->mUnknownReportBlockCount) {
+        report->mFirstUnknownReportBlock = new (allocateBuffer(internal::alignedSize(sizeof(XR::UnknownReportBlock))*(report->mUnknownReportBlockCount))) XR::UnknownReportBlock[report->mUnknownReportBlockCount];
+      }
+
+      report->mLossRLEReportBlockCount = 0;
+      report->mDuplicateRLEReportBlockCount = 0;
+      report->mPacketReceiptTimesReportBlockCount = 0;
+      report->mReceiverReferenceTimeReportBlockCount = 0;
+      report->mDLRRReportBlockCount = 0;
+      report->mStatisticsSummaryReportBlockCount = 0;
+      report->mVoIPMetricsReportBlockCount = 0;
+      report->mUnknownReportBlockCount = 0;
+
+      XR::ReportBlock *previousReportBlock = NULL;
+
+      // reset to start of buffer
+      pos = report->ptr();
+      remaining = report->size();
+
+      internal::advancePos(pos, remaining, sizeof(DWORD));
+
+      // parse each XR report block
+      while (remaining >= sizeof(DWORD)) {
+        const BYTE *prePos = pos;
+        size_t preAllocationSize = mAllocationSize;
+
+        BYTE bt = pos[0];
+        BYTE typeSpecific = pos[1];
+        size_t blockLength = static_cast<size_t>(UseRTPUtils::getBE16(&(pos[2]))) * sizeof(DWORD);
+
+        internal::advancePos(pos, remaining, sizeof(DWORD));
+
+        if (remaining < blockLength) {
+          ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+            string, message, "malformed XR block length found",
+            puid, mediaChannelID, mMediaChannelID,
+            size_t, remaining, remaining,
+            size_t, length, blockLength
+          );
+          return false;
+        }
+
+        XR::ReportBlock *usingBlock = NULL;
+
+        switch (bt) {
+          case XR::LossRLEReportBlock::kBlockType:                {
+            auto reportBlock = &(report->mFirstLossRLEReportBlock[report->mLossRLEReportBlockCount]);
+            usingBlock = reportBlock;
+            if (0 != report->mLossRLEReportBlockCount) {
+              (&(report->mFirstLossRLEReportBlock[report->mLossRLEReportBlockCount-1]))->mNextLossRLE = reportBlock;
+            }
+            ++(report->mLossRLEReportBlockCount);
+            fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
+            if (!parse(report, reportBlock)) return false;
             break;
           }
-          case SDES::kPayloadType:
-          {
-            const SDES *sdes = static_cast<const SDES *>(report);
-            result += internal::getPacketSizeSDES(sdes);
+          case XR::DuplicateRLEReportBlock::kBlockType:           {
+            auto reportBlock = &(report->mFirstDuplicateRLEReportBlock[report->mDuplicateRLEReportBlockCount]);
+            usingBlock = reportBlock;
+            if (0 != report->mDuplicateRLEReportBlockCount) {
+              (&(report->mFirstDuplicateRLEReportBlock[report->mDuplicateRLEReportBlockCount-1]))->mNextDuplicateRLE = reportBlock;
+            }
+            ++(report->mDuplicateRLEReportBlockCount);
+            fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
+            if (!parse(report, reportBlock)) return false;
             break;
           }
-          case Bye::kPayloadType:
-          {
-            const Bye *bye = static_cast<const Bye *>(report);
-            result += internal::getPacketSizeBye(bye);
+          case XR::PacketReceiptTimesReportBlock::kBlockType:     {
+            auto reportBlock = &(report->mFirstPacketReceiptTimesReportBlock[report->mPacketReceiptTimesReportBlockCount]);
+            usingBlock = reportBlock;
+            if (0 != report->mPacketReceiptTimesReportBlockCount) {
+              (&(report->mFirstPacketReceiptTimesReportBlock[report->mPacketReceiptTimesReportBlockCount-1]))->mNextPacketReceiptTimesReportBlock = reportBlock;
+            }
+            ++(report->mPacketReceiptTimesReportBlockCount);
+            fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
+            if (!parse(report, reportBlock)) return false;
             break;
           }
-          case App::kPayloadType:
-          {
-            const App *app = static_cast<const App *>(report);
-            result += internal::getPacketSizeApp(app);
+          case XR::ReceiverReferenceTimeReportBlock::kBlockType:  {
+            auto reportBlock = &(report->mFirstReceiverReferenceTimeReportBlock[report->mReceiverReferenceTimeReportBlockCount]);
+            usingBlock = reportBlock;
+            if (0 != report->mReceiverReferenceTimeReportBlockCount) {
+              (&(report->mFirstReceiverReferenceTimeReportBlock[report->mReceiverReferenceTimeReportBlockCount-1]))->mNextReceiverReferenceTimeReportBlock = reportBlock;
+            }
+            ++(report->mReceiverReferenceTimeReportBlockCount);
+            fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
+            if (!parse(report, reportBlock)) return false;
             break;
           }
-          case TransportLayerFeedbackMessage::kPayloadType:
-          {
-            const TransportLayerFeedbackMessage *fm = static_cast<const TransportLayerFeedbackMessage *>(report);
-            result += internal::getPacketSizeTransportLayerFeedbackMessage(fm);
+          case XR::DLRRReportBlock::kBlockType:                   {
+            auto reportBlock = &(report->mFirstDLRRReportBlock[report->mDLRRReportBlockCount]);
+            usingBlock = reportBlock;
+            if (0 != report->mDLRRReportBlockCount) {
+              (&(report->mFirstDLRRReportBlock[report->mDLRRReportBlockCount-1]))->mNextDLRRReportBlock = reportBlock;
+            }
+            ++(report->mDLRRReportBlockCount);
+            fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
+            if (!parse(report, reportBlock)) return false;
             break;
           }
-          case PayloadSpecificFeedbackMessage::kPayloadType:
-          {
-            const PayloadSpecificFeedbackMessage *fm = static_cast<const PayloadSpecificFeedbackMessage *>(report);
-            result += internal::getPacketSizePayloadSpecificFeedbackMessage(fm);
+          case XR::StatisticsSummaryReportBlock::kBlockType:      {
+            auto reportBlock = &(report->mFirstStatisticsSummaryReportBlock[report->mStatisticsSummaryReportBlockCount]);
+            usingBlock = reportBlock;
+            if (0 != report->mStatisticsSummaryReportBlockCount) {
+              (&(report->mFirstStatisticsSummaryReportBlock[report->mStatisticsSummaryReportBlockCount-1]))->mNextStatisticsSummaryReportBlock = reportBlock;
+            }
+            ++(report->mStatisticsSummaryReportBlockCount);
+            fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
+            if (!parse(report, reportBlock)) return false;
             break;
           }
-          case XR::kPayloadType:
-          {
-            const XR *xr = static_cast<const XR *>(report);
-            result += internal::getPacketSizeXR(xr);
+          case XR::VoIPMetricsReportBlock::kBlockType:            {
+            auto reportBlock = &(report->mFirstVoIPMetricsReportBlock[report->mVoIPMetricsReportBlockCount]);
+            usingBlock = reportBlock;
+            if (0 != report->mVoIPMetricsReportBlockCount) {
+              (&(report->mFirstVoIPMetricsReportBlock[report->mVoIPMetricsReportBlockCount-1]))->mNextVoIPMetricsReportBlock = reportBlock;
+            }
+            ++(report->mVoIPMetricsReportBlockCount);
+            fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
+            if (!parse(report, reportBlock)) return false;
             break;
           }
-          default:
-          {
-            result += sizeof(DWORD) +  boundarySize(report->size());
+          default:                                                {
+            auto reportBlock = &(report->mFirstUnknownReportBlock[report->mUnknownReportBlockCount]);
+            usingBlock = reportBlock;
+            if (0 != report->mUnknownReportBlockCount) {
+              (&(report->mFirstUnknownReportBlock[report->mUnknownReportBlockCount-1]))->mNextUnknownReportBlock = reportBlock;
+            }
+            ++(report->mUnknownReportBlockCount);
+            fill(report, reportBlock, previousReportBlock, bt, typeSpecific, pos, blockLength);
+            if (!parse(report, reportBlock)) return false;
             break;
           }
         }
 
-        size_t afterSize = result;
+        internal::advancePos(pos, remaining, blockLength);
 
-        if (ZS_IS_LOGGING(Insane)) {
-          ZS_LOG_TRACE(slog("getting report packet size") + ZS_PARAM("pt", report->ptToString()) + ZS_PARAM("pt (num)", report->pt()) + ZS_PARAM("size", afterSize-beforeSize))
-        }
+        ZS_EVENTING_5(x, i, Insane, RTCPPacketParseXR, ol, RtcpPacket, Parse,
+          puid, mediaChannelID, mMediaChannelID,
+          string, blockType, usingBlock->blockTypeToString(),
+          size_t, blockLength, blockLength,
+          size_t, consumed, (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(prePos)),
+          size_t, allocationConsumed, preAllocationSize - mAllocationSize
+        );
       }
 
-      if (NULL != final) {
-        auto padding = final->padding();
-        if (0 != padding) {
-          result += padding;
-        }
-      }
+      return true;
+    }
 
-      return boundarySize(result);
+  illegal_remaining:
+    {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed XR when parsing",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->ptr()))
+      );
     }
+    return false;
+  }
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket (packet writing routines)
-    #pragma mark
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(UnknownReport *report)
+  {
+    if (0 != mUnknownReportCount) {
+      (&(mFirstUnknownReport[mUnknownReportCount-1]))->mNextUnknown = report;
+    }
+    ++mUnknownReportCount;
 
-    //-------------------------------------------------------------------------
-    static void writePacketHeader(const RTCPPacket::Report *report, BYTE * &pos, size_t &remaining)
-    {
-      ASSERT(remaining >= sizeof(DWORD))
-      ASSERT(2 == report->version())
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  void RTCPPacket::fill(FeedbackMessage *report, const BYTE *contents, size_t contentSize)
+  {
+    const BYTE *pos = contents;
+    size_t remaining = contentSize;
 
-      auto padding = report->padding();
-      if (0 != padding) {
-        ASSERT(NULL == report->next())
-        ASSERT(throwIfGreaterThanBitsAllow(padding, 8))
-      }
+    report->mSSRCOfPacketSender = UseRTPUtils::getBE32(&(pos[0]));
+    report->mSSRCOfMediaSource = UseRTPUtils::getBE32(&(pos[4]));
 
-      ASSERT(throwIfGreaterThanBitsAllow(report->reportSpecific(), 5))
+    internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-      pos[0] = RTCP_PACK_BITS(report->version(), 0x3, 6) |
-               ((0 != padding) ? RTCP_PACK_BITS(1, 0x1, 5) : 0) |
-               RTCP_PACK_BITS(report->reportSpecific(), 0x1F, 0);
-      pos[1] = report->pt();
+    if (remaining > sizeof(BYTE)) {
+      report->mFCI = pos;
+      report->mFCISize = remaining;
     }
+  }
 
-    //-------------------------------------------------------------------------
-    static void writePacketSenderReceiverCommonReport(const RTCPPacket::SenderReceiverCommonReport *report, BYTE * &pos, size_t &remaining)
-    {
-      typedef RTCPPacket::SenderReceiverCommonReport SenderReceiverCommonReport;
-      typedef RTCPPacket::SenderReceiverCommonReport::ReportBlock ReportBlock;
+  //-------------------------------------------------------------------------
+  void RTCPPacket::fill(
+                        XR *report,
+                        XR::ReportBlock *reportBlock,
+                        XR::ReportBlock * &ioPreviousReportBlock,
+                        BYTE blockType,
+                        BYTE typeSpecific,
+                        const BYTE *contents,
+                        size_t contentSize
+                        )
+  {
+    reportBlock->mBlockType = blockType;
+    reportBlock->mTypeSpecific = typeSpecific;
+    if (0 != contentSize) {
+      reportBlock->mTypeSpecificContents = contents;
+      reportBlock->mTypeSpecificContentSize = contentSize;
+    }
 
-      size_t count = 0;
-      for (const ReportBlock *block = report->firstReportBlock(); NULL != block; block = block->next(), ++count)
-      {
-        ASSERT(count < report->rc())
+    if (NULL == report->mFirstReportBlock) {
+      report->mFirstReportBlock = reportBlock;
+    }
+    if (NULL != ioPreviousReportBlock) {
+      ioPreviousReportBlock->mNext = reportBlock;
+    }
+    ioPreviousReportBlock = reportBlock;
+  }
 
-        RTPUtils::setBE32(&(pos[0]), block->ssrc());
-        ASSERT(throwIfGreaterThanBitsAllow(block->cumulativeNumberOfPacketsLost(), 24))
-        RTPUtils::setBE32(&(pos[4]), block->cumulativeNumberOfPacketsLost());
-        pos[4] = block->fractionLost();
-        RTPUtils::setBE32(&(pos[8]), block->extendedHighestSequenceNumberReceived());
-        RTPUtils::setBE32(&(pos[12]), block->interarrivalJitter());
-        RTPUtils::setBE32(&(pos[16]), block->lsr());
-        RTPUtils::setBE32(&(pos[20]), block->dlsr());
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseGenericNACK(TransportLayerFeedbackMessage *report)
+  {
+    typedef TransportLayerFeedbackMessage::GenericNACK GenericNACK;
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
 
-        advancePos(pos, remaining, sizeof(DWORD)*6);
-      }
+    size_t possibleNACKs = remaining / sizeof(DWORD);
 
-      ASSERT(count == report->rc())
+    ASSERT(0 != possibleNACKs)
 
-      if (report->extensionSize() > 0) {
-        ASSERT(NULL != report->extension())
-        memcpy(pos, report->extension(), report->extensionSize());
-        advancePos(pos, remaining, boundarySize(report->extensionSize()));
-      }
+    report->mFirstGenericNACK = new (allocateBuffer(internal::alignedSize(sizeof(GenericNACK))*possibleNACKs)) GenericNACK[possibleNACKs];
+
+    while (remaining >= sizeof(DWORD)) {
+      GenericNACK *nack = &(report->mFirstGenericNACK[report->mGenericNACKCount]);
+
+      nack->mPID = UseRTPUtils::getBE16(&(pos[0]));
+      nack->mBLP = UseRTPUtils::getBE16(&(pos[2]));
+
+      internal::advancePos(pos, remaining, sizeof(DWORD));
+
+      ++(report->mGenericNACKCount);
     }
+
+    ASSERT(possibleNACKs == report->mGenericNACKCount)
+
+    return true;
+  }
     
-    //-------------------------------------------------------------------------
-    static void writePacketSenderReport(const RTCPPacket::SenderReport *report, BYTE * &pos, size_t &remaining)
-    {
-      typedef RTCPPacket::SenderReport SenderReport;
-      pos[1] = SenderReport::kPayloadType;
+  //-------------------------------------------------------------------------
+  void RTCPPacket::fillTMMBRCommon(
+                                    TransportLayerFeedbackMessage *report,
+                                    TransportLayerFeedbackMessage::TMMBRCommon *common,
+                                    const BYTE *pos
+                                    )
+  {
+    //typedef TransportLayerFeedbackMessage::TMMBRCommon TMMBRCommon;
 
-      RTPUtils::setBE32(&(pos[4]), report->ssrcOfSender());
-      RTPUtils::setBE32(&(pos[8]), report->ntpTimestampMS());
-      RTPUtils::setBE32(&(pos[12]), report->ntpTimestampLS());
-      RTPUtils::setBE32(&(pos[16]), report->rtpTimestamp());
-      RTPUtils::setBE32(&(pos[20]), report->senderPacketCount());
-      RTPUtils::setBE32(&(pos[24]), report->senderOctetCount());
+    common->mSSRC = UseRTPUtils::getBE32(&(pos[0]));
+    common->mMxTBRExp = RTCP_GET_BITS(pos[4], 0x3F, 2);
+    common->mMxTBRMantissa = RTCP_GET_BITS(UseRTPUtils::getBE32(&(pos[4])), 0x1FFFF, 9);
+    common->mMeasuredOverhead = RTCP_GET_BITS(UseRTPUtils::getBE32(&(pos[4])), 0x1FF, 0);
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseTMMBR(TransportLayerFeedbackMessage *report)
+  {
+    typedef TransportLayerFeedbackMessage::TMMBR TMMBR;
 
-      advancePos(pos, remaining, sizeof(DWORD)*7);
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
 
-      writePacketSenderReceiverCommonReport(report, pos, remaining);
-    }
+    size_t possibleTMMBRs = remaining / (sizeof(DWORD)*2);
 
-    //-------------------------------------------------------------------------
-    static void writePacketReceiverReport(const RTCPPacket::ReceiverReport *report, BYTE * &pos, size_t &remaining)
-    {
-      typedef RTCPPacket::ReceiverReport ReceiverReport;
-      pos[1] = ReceiverReport::kPayloadType;
+    ASSERT(0 != possibleTMMBRs)
 
-      RTPUtils::setBE32(&(pos[4]), report->ssrcOfPacketSender());
+    report->mFirstTMMBR = new (allocateBuffer(internal::alignedSize(sizeof(TMMBR))*possibleTMMBRs)) TMMBR[possibleTMMBRs];
 
-      advancePos(pos, remaining, sizeof(DWORD)*2);
+    while (remaining >= (sizeof(DWORD)*2)) {
+      TMMBR *tmmbr = &(report->mFirstTMMBR[report->mTMMBRCount]);
 
-      writePacketSenderReceiverCommonReport(report, pos, remaining);
+      fillTMMBRCommon(report, tmmbr, pos);
+
+      internal::advancePos(pos, remaining, sizeof(DWORD)*2);
+
+      ++(report->mTMMBRCount);
     }
+
+    ASSERT(possibleTMMBRs == report->mTMMBRCount)
+
+    return true;
+  }
     
-    //-------------------------------------------------------------------------
-    static void writePacketSDES(const RTCPPacket::SDES *report, BYTE * &pos, size_t &remaining)
-    {
-      typedef RTCPPacket::SDES SDES;
-      typedef RTCPPacket::SDES::Chunk Chunk;
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseTMMBN(TransportLayerFeedbackMessage *report)
+  {
+    typedef TransportLayerFeedbackMessage::TMMBN TMMBN;
+
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
+
+    size_t possibleTMMBNs = remaining / (sizeof(DWORD)*2);
+
+    if (possibleTMMBNs < 1) {
+      report->mFirstTMMBN = NULL;
+      report->mTMMBNCount = 0;
+      return true;
+    }
+
+    report->mFirstTMMBN = new (allocateBuffer(internal::alignedSize(sizeof(TMMBN))*possibleTMMBNs)) TMMBN[possibleTMMBNs];
+
+    while (remaining >= (sizeof(DWORD)*2)) {
+      TMMBN *tmmbr = &(report->mFirstTMMBN[report->mTMMBNCount]);
+
+      fillTMMBRCommon(report, tmmbr, pos);
+
+      internal::advancePos(pos, remaining, sizeof(DWORD)*2);
+
+      ++(report->mTMMBNCount);
+    }
+
+    ASSERT(possibleTMMBNs == report->mTMMBNCount)
+
+    return true;
+  }
+
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseUnknown(TransportLayerFeedbackMessage *report)
+  {
+    report->mUnknown = report;
+    return true;
+  }
 
-      pos[1] = SDES::kPayloadType;
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parsePLI(PayloadSpecificFeedbackMessage *report)
+  {
+    return true;
+  }
 
-      advancePos(pos, remaining, sizeof(DWORD));
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseSLI(PayloadSpecificFeedbackMessage *report)
+  {
+    typedef PayloadSpecificFeedbackMessage::SLI SLI;
 
-      size_t chunkCount = 0;
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
 
-      for (Chunk *chunk = report->firstChunk(); NULL != chunk; chunk = chunk->next(), ++chunkCount)
-      {
-        RTPUtils::setBE32(pos, chunk->ssrc());
-        advancePos(pos, remaining, sizeof(DWORD));
+    size_t possibleSLIs = remaining / (sizeof(DWORD));
 
-        BYTE *startPos = pos;
+    ASSERT(0 != possibleSLIs)
 
-        for (auto *item = chunk->firstCName(); NULL != item; item = item->next())
-        {
-          pos[0] = Chunk::CName::kItemType;
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+    report->mFirstSLI = new (allocateBuffer(internal::alignedSize(sizeof(SLI))*possibleSLIs)) SLI[possibleSLIs];
 
-          advancePos(pos, remaining, sizeof(WORD));
+    while (remaining >= (sizeof(DWORD))) {
+      SLI *sli = &(report->mFirstSLI[report->mSLICount]);
 
-          if (len > 0) {
-            memcpy(pos, item->value(), len*sizeof(BYTE));
-            advancePos(pos, remaining, len*sizeof(BYTE));
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES CName") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+      sli->mFirst = RTCP_GET_BITS(UseRTPUtils::getBE16(&(pos[0])), 0x1FFF, 3);
+      sli->mNumber = static_cast<WORD>(RTCP_GET_BITS(UseRTPUtils::getBE32(&(pos[0])), 0x1FFF, 6));
+      sli->mPictureID = RTCP_GET_BITS(pos[3], 0x3F, 0);
 
-        for (auto *item = chunk->firstName(); NULL != item; item = item->next())
-        {
-          pos[0] = Chunk::Name::kItemType;
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+      internal::advancePos(pos, remaining, sizeof(DWORD));
 
-          advancePos(pos, remaining, sizeof(WORD));
+      ++(report->mSLICount);
+    }
 
-          if (len > 0) {
-            memcpy(pos, item->value(), len*sizeof(BYTE));
-            advancePos(pos, remaining, len*sizeof(BYTE));
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES Name") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+    ASSERT(possibleSLIs == report->mSLICount)
 
-        for (auto *item = chunk->firstEmail(); NULL != item; item = item->next())
-        {
-          pos[0] = Chunk::Email::kItemType;
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseRPSI(PayloadSpecificFeedbackMessage *report)
+  {
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
 
-          advancePos(pos, remaining, sizeof(WORD));
+    {
+      if (remaining < sizeof(WORD)) goto illegal_remaining;
 
-          if (len > 0) {
-            memcpy(pos, item->value(), len*sizeof(BYTE));
-            advancePos(pos, remaining, len*sizeof(BYTE));
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES Email") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+      BYTE pb = pos[0];
+      report->mRPSI.mZeroBit = RTCP_GET_BITS(pos[1], 0x1, 7);
+      report->mRPSI.mPayloadType = RTCP_GET_BITS(pos[1], 0x7F, 0);
 
-        for (auto *item = chunk->firstPhone(); NULL != item; item = item->next())
-        {
-          pos[0] = Chunk::Phone::kItemType;
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+      internal::advancePos(pos, remaining, sizeof(WORD));
 
-          advancePos(pos, remaining, sizeof(WORD));
+      if (remaining > 0) {
+        report->mRPSI.mNativeRPSIBitString = pos;
+        report->mRPSI.mNativeRPSIBitStringSizeInBits = (remaining*8);
+        if (pb > report->mRPSI.mNativeRPSIBitStringSizeInBits) goto illegal_remaining;
 
-          if (len > 0) {
-            memcpy(pos, item->value(), len*sizeof(BYTE));
-            advancePos(pos, remaining, len*sizeof(BYTE));
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES Phone") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
+        report->mRPSI.mNativeRPSIBitStringSizeInBits -= static_cast<size_t>(pb);
+        if (0 == report->mRPSI.mNativeRPSIBitStringSizeInBits) {
+          report->mRPSI.mNativeRPSIBitString = NULL;
         }
+      }
 
-        for (auto *item = chunk->firstLoc(); NULL != item; item = item->next())
-        {
-          pos[0] = Chunk::Loc::kItemType;
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+      return true;
+    }
 
-          advancePos(pos, remaining, sizeof(WORD));
+  illegal_remaining:
+    {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed RPSI payload specific feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->fci()))
+      );
+    }
+    return false;
+  }
+    
+  //-------------------------------------------------------------------------
+  void RTCPPacket::fillCodecControlCommon(
+                                          PayloadSpecificFeedbackMessage *report,
+                                          PayloadSpecificFeedbackMessage::CodecControlCommon *common,
+                                          const BYTE *pos
+                                          )
+  {
+    common->mSSRC = UseRTPUtils::getBE32(&(pos[0]));
+    common->mSeqNr = pos[4];
+    common->mReserved = RTCP_GET_BITS(UseRTPUtils::getBE32(&(pos[4])), 0xFFFFFF, 0);
+  }
 
-          if (len > 0) {
-            memcpy(pos, item->value(), len*sizeof(BYTE));
-            advancePos(pos, remaining, len*sizeof(BYTE));
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES Loc") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseFIR(PayloadSpecificFeedbackMessage *report)
+  {
+    typedef PayloadSpecificFeedbackMessage::FIR FIR;
 
-        for (auto *item = chunk->firstTool(); NULL != item; item = item->next())
-        {
-          pos[0] = Chunk::Tool::kItemType;
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
 
-          advancePos(pos, remaining, sizeof(WORD));
+    size_t possibleFIRs = remaining / (sizeof(DWORD)*2);
 
-          if (len > 0) {
-            memcpy(pos, item->value(), len*sizeof(BYTE));
-            advancePos(pos, remaining, len*sizeof(BYTE));
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES Tool") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+    ASSERT(0 != possibleFIRs)
 
-        for (auto *item = chunk->firstNote(); NULL != item; item = item->next())
-        {
-          pos[0] = Chunk::Note::kItemType;
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+    report->mFirstFIR = new (allocateBuffer(internal::alignedSize(sizeof(FIR))*possibleFIRs)) FIR[possibleFIRs];
 
-          advancePos(pos, remaining, sizeof(WORD));
+    while (remaining >= (sizeof(DWORD)*2)) {
+      FIR *fir = &(report->mFirstFIR[report->mFIRCount]);
+      fillCodecControlCommon(report, fir, pos);
 
-          if (len > 0) {
-            memcpy(pos, item->value(), len*sizeof(BYTE));
-            advancePos(pos, remaining, len*sizeof(BYTE));
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES Note") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+      internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-        for (auto *item = chunk->firstPriv(); NULL != item; item = item->next())
-        {
-          pos[0] = Chunk::Priv::kItemType;
-          size_t len1 = (NULL != item->mPrefix ? strlen(item->mPrefix) : 0);
-          size_t len2 = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          size_t len = len1 + len2;
-          if (len > 0) ++len;
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+      ++(report->mFIRCount);
+    }
 
-          advancePos(pos, remaining, sizeof(WORD));
+    ASSERT(possibleFIRs == report->mFIRCount)
 
-          if (len > 0) {
-            pos[0] = static_cast<BYTE>(len1);
-            advancePos(pos, remaining);
-            if (len1 > 0) {
-              memcpy(pos, item->prefix(), len1*sizeof(BYTE));
-              advancePos(pos, remaining, len1*sizeof(BYTE));
-            }
-            if (len2 > 0) {
-              memcpy(pos, item->value(), len2*sizeof(BYTE));
-              advancePos(pos, remaining, len2*sizeof(BYTE));
-            }
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES Priv") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("prefix len", len1) + ZS_PARAM("prefix", (NULL != item->mPrefix ? item->mPrefix : NULL)) + ZS_PARAM("len", len2) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseTSTR(PayloadSpecificFeedbackMessage *report)
+  {
+    typedef PayloadSpecificFeedbackMessage::TSTR TSTR;
 
-        for (auto *item = chunk->firstMid(); NULL != item; item = item->next())
-        {
-          pos[0] = Chunk::Mid::kItemType;
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
 
-          advancePos(pos, remaining, sizeof(WORD));
+    size_t possibleTSTRs = remaining / (sizeof(DWORD)*2);
 
-          if (len > 0) {
-            memcpy(pos, item->value(), len*sizeof(BYTE));
-            advancePos(pos, remaining, len*sizeof(BYTE));
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES Mid report") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+    ASSERT(0 != possibleTSTRs)
 
-        for (auto *item = chunk->firstRid(); NULL != item; item = item->next())
-        {
-          pos[0] = Chunk::Rid::kItemType;
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+    report->mFirstTSTR = new (allocateBuffer(internal::alignedSize(sizeof(TSTR))*possibleTSTRs)) TSTR[possibleTSTRs];
 
-          advancePos(pos, remaining, sizeof(WORD));
+    while (remaining >= (sizeof(DWORD)*2)) {
+      TSTR *tstr = &(report->mFirstTSTR[report->mTSTRCount]);
+      fillCodecControlCommon(report, tstr, pos);
 
-          if (len > 0) {
-            memcpy(pos, item->value(), len*sizeof(BYTE));
-            advancePos(pos, remaining, len*sizeof(BYTE));
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES Rid report") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+      tstr->mControlSpecific = RTCP_GET_BITS(tstr->mReserved, 0x1F, 0);
+      tstr->mReserved = RTCP_GET_BITS(tstr->mReserved, 0x7FFFF, 5);
 
-        for (auto *item = chunk->firstUnknown(); NULL != item; item = item->next())
-        {
-          pos[0] = item->type();
-          size_t len = (NULL != item->mValue ? strlen(item->mValue) : 0);
-          pos[1] = static_cast<BYTE>(len);
-          ASSERT(throwIfGreaterThanBitsAllow(len, 8))
+      internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-          advancePos(pos, remaining, sizeof(WORD));
+      ++(report->mTSTRCount);
+    }
 
-          if (len > 0) {
-            memcpy(pos, item->value(), len*sizeof(BYTE));
-            advancePos(pos, remaining, len*sizeof(BYTE));
-          }
-          ZS_LOG_INSANE(packet_slog("writing SDES Unknown") + ZS_PARAM("chunk", chunkCount) + ZS_PARAM("len", len) + ZS_PARAM("type", item->mType) + ZS_PARAM("value", (NULL != item->mValue ? item->mValue : NULL)))
-        }
+    ASSERT(possibleTSTRs == report->mTSTRCount)
+      
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseTSTN(PayloadSpecificFeedbackMessage *report)
+  {
+    typedef PayloadSpecificFeedbackMessage::TSTN TSTN;
 
-        BYTE *endPos = pos;
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
 
-        PTRNUMBER diff = reinterpret_cast<PTRNUMBER>(endPos) - reinterpret_cast<PTRNUMBER>(startPos);
-        auto modulas = (diff % sizeof(DWORD));
-        if (0 != modulas) {
-          advancePos(pos, remaining, sizeof(DWORD)-modulas);
-        }
+    size_t possibleTSTNs = remaining / (sizeof(DWORD)*2);
 
-        if ((0 == diff) ||
-            (0 == modulas)) {
-          // write "empty" chunk
-          RTPUtils::setBE32(pos, 0);
-          advancePos(pos, remaining, sizeof(DWORD));
-        }
-      }
+    ASSERT(0 != possibleTSTNs)
 
-      throwIfGreaterThanBitsAllow(chunkCount, 5);
-    }
-    
-    //-------------------------------------------------------------------------
-    static void writePacketBye(const RTCPPacket::Bye *report, BYTE * &pos, size_t &remaining)
-    {
-      typedef RTCPPacket::Bye Bye;
-      pos[1] = Bye::kPayloadType;
+    report->mFirstTSTN = new (allocateBuffer(internal::alignedSize(sizeof(TSTN))*possibleTSTNs)) TSTN[possibleTSTNs];
 
-      advancePos(pos, remaining, sizeof(DWORD));
+    while (remaining >= (sizeof(DWORD)*2)) {
+      TSTN *tstn = &(report->mFirstTSTN[report->mTSTNCount]);
+      fillCodecControlCommon(report, tstn, pos);
 
-      for (size_t index = 0; index < report->sc(); ++index)
-      {
-        RTPUtils::setBE32(pos, report->ssrc(index));
-        advancePos(pos, remaining, sizeof(DWORD));
-      }
+      tstn->mControlSpecific = RTCP_GET_BITS(tstn->mReserved, 0x1F, 0);
+      tstn->mReserved = RTCP_GET_BITS(tstn->mReserved, 0x7FFFF, 5);
 
-      if (NULL != report->reasonForLeaving()) {
-        size_t len = strlen(report->reasonForLeaving());
-        if (len > 0) {
-          pos[0] = static_cast<BYTE>(len);
-          memcpy(&(pos[1]), report->reasonForLeaving(), len*sizeof(BYTE));
-          advancePos(pos, remaining, (len*sizeof(BYTE))+sizeof(BYTE));
-        }
-      }
+      internal::advancePos(pos, remaining, sizeof(DWORD)*2);
+
+      ++(report->mTSTNCount);
     }
 
-    //-------------------------------------------------------------------------
-    static void writePacketApp(const RTCPPacket::App *report, BYTE * &pos, size_t &remaining)
+    ASSERT(possibleTSTNs == report->mTSTNCount)
+      
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseVBCM(PayloadSpecificFeedbackMessage *report)
+  {
+    typedef PayloadSpecificFeedbackMessage::VBCM VBCM;
+
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
+
+    size_t possibleVBCMs = 0;
+
+    // first count the VBCM blocks
     {
-      typedef RTCPPacket::App App;
-      pos[1] = App::kPayloadType;
+      while (remaining >= (sizeof(DWORD)*2)) {
+        ++possibleVBCMs;
 
-      RTPUtils::setBE32(&(pos[4]), report->ssrc());
-      memcpy(&(pos[8]), report->name(), sizeof(DWORD));
+        size_t length = UseRTPUtils::getBE16(&(pos[6]));
+        size_t modulas = length % sizeof(DWORD);
+        size_t padding = ((0 != modulas) ? (sizeof(DWORD)-modulas) : 0);
 
-      advancePos(pos, remaining, sizeof(DWORD)*3);
+        internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-      size_t dataSize = report->dataSize();
-      if (0 != dataSize) {
-        memcpy(pos, report->data(), dataSize);
-        advancePos(pos, remaining, dataSize);
-      }
-    }
+        ASSERT(remaining >= length)
 
-    //-------------------------------------------------------------------------
-    static void writePacketTransportLayerFeedbackMessage(const RTCPPacket::TransportLayerFeedbackMessage *report, BYTE * &pos, size_t &remaining)
-    {
-      typedef RTCPPacket::TransportLayerFeedbackMessage TransportLayerFeedbackMessage;
-      typedef RTCPPacket::TransportLayerFeedbackMessage::GenericNACK GenericNACK;
-      typedef RTCPPacket::TransportLayerFeedbackMessage::TMMBR TMMBR;
-      typedef RTCPPacket::TransportLayerFeedbackMessage::TMMBN TMMBN;
+        size_t skipLength = (((length + padding) > remaining) ? remaining : (length + padding));
+
+        internal::advancePos(pos, remaining, skipLength);
+      }
+      ASSERT(0 != possibleVBCMs);
+    }
 
-      pos[1] = TransportLayerFeedbackMessage::kPayloadType;
+    pos = report->fci();
+    remaining = report->fciSize();
 
-      RTPUtils::setBE32(&(pos[4]), report->ssrcOfPacketSender());
-      RTPUtils::setBE32(&(pos[8]), report->ssrcOfMediaSource());
+    {
+      ASSERT(0 != possibleVBCMs);
 
-      advancePos(pos, remaining, sizeof(DWORD)*3);
+      report->mFirstVBCM = new (allocateBuffer(internal::alignedSize(sizeof(VBCM))*possibleVBCMs)) VBCM[possibleVBCMs];
 
-      switch (report->fmt()) {
-        case GenericNACK::kFmt:
-        {
-          auto count = report->genericNACKCount();
+      while (remaining >= (sizeof(DWORD)*2)) {
+        VBCM *vcbm = &(report->mFirstVBCM[report->mVBCMCount]);
+        fillCodecControlCommon(report, vcbm, pos);
 
-          for (size_t index = 0; index < count; ++index)
-          {
-            auto item = report->genericNACKAtIndex(index);
-            RTPUtils::setBE16(&(pos[0]), item->pid());
-            RTPUtils::setBE16(&(pos[2]), item->blp());
-            advancePos(pos, remaining, sizeof(DWORD));
-          }
-          break;
-        }
-        case TMMBR::kFmt:
-        {
-          auto count = report->tmmbrCount();
+        // move reserved to control specific
+        vcbm->mControlSpecific = vcbm->mReserved;
+        vcbm->mReserved = 0;
 
-          for (size_t index = 0; index < count; ++index)
-          {
-            auto item = report->tmmbrAtIndex(index);
-            RTPUtils::setBE32(&(pos[0]), item->ssrc());
+        size_t length = UseRTPUtils::getBE16(&(pos[6]));
+        size_t modulas = length % sizeof(DWORD);
+        size_t padding = ((0 != modulas) ? (sizeof(DWORD)-modulas) : 0);
 
-            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(item->mxTBRExp()), 0x3F, 26) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(item->mxTBRMantissa()), 0x1FFFF, 9) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(item->measuredOverhead()), 0x1FF, 0);
+        internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-            RTPUtils::setBE32(&(pos[4]), merged);
+        ASSERT(remaining >= length)
 
-            advancePos(pos, remaining, sizeof(DWORD)*2);
-          }
-          break;
+        if (length > 0) {
+          vcbm->mVBCMOctetString = pos;
         }
-        case TMMBN::kFmt:
-        {
-          auto count = report->tmmbnCount();
-
-          for (size_t index = 0; index < count; ++index)
-          {
-            auto item = report->tmmbnAtIndex(index);
-            RTPUtils::setBE32(&(pos[0]), item->ssrc());
 
-            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(item->mxTBRExp()), 0x3F, 26) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(item->mxTBRMantissa()), 0x1FFFF, 9) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(item->measuredOverhead()), 0x1FF, 0);
+        size_t skipLength = (((length + padding) > remaining) ? remaining : (length + padding));
 
-            RTPUtils::setBE32(&(pos[4]), merged);
+        internal::advancePos(pos, remaining, skipLength);
 
-            advancePos(pos, remaining, sizeof(DWORD)*2);
-          }
-          break;
-        }
-        default:
-        {
-          auto fciSize = report->fciSize();
-          if (0 != fciSize) {
-            memcpy(pos, report->fci(), report->fciSize());
-            advancePos(pos, remaining, report->fciSize());
-          }
-          break;
-        }
+        ++(report->mVBCMCount);
       }
 
-      ZS_LOG_INSANE(packet_slog("writing transport layer feedback message") + ZS_PARAM("fmt", report->fmtToString()) + ZS_PARAM("fmt (number)", report->reportSpecific()))
+      ASSERT(possibleVBCMs == report->mVBCMCount);
+    }
+    return true;
+  }
+
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseAFB(PayloadSpecificFeedbackMessage *report)
+  {
+    //typedef PayloadSpecificFeedbackMessage::AFB AFB;
+
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
+
+    if (remaining > 0) {
+      report->mAFB.mData = pos;
+      report->mAFB.mDataSize = remaining;
     }
+    return true;
+  }
     
-    //-------------------------------------------------------------------------
-    static void writePacketPayloadSpecificFeedbackMessage(const RTCPPacket::PayloadSpecificFeedbackMessage *report, BYTE * &pos, size_t &remaining)
-    {
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage PayloadSpecificFeedbackMessage;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::PLI PLI;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::SLI SLI;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::RPSI RPSI;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::FIR FIR;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::TSTR TSTR;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::TSTN TSTN;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::VBCM VBCM;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::AFB AFB;
-      typedef RTCPPacket::PayloadSpecificFeedbackMessage::REMB REMB;
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseREMB(PayloadSpecificFeedbackMessage *report)
+  {
+    //typedef PayloadSpecificFeedbackMessage::REMB REMB;
 
-      pos[1] = PayloadSpecificFeedbackMessage::kPayloadType;
+    if (!parseAFB(report)) return false;
 
-      RTPUtils::setBE32(&(pos[4]), report->ssrcOfPacketSender());
-      RTPUtils::setBE32(&(pos[8]), report->ssrcOfMediaSource());
+    const BYTE *pos = report->fci();
+    size_t remaining = report->fciSize();
 
-      advancePos(pos, remaining, sizeof(DWORD)*3);
+    report->mHasREMB = true;
 
-      switch (report->fmt()) {
-        case PLI::kFmt:
-        {
-          break;
-        }
-        case SLI::kFmt:
-        {
-          auto count = report->sliCount();
+    {
+      ASSERT(remaining >= sizeof(DWORD) * 3);
 
-          for (size_t index = 0; index < count; ++index)
-          {
-            auto item = report->sliAtIndex(index);
+      report->mREMB.mNumSSRC = pos[4];
+      report->mREMB.mBRExp = RTCP_GET_BITS(pos[5], 0x3F, 2);
+      report->mREMB.mBRMantissa = RTCP_GET_BITS(UseRTPUtils::getBE32(&(pos[4])), 0x3FFFF, 0);
 
-            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(item->first()), 0x1FFF, 19) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(item->number()), 0x1FFF, 6) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(item->pictureID()), 0x3F, 0);
+      size_t possibleSSRCs = (remaining - sizeof(DWORD)*2) / (sizeof(DWORD));
 
-            RTPUtils::setBE32(&(pos[0]), merged);
-            advancePos(pos, remaining, sizeof(DWORD));
-          }
-          break;
-        }
-        case RPSI::kFmt:
-        {
-          auto rpsi = report->rpsi();
+      internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-          pos[1] = RTCP_PACK_BITS(static_cast<BYTE>(rpsi->zeroBit()), 0x1, 7) |
-                   RTCP_PACK_BITS(static_cast<BYTE>(rpsi->payloadType()), 0x7F, 0);
+      report->mREMB.mSSRCs = new (allocateBuffer(internal::alignedSize(sizeof(DWORD))*possibleSSRCs)) DWORD[possibleSSRCs];
 
-          auto totalBits = static_cast<size_t>(rpsi->nativeRPSIBitStringSizeInBits());
+      size_t count = 0;
+      while ((possibleSSRCs > 0) &&
+              (count < report->mREMB.numSSRC()) &&
+              (remaining >= sizeof(DWORD)))
+      {
+        report->mREMB.mSSRCs[count] = UseRTPUtils::getBE32(pos);
+        internal::advancePos(pos, remaining, sizeof(DWORD));
+        --possibleSSRCs;
+        ++count;
+      }
 
-          size_t byteModulas = (totalBits%8);
+      if (count != report->mREMB.numSSRC()) goto illegal_remaining;
+      return true;
+    }
 
-          size_t totalBytes = (totalBits/8) + ((0 != byteModulas) ? 1 : 0);
-          if (0 != totalBytes) {
-            memcpy(&(pos[2]), rpsi->nativeRPSIBitString(), totalBytes);
-            if (0 != byteModulas) {
-              BYTE &by = (pos[2+totalBytes-1]);
-              by = by & static_cast<BYTE>(((1 << byteModulas)-1) << (8-byteModulas));
-            }
-          }
+  illegal_remaining:
+    {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed REMB payload specific feedback message",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(report->fci()))
+      );
+    }
+    return false;
+  }
 
-          size_t totalSizeInBits = (sizeof(WORD)*8)+(totalBits);
-          auto boundaryModulas = totalSizeInBits % (sizeof(DWORD)*8);
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseUnknown(PayloadSpecificFeedbackMessage *report)
+  {
+    report->mUnknown = report;
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseCommonRange(
+                                    XR *xr,
+                                    XR::ReportBlockRange *reportBlock
+                                    )
+  {
+    const BYTE *pos = reportBlock->typeSpecificContents();
+    size_t remaining = reportBlock->typeSpecificContentSize();
 
-          if (0 != boundaryModulas) {
-            pos[0] = static_cast<BYTE>((sizeof(DWORD)*8)-boundaryModulas);
-          } else {
-            pos[0] = 0;
-          }
+    {
+      if (remaining < (sizeof(DWORD)*2)) goto illegal_remaining;
 
-          advancePos(pos, remaining, sizeof(WORD)+(sizeof(BYTE)*totalBytes));
-          break;
-        }
-        case FIR::kFmt:
-        {
-          auto count = report->firCount();
+      reportBlock->mSSRCOfSource = UseRTPUtils::getBE32(&(pos[0]));
+      reportBlock->mBeginSeq = UseRTPUtils::getBE16(&(pos[4]));
+      reportBlock->mEndSeq = UseRTPUtils::getBE16(&(pos[6]));
 
-          for (size_t index = 0; index < count; ++index)
-          {
-            auto item = report->firAtIndex(index);
-            RTPUtils::setBE32(&(pos[0]), item->ssrc());
-            RTPUtils::setBE32(&(pos[4]), item->reserved());
-            pos[4] = item->seqNr();
-            advancePos(pos, remaining, sizeof(DWORD)*2);
-          }
-          break;
-        }
-        case TSTR::kFmt:
-        {
-          auto count = report->tstrCount();
+      return true;
+    }
 
-          for (size_t index = 0; index < count; ++index)
-          {
-            auto item = report->tstrAtIndex(index);
-            RTPUtils::setBE32(&(pos[0]), item->ssrc());
+  illegal_remaining:
+    {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed report block range",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, (reinterpret_cast<PTRNUMBER>(pos) - reinterpret_cast<PTRNUMBER>(reportBlock->typeSpecificContents()))
+      );
+    }
+    return false;
+  }
 
-            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(item->seqNr()), 0xFF, 24) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(item->reserved()), 0x7FFFF, 5) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(item->index()), 0x1F, 0);
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parseCommonRLE(
+                                  XR *xr,
+                                  XR::RLEReportBlock *reportBlock
+                                  )
+  {
+    const BYTE *pos = reportBlock->typeSpecificContents();
+    size_t remaining = reportBlock->typeSpecificContentSize();
 
-            RTPUtils::setBE32(&(pos[4]), merged);
-            advancePos(pos, remaining, sizeof(DWORD)*2);
-          }
-          break;
-        }
-        case TSTN::kFmt:
-        {
-          auto count = report->tstnCount();
+    if (!parseCommonRange(xr, reportBlock)) return false;
 
-          for (size_t index = 0; index < count; ++index)
-          {
-            auto item = report->tstnAtIndex(index);
-            RTPUtils::setBE32(&(pos[0]), item->ssrc());
+    internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(item->seqNr()), 0xFF, 24) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(item->reserved()), 0x7FFFF, 5) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(item->index()), 0x1F, 0);
+    size_t possibleRLEsCount = (remaining / sizeof(WORD));
 
-            RTPUtils::setBE32(&(pos[4]), merged);
-            advancePos(pos, remaining, sizeof(DWORD)*2);
-          }
-          break;
-        }
-        case VBCM::kFmt:
-        {
-          auto count = report->vbcmCount();
+    if (0 == possibleRLEsCount) return true;
 
-          for (size_t index = 0; index < count; ++index)
-          {
-            auto item = report->vbcmAtIndex(index);
+    reportBlock->mChunks = new (allocateBuffer(internal::alignedSize(sizeof(XR::RLEChunk)*possibleRLEsCount))) XR::RLEChunk[possibleRLEsCount];
 
-            RTPUtils::setBE32(&(pos[0]), item->ssrc());
+    while (remaining >= sizeof(WORD))
+    {
+      XR::RLEChunk value = UseRTPUtils::getBE16(pos);
+      internal::advancePos(pos, remaining, sizeof(WORD));
 
-            pos[4] = item->seqNr();
-            pos[5] = RTCP_PACK_BITS(static_cast<BYTE>(item->zeroBit()), 0x1, 7) |
-                     RTCP_PACK_BITS(static_cast<BYTE>(item->payloadType()), 0x7F, 0);
+      if (0 == value) break;
+      reportBlock->mChunks[reportBlock->mChunkCount] = value;
+      ++(reportBlock->mChunkCount);
+    }
 
-            auto size = item->vbcmOctetStringSize();
-            if (0 != size) {
-              RTPUtils::setBE16(&(pos[6]), static_cast<WORD>(size));
-              memcpy(&(pos[8]), item->vbcmOctetString(), size*sizeof(BYTE));
-            }
+    if (0 == reportBlock->mChunkCount) {
+      reportBlock->mChunks = NULL;
+    }
 
-            advancePos(pos, remaining, boundarySize((sizeof(DWORD)*2)+(size*sizeof(BYTE))));
-          }
-          break;
-        }
-        case AFB::kFmt:
-        {
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(
+                          XR *xr,
+                          XR::LossRLEReportBlock *reportBlock
+                          )
+  {
+    return parseCommonRLE(xr, reportBlock);
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(
+                          XR *xr,
+                          XR::DuplicateRLEReportBlock *reportBlock
+                          )
+  {
+    return parseCommonRLE(xr, reportBlock);
+  }
 
-          auto remb = report->remb();
-          if (NULL == remb) {
-            auto afb = report->afb();
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(
+                          XR *xr,
+                          XR::PacketReceiptTimesReportBlock *reportBlock
+                          )
+  {
+    if (!parseCommonRange(xr, reportBlock)) return false;
 
-            size_t size = afb->dataSize();
-            if (0 != size) {
-              memcpy(pos, afb->data(), size*sizeof(BYTE));
-              advancePos(pos, remaining, boundarySize(size*sizeof(BYTE)));
-            }
-          } else {
-            memcpy(pos, "REMB", sizeof(DWORD));
+    const BYTE *pos = reportBlock->typeSpecificContents();
+    size_t remaining = reportBlock->typeSpecificContentSize();
 
-            DWORD merged = RTCP_PACK_BITS(static_cast<DWORD>(remb->brExp()), 0x3F, 18) |
-                           RTCP_PACK_BITS(static_cast<DWORD>(remb->brMantissa()), 0x3FFFF, 0);
-            RTPUtils::setBE32(&(pos[4]), merged);
-            pos[4] = static_cast<BYTE>(remb->numSSRC());
-            advancePos(pos, remaining, sizeof(DWORD)*2);
+    internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-            auto count = remb->numSSRC();
-            for (size_t index = 0; index < count; ++index)
-            {
-              auto ssrc = remb->ssrcAtIndex(index);
-              RTPUtils::setBE32(pos, ssrc);
-              advancePos(pos, remaining, sizeof(DWORD));
-            }
-          }
-          break;
-        }
-        default:
-        {
-          auto fciSize = report->fciSize();
-          if (0 != fciSize) {
-            memcpy(pos, report->fci(), fciSize);
-            advancePos(pos, remaining, fciSize);
-          }
-          break;
-        }
-      }
-      ZS_LOG_INSANE(packet_slog("writing payload specific feedback message") + ZS_PARAM("fmt", report->fmtToString()) + ZS_PARAM("fmt (number)", report->reportSpecific()))
+    size_t possibleTimes = remaining / sizeof(DWORD);
+
+    if (0 == possibleTimes) return true;
+
+    reportBlock->mReceiptTimes = new (allocateBuffer(internal::alignedSize(sizeof(DWORD))*possibleTimes)) DWORD[possibleTimes];
+
+    while (remaining >= sizeof(DWORD)) {
+      reportBlock->mReceiptTimes[reportBlock->mReceiptTimeCount] = UseRTPUtils::getBE32(pos);
+      internal::advancePos(pos, remaining, sizeof(DWORD));
+      ++(reportBlock->mReceiptTimeCount);
     }
 
-    //-------------------------------------------------------------------------
-    static void writePacketXR(const RTCPPacket::XR *report, BYTE * &pos, size_t &remaining)
-    {
-      typedef RTCPPacket::XR XR;
-      typedef RTCPPacket::XR::ReportBlock ReportBlock;
-      typedef RTCPPacket::XR::LossRLEReportBlock LossRLEReportBlock;
-      typedef RTCPPacket::XR::DuplicateRLEReportBlock DuplicateRLEReportBlock;
-      typedef RTCPPacket::XR::PacketReceiptTimesReportBlock PacketReceiptTimesReportBlock;
-      typedef RTCPPacket::XR::ReceiverReferenceTimeReportBlock ReceiverReferenceTimeReportBlock;
-      typedef RTCPPacket::XR::DLRRReportBlock DLRRReportBlock;
-      typedef RTCPPacket::XR::StatisticsSummaryReportBlock StatisticsSummaryReportBlock;
-      typedef RTCPPacket::XR::VoIPMetricsReportBlock VoIPMetricsReportBlock;
-      typedef RTCPPacket::XR::UnknownReportBlock UnknownReportBlock;
-      typedef RTCPPacket::XR::RLEChunk RLEChunk;
+    return true;
+  }
+
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(
+                          XR *xr,
+                          XR::ReceiverReferenceTimeReportBlock *reportBlock
+                          )
+  {
+    const BYTE *pos = reportBlock->typeSpecificContents();
+    size_t remaining = reportBlock->typeSpecificContentSize();
+
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed receiver reference time report block",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-      pos[1] = XR::kPayloadType;
-      RTPUtils::setBE32(&(pos[4]), report->mSSRC);
+    reportBlock->mNTPTimestampMS = UseRTPUtils::getBE32(&(pos[0]));
+    reportBlock->mNTPTimestampLS = UseRTPUtils::getBE32(&(pos[4]));
 
-      advancePos(pos, remaining, sizeof(DWORD)*2);
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(
+                          XR *xr,
+                          XR::DLRRReportBlock *reportBlock
+                          )
+  {
+    const BYTE *pos = reportBlock->typeSpecificContents();
+    size_t remaining = reportBlock->typeSpecificContentSize();
 
-      for (const ReportBlock *reportBlock = report->firstReportBlock(); NULL != reportBlock; reportBlock = reportBlock->next())
-      {
-        BYTE *blockStart = pos;
+    size_t possibleSubBlockCount = remaining / (sizeof(DWORD)*3);
 
-        pos[0] = reportBlock->blockType();
-        pos[1] = reportBlock->typeSpecific();
+    if (0 == possibleSubBlockCount) return true;
 
-        advancePos(pos, remaining, sizeof(DWORD));
+    if (remaining < (sizeof(DWORD)*2)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed dlr report block",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-        switch (reportBlock->mBlockType) {
-          case LossRLEReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const LossRLEReportBlock *>(reportBlock);
+    reportBlock->mSubBlocks = new (allocateBuffer(internal::alignedSize(sizeof(XR::DLRRReportBlock::SubBlock))*possibleSubBlockCount)) XR::DLRRReportBlock::SubBlock[possibleSubBlockCount];
 
-            RTPUtils::setBE32(&(pos[0]), block->ssrcOfSource());
-            RTPUtils::setBE16(&(pos[4]), block->beginSeq());
-            RTPUtils::setBE16(&(pos[6]), block->endSeq());
+    while (remaining >= (sizeof(DWORD)*3))
+    {
+      auto subBlock = &(reportBlock->mSubBlocks[reportBlock->mSubBlockCount]);
 
-            advancePos(pos, remaining, sizeof(DWORD)*2);
+      subBlock->mSSRC = UseRTPUtils::getBE32(&(pos[0]));
+      subBlock->mLRR = UseRTPUtils::getBE32(&(pos[4]));
+      subBlock->mDLRR = UseRTPUtils::getBE32(&(pos[8]));
 
-            size_t chunkCount = block->chunkCount();
-            for (size_t index = 0; index < chunkCount; ++index)
-            {
-              RLEChunk chunk = block->chunkAtIndex(index);
-              RTPUtils::setBE16(pos, chunk);
-              advancePos(pos, remaining, sizeof(WORD));
-            }
-            break;
-          }
-          case DuplicateRLEReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const DuplicateRLEReportBlock *>(reportBlock);
+      internal::advancePos(pos, remaining, sizeof(DWORD)*3);
 
-            RTPUtils::setBE32(&(pos[0]), block->ssrcOfSource());
-            RTPUtils::setBE16(&(pos[4]), block->beginSeq());
-            RTPUtils::setBE16(&(pos[6]), block->endSeq());
+      ++(reportBlock->mSubBlockCount);
+    }
 
-            advancePos(pos, remaining, sizeof(DWORD)*2);
+    ASSERT(reportBlock->mSubBlockCount == possibleSubBlockCount)
 
-            size_t count = block->chunkCount();
-            for (size_t index = 0; index < count; ++index)
-            {
-              RLEChunk chunk = block->chunkAtIndex(index);
-              RTPUtils::setBE16(pos, chunk);
-              advancePos(pos, remaining, sizeof(WORD));
-            }
-            break;
-          }
-          case PacketReceiptTimesReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const PacketReceiptTimesReportBlock *>(reportBlock);
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(
+                          XR *xr,
+                          XR::StatisticsSummaryReportBlock *reportBlock
+                          )
+  {
+    const BYTE *pos = reportBlock->typeSpecificContents();
+    size_t remaining = reportBlock->typeSpecificContentSize();
+
+    parseCommonRange(xr, reportBlock);
+
+    if (remaining < (sizeof(DWORD)*9)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed statistics summary report block",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-            RTPUtils::setBE32(&(pos[0]), block->ssrcOfSource());
-            RTPUtils::setBE16(&(pos[4]), block->beginSeq());
-            RTPUtils::setBE16(&(pos[6]), block->endSeq());
+    internal::advancePos(pos, remaining, sizeof(DWORD)*2);
 
-            advancePos(pos, remaining, sizeof(DWORD)*2);
+    reportBlock->mLostPackets = UseRTPUtils::getBE32(&(pos[0]));
+    reportBlock->mDupPackets = UseRTPUtils::getBE32(&(pos[4]));
+    reportBlock->mMinJitter = UseRTPUtils::getBE32(&(pos[8]));
+    reportBlock->mMaxJitter = UseRTPUtils::getBE32(&(pos[12]));
+    reportBlock->mMeanJitter = UseRTPUtils::getBE32(&(pos[16]));
+    reportBlock->mDevJitter = UseRTPUtils::getBE32(&(pos[20]));
 
-            size_t count = block->receiptTimeCount();
-            for (size_t index = 0; index < count; ++index)
-            {
-              DWORD receiptTime = block->receiptTimeAtIndex(index);
-              RTPUtils::setBE32(pos, receiptTime);
-              advancePos(pos, remaining, sizeof(DWORD));
-            }
-            break;
-          }
-          case ReceiverReferenceTimeReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const ReceiverReferenceTimeReportBlock *>(reportBlock);
-            RTPUtils::setBE32(&(pos[0]), block->ntpTimestampMS());
-            RTPUtils::setBE32(&(pos[4]), block->ntpTimestampLS());
-            advancePos(pos, remaining, sizeof(DWORD)*2);
-            break;
-          }
-          case DLRRReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const DLRRReportBlock *>(reportBlock);
+    reportBlock->mMinTTLOrHL = pos[24];
+    reportBlock->mMaxTTLOrHL = pos[25];
+    reportBlock->mMeanTTLOrHL = pos[26];
+    reportBlock->mDevTTLOrHL = pos[27];
 
-            size_t count = block->subBlockCount();
-            for (size_t index = 0; index < count; ++index)
-            {
-              DLRRReportBlock::SubBlock *subBlock = block->subBlockAtIndex(index);
-              RTPUtils::setBE32(&(pos[0]), subBlock->ssrc());
-              RTPUtils::setBE32(&(pos[4]), subBlock->lrr());
-              RTPUtils::setBE32(&(pos[8]), subBlock->dlrr());
-              advancePos(pos, remaining, sizeof(DWORD)*3);
-            }
-            break;
-          }
-          case StatisticsSummaryReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const StatisticsSummaryReportBlock *>(reportBlock);
-            RTPUtils::setBE32(&(pos[0]), block->ssrcOfSource());
-            RTPUtils::setBE16(&(pos[4]), block->beginSeq());
-            RTPUtils::setBE16(&(pos[6]), block->endSeq());
-            RTPUtils::setBE32(&(pos[8]), block->lostPackets());
-            RTPUtils::setBE32(&(pos[12]), block->dupPackets());
-            RTPUtils::setBE32(&(pos[16]), block->minJitter());
-            RTPUtils::setBE32(&(pos[20]), block->maxJitter());
-            RTPUtils::setBE32(&(pos[24]), block->meanJitter());
-            RTPUtils::setBE32(&(pos[28]), block->devJitter());
-            pos[32] = block->mMinTTLOrHL;
-            pos[33] = block->mMaxTTLOrHL;
-            pos[34] = block->mMeanTTLOrHL;
-            pos[35] = block->mDevTTLOrHL;
-            advancePos(pos, remaining, sizeof(DWORD)*9);
-            break;
-          }
-          case VoIPMetricsReportBlock::kBlockType:
-          {
-            auto block = reinterpret_cast<const VoIPMetricsReportBlock *>(reportBlock);
-            RTPUtils::setBE32(&(pos[0]), block->ssrcOfSource());
-            pos[4] = block->lossRate();
-            pos[5] = block->discardRate();
-            pos[6] = block->burstDensity();
-            pos[7] = block->gapDensity();
-            RTPUtils::setBE16(&(pos[8]), block->burstDuration());
-            RTPUtils::setBE16(&(pos[10]), block->gapDuration());
-            RTPUtils::setBE16(&(pos[12]), block->roundTripDelay());
-            RTPUtils::setBE16(&(pos[14]), block->endSystemDelay());
-            pos[16] = block->signalLevel();
-            pos[17] = block->noiseLevel();
-            pos[18] = block->rerl();
-            pos[19] = block->Gmin();
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(
+                          XR *xr,
+                          XR::VoIPMetricsReportBlock *reportBlock
+                          )
+  {
+    const BYTE *pos = reportBlock->typeSpecificContents();
+    size_t remaining = reportBlock->typeSpecificContentSize();
+
+    if (remaining < (sizeof(DWORD)*8)) {
+      ZS_EVENTING_4(x, w, Trace, RTCPPacketParseWarning, ol, RtcpPacket, Parse,
+        string, message, "malformed voip metrics report block",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, remaining, remaining,
+        size_t, length, 0
+      );
+      return false;
+    }
 
-            pos[20] = block->rFactor();
-            pos[21] = block->extRFactor();
-            pos[22] = block->mosLQ();
-            pos[23] = block->mosCQ();
+    reportBlock->mSSRCOfSource = UseRTPUtils::getBE32(&(pos[0]));
+    reportBlock->mLossRate = pos[4];
+    reportBlock->mDiscardRate = pos[5];
+    reportBlock->mBurstDensity = pos[6];
+    reportBlock->mGapDensity = pos[7];
+    reportBlock->mBurstDuration = UseRTPUtils::getBE16(&(pos[8]));
+    reportBlock->mGapDuration = UseRTPUtils::getBE16(&(pos[10]));
+    reportBlock->mRoundTripDelay = UseRTPUtils::getBE16(&(pos[12]));
+    reportBlock->mEndSystemDelay = UseRTPUtils::getBE16(&(pos[14]));
+    reportBlock->mSignalLevel = pos[16];
+    reportBlock->mNoiseLevel = pos[17];
+    reportBlock->mRERL = pos[18];
+    reportBlock->mGmin = pos[19];
+    reportBlock->mRFactor = pos[20];
+    reportBlock->mExtRFactor = pos[21];
+    reportBlock->mMOSLQ = pos[22];
+    reportBlock->mMOSCQ = pos[23];
+    reportBlock->mRXConfig = pos[24];
+    reportBlock->mReservedVoIP = pos[25];
+    reportBlock->mJBNominal = UseRTPUtils::getBE16(&(pos[26]));
+    reportBlock->mJBMaximum = UseRTPUtils::getBE16(&(pos[28]));
+    reportBlock->mJBAbsMax = UseRTPUtils::getBE16(&(pos[30]));
+
+    return true;
+  }
+    
+  //-------------------------------------------------------------------------
+  bool RTCPPacket::parse(
+                          XR *xr,
+                          XR::UnknownReportBlock *reportBlock
+                          )
+  {
+    return true;
+  }
 
-            pos[24] = block->rxConfig();
-            pos[25] = block->mReservedVoIP;
-            RTPUtils::setBE16(&(pos[26]), block->jbNominal());
-            RTPUtils::setBE16(&(pos[28]), block->jbMaximum());
-            RTPUtils::setBE16(&(pos[30]), block->jbAbsMax());
-            advancePos(pos, remaining, sizeof(DWORD)*8);
-            break;
-          }
-          default:
-          {
-            auto block = reinterpret_cast<const UnknownReportBlock *>(reportBlock);
+  //-------------------------------------------------------------------------
+  void *RTCPPacket::allocateBuffer(size_t size)
+  {
+    return internal::allocateBuffer(mAllocationPos, mAllocationSize, size);
+  }
 
-            auto size = block->typeSpecificContentSize();
-            if (0 != size) {
-              memcpy(pos, block->typeSpecificContents(), size*sizeof(BYTE));
-              advancePos(pos, remaining, boundarySize(size*sizeof(BYTE)));
-            }
-          }
-        }
+  //-------------------------------------------------------------------------
+  size_t RTCPPacket::getPacketSize(const Report *first)
+  {
+    size_t result = 0;
 
-        BYTE *blockEnd = pos;
+    const Report *final = NULL;
 
-        size_t diff = static_cast<size_t>(reinterpret_cast<PTRNUMBER>(blockEnd) - reinterpret_cast<PTRNUMBER>(blockStart));
-        auto modulas = diff % sizeof(DWORD);
-        if (0 != modulas) {
-          advancePos(pos, remaining, sizeof(DWORD)-modulas);
-        }
+    for (const Report *report = first; NULL != report; report = report->next())
+    {
+      final = report;
 
-        diff = boundarySize(diff);
-        ZS_LOG_INSANE(packet_slog("writing XR block") + ZS_PARAM("block type", reportBlock->blockTypeToString()) + ZS_PARAM("block type (number)", reportBlock->blockType()) + ZS_PARAM("block size", diff))
+      size_t beforeSize = result;
 
-        RTPUtils::setBE16(&(blockStart[2]), static_cast<WORD>((diff/sizeof(DWORD))-1));
+      switch (report->pt()) {
+        case SenderReport::kPayloadType:
+        {
+          const SenderReport *sr = static_cast<const SenderReport *>(report);
+          result += internal::getPacketSizeSenderReport(sr);
+          break;
+        }
+        case ReceiverReport::kPayloadType:
+        {
+          const ReceiverReport *rr = static_cast<const ReceiverReport *>(report);
+          result += internal::getPacketSizeReceiverReport(rr);
+          break;
+        }
+        case SDES::kPayloadType:
+        {
+          const SDES *sdes = static_cast<const SDES *>(report);
+          result += internal::getPacketSizeSDES(sdes);
+          break;
+        }
+        case Bye::kPayloadType:
+        {
+          const Bye *bye = static_cast<const Bye *>(report);
+          result += internal::getPacketSizeBye(bye);
+          break;
+        }
+        case App::kPayloadType:
+        {
+          const App *app = static_cast<const App *>(report);
+          result += internal::getPacketSizeApp(app);
+          break;
+        }
+        case TransportLayerFeedbackMessage::kPayloadType:
+        {
+          const TransportLayerFeedbackMessage *fm = static_cast<const TransportLayerFeedbackMessage *>(report);
+          result += internal::getPacketSizeTransportLayerFeedbackMessage(fm);
+          break;
+        }
+        case PayloadSpecificFeedbackMessage::kPayloadType:
+        {
+          const PayloadSpecificFeedbackMessage *fm = static_cast<const PayloadSpecificFeedbackMessage *>(report);
+          result += internal::getPacketSizePayloadSpecificFeedbackMessage(fm);
+          break;
+        }
+        case XR::kPayloadType:
+        {
+          const XR *xr = static_cast<const XR *>(report);
+          result += internal::getPacketSizeXR(xr);
+          break;
+        }
+        default:
+        {
+          result += sizeof(DWORD) + internal::boundarySize(report->size());
+          break;
+        }
       }
-    }
 
-    //-------------------------------------------------------------------------
-    static void writePacketUnknown(const RTCPPacket::UnknownReport *report, BYTE * &pos, size_t &remaining)
-    {
-      typedef RTCPPacket::UnknownReport UnknownReport;
-      pos[1] = report->pt();
+      size_t afterSize = result;
 
-      advancePos(pos, remaining, sizeof(DWORD));
-
-      auto size = report->size();
-      if (0 == size) return;
+      ZS_EVENTING_3(x, i, Insane, RTCPPacketGettingReportPacketSize, ol, RtcpPacket, Info,
+        string, payloadType , report->ptToString(),
+        byte, payloadTypeNumber, report->pt(),
+        size_t, size, afterSize - beforeSize
+      );
+    }
 
-      ASSERT(NULL != report->ptr())
+    if (NULL != final) {
+      auto padding = final->padding();
+      if (0 != padding) {
+        result += padding;
+      }
+    }
 
-      memcpy(pos, report->ptr(), size);
+    return internal::boundarySize(result);
+  }
 
-      advancePos(pos, remaining, size);
-    }
+  //-------------------------------------------------------------------------
+  void RTCPPacket::writePacket(const Report *first, BYTE * &pos, size_t &remaining)
+  {
+    ASSERT(sizeof(char) == sizeof(BYTE))
+    ASSERT(NULL != first)
 
-    //-------------------------------------------------------------------------
-    void RTCPPacket::writePacket(const Report *first, BYTE * &pos, size_t &remaining)
+    for (const Report *report = first; NULL != report; report = report->next())
     {
-      ASSERT(sizeof(char) == sizeof(BYTE))
-      ASSERT(NULL != first)
-
-      for (const Report *report = first; NULL != report; report = report->next())
-      {
-        BYTE *startOfReport = pos;
+      BYTE *startOfReport = pos;
 
-        writePacketHeader(report, pos, remaining);
+      internal::writePacketHeader(report, pos, remaining);
 
-        switch (report->pt()) {
-          case SenderReport::kPayloadType:
-          {
-            const SenderReport *sr = static_cast<const SenderReport *>(report);
-            internal::writePacketSenderReport(sr, pos, remaining);
-            break;
-          }
-          case ReceiverReport::kPayloadType:
-          {
-            const ReceiverReport *rr = static_cast<const ReceiverReport *>(report);
-            internal::writePacketReceiverReport(rr, pos, remaining);
-            break;
-          }
-          case SDES::kPayloadType:
-          {
-            const SDES *sdes = static_cast<const SDES *>(report);
-            internal::writePacketSDES(sdes, pos, remaining);
-            break;
-          }
-          case Bye::kPayloadType:
-          {
-            const Bye *bye = static_cast<const Bye *>(report);
-            internal::writePacketBye(bye, pos, remaining);
-            break;
-          }
-          case App::kPayloadType:
-          {
-            const App *app = static_cast<const App *>(report);
-            internal::writePacketApp(app, pos, remaining);
-            break;
-          }
-          case TransportLayerFeedbackMessage::kPayloadType:
-          {
-            const TransportLayerFeedbackMessage *fm = static_cast<const TransportLayerFeedbackMessage *>(report);
-            internal::writePacketTransportLayerFeedbackMessage(fm, pos, remaining);
-            break;
-          }
-          case PayloadSpecificFeedbackMessage::kPayloadType:
-          {
-            const PayloadSpecificFeedbackMessage *fm = static_cast<const PayloadSpecificFeedbackMessage *>(report);
-            internal::writePacketPayloadSpecificFeedbackMessage(fm, pos, remaining);
-            break;
-          }
-          case XR::kPayloadType:
-          {
-            const XR *xr = static_cast<const XR *>(report);
-            internal::writePacketXR(xr, pos, remaining);
-            break;
-          }
-          default:
-          {
-            const UnknownReport *unknown = static_cast<const UnknownReport *>(report);
-            internal::writePacketUnknown(unknown, pos, remaining);
-            break;
-          }
+      switch (report->pt()) {
+        case SenderReport::kPayloadType:
+        {
+          const SenderReport *sr = static_cast<const SenderReport *>(report);
+          internal::writePacketSenderReport(sr, pos, remaining);
+          break;
+        }
+        case ReceiverReport::kPayloadType:
+        {
+          const ReceiverReport *rr = static_cast<const ReceiverReport *>(report);
+          internal::writePacketReceiverReport(rr, pos, remaining);
+          break;
+        }
+        case SDES::kPayloadType:
+        {
+          const SDES *sdes = static_cast<const SDES *>(report);
+          internal::writePacketSDES(sdes, pos, remaining);
+          break;
         }
+        case Bye::kPayloadType:
+        {
+          const Bye *bye = static_cast<const Bye *>(report);
+          internal::writePacketBye(bye, pos, remaining);
+          break;
+        }
+        case App::kPayloadType:
+        {
+          const App *app = static_cast<const App *>(report);
+          internal::writePacketApp(app, pos, remaining);
+          break;
+        }
+        case TransportLayerFeedbackMessage::kPayloadType:
+        {
+          const TransportLayerFeedbackMessage *fm = static_cast<const TransportLayerFeedbackMessage *>(report);
+          internal::writePacketTransportLayerFeedbackMessage(fm, pos, remaining);
+          break;
+        }
+        case PayloadSpecificFeedbackMessage::kPayloadType:
+        {
+          const PayloadSpecificFeedbackMessage *fm = static_cast<const PayloadSpecificFeedbackMessage *>(report);
+          internal::writePacketPayloadSpecificFeedbackMessage(fm, pos, remaining);
+          break;
+        }
+        case XR::kPayloadType:
+        {
+          const XR *xr = static_cast<const XR *>(report);
+          internal::writePacketXR(xr, pos, remaining);
+          break;
+        }
+        default:
+        {
+          const UnknownReport *unknown = static_cast<const UnknownReport *>(report);
+          internal::writePacketUnknown(unknown, pos, remaining);
+          break;
+        }
+      }
 
-        BYTE *endOfReport = pos;
-        size_t diff = static_cast<size_t>(reinterpret_cast<PTRNUMBER>(endOfReport) - reinterpret_cast<PTRNUMBER>(startOfReport));
+      BYTE *endOfReport = pos;
+      size_t diff = static_cast<size_t>(reinterpret_cast<PTRNUMBER>(endOfReport) - reinterpret_cast<PTRNUMBER>(startOfReport));
 
-        size_t modulas = diff % sizeof(DWORD);
-        if (0 != modulas) {
-          advancePos(pos, remaining, sizeof(DWORD)-modulas);
-          diff += (sizeof(DWORD)-modulas);
-        }
+      size_t modulas = diff % sizeof(DWORD);
+      if (0 != modulas) {
+        internal::advancePos(pos, remaining, sizeof(DWORD)-modulas);
+        diff += (sizeof(DWORD)-modulas);
+      }
 
-        if (ZS_IS_LOGGING(Insane)) {
-          ZS_LOG_TRACE(slog("writing report") + ZS_PARAM("pt", report->ptToString()) + ZS_PARAM("pt (number)", report->pt()) + ZS_PARAM("size", diff))
-        }
+      ZS_EVENTING_3(x, i, Insane, RTCPPacketWriteReport, ol, RtcpPacket, Info,
+        string, payloadType, report->ptToString(),
+        byte, payloadTypeNumber, report->pt(),
+        size_t, size, diff
+      );
 
-        size_t padding = 0;
+      size_t padding = 0;
 
-        if (NULL == report->next()) {
-          padding = boundarySize(static_cast<size_t>(report->padding()));
-          if (0 != padding) {
-            if (padding > 1) {
-              advancePos(pos, remaining, (padding-1)*sizeof(BYTE));
-            }
-            pos[0] = static_cast<BYTE>(padding);
-            advancePos(pos, remaining);
+      if (NULL == report->next()) {
+        padding = internal::boundarySize(static_cast<size_t>(report->padding()));
+        if (0 != padding) {
+          if (padding > 1) {
+            internal::advancePos(pos, remaining, (padding-1)*sizeof(BYTE));
           }
+          pos[0] = static_cast<BYTE>(padding);
+          internal::advancePos(pos, remaining);
         }
-
-        size_t headerSize = ((diff+padding)/sizeof(DWORD))-1;
-        ASSERT(throwIfGreaterThanBitsAllow(headerSize, 16))
-
-        RTPUtils::setBE16(&(startOfReport[2]), static_cast<WORD>(headerSize));
       }
 
-      ASSERT(0 == remaining)
+      size_t headerSize = ((diff+padding)/sizeof(DWORD))-1;
+      ASSERT(internal::throwIfGreaterThanBitsAllow(headerSize, 16));
+
+      UseRTPUtils::setBE16(&(startOfReport[2]), static_cast<WORD>(headerSize));
     }
 
+    ASSERT(0 == remaining);
   }
 
 }
diff --git a/ortc/cpp/ortc_RTPSenderChannelMediaBase.cpp b/ortc/cpp/ortc_RTP.cpp
similarity index 54%
rename from ortc/cpp/ortc_RTPSenderChannelMediaBase.cpp
rename to ortc/cpp/ortc_RTP.cpp
index 53f16a86..2e14676b 100644
--- a/ortc/cpp/ortc_RTPSenderChannelMediaBase.cpp
+++ b/ortc/cpp/ortc_RTP.cpp
@@ -29,43 +29,20 @@
  
  */
 
-#include <ortc/internal/ortc_RTPSenderChannelMediaBase.h>
-#include <ortc/internal/ortc_RTPSenderChannelAudio.h>
-#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
-#include <ortc/internal/ortc_RTPSenderChannel.h>
-#include <ortc/internal/ortc_MediaStreamTrack.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
-#include <ortc/internal/ortc_ORTC.h>
+#include <ortc/internal/ortc_IRTP.h>
+#include <ortc/internal/ortc.events.h>
 #include <ortc/internal/platform.h>
 
-//#include <ortc/services/ISettings.h>
-//#include <ortc/services/IHelper.h>
-//#include <ortc/services/IHTTP.h>
-//
-//#include <zsLib/Stringize.h>
-//#include <zsLib/Log.h>
-//#include <zsLib/XML.h>
-//
-//#include <cryptopp/sha.h>
-
-
 #ifdef _DEBUG
 #define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
 #else
 #define ASSERT(x)
 #endif //_DEBUG
 
-
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpsender) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
 
 namespace ortc
 {
-//  ZS_DECLARE_TYPEDEF_PTR(ortc::services::ISettings, UseSettings)
-//  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHelper, UseServicesHelper)
-//  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP)
-//
-//  typedef ortc::services::Hasher<CryptoPP::SHA1> SHA1Hasher;
-
   namespace internal
   {
     //-------------------------------------------------------------------------
@@ -73,32 +50,30 @@ namespace ortc
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark (helpers)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelMediaBaseForRTPSenderChannel
+    #pragma mark IRTP
     #pragma mark
 
     //-------------------------------------------------------------------------
-    ElementPtr IRTPSenderChannelMediaBaseForRTPSenderChannel::toDebug(ForRTPSenderChannelPtr object)
+    const char *IRTP::toString(States state)
     {
-      if (!object) return ElementPtr();
-
-      {
-        auto pThis = RTPSenderChannelAudio::convert(object);
-        if (pThis) return pThis->toDebug();
+      switch (state) {
+        case State_Pending:       return "pending";
+        case State_Ready:         return "ready";
+        case State_ShuttingDown:  return "shutting down";
+        case State_Shutdown:      return "shutdown";
       }
-      {
-        auto pThis = RTPSenderChannelVideo::convert(object);
-        if (pThis) return pThis->toDebug();
+      return "UNDEFINED";    
+    }
+    //-------------------------------------------------------------------------
+    IRTP::States IRTP::toState(const char *stateStr) throw (InvalidParameters)
+    {
+      String str(stateStr);
+      for (IRTP::States index = IRTP::State_First; index <= IRTP::State_Last; index = static_cast<IRTP::States>(static_cast<std::underlying_type<IRTP::States>::type>(index) + 1)) {
+        if (0 == str.compareNoCase(IRTP::toString(index))) return index;
       }
 
-      return ElementPtr();
+      ORTC_THROW_INVALID_PARAMETERS("Invalid parameter value: " + str)
+      return IRTP::State_First;
     }
 
     //-------------------------------------------------------------------------
@@ -106,26 +81,9 @@ namespace ortc
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark IRTPSenderChannelMediaBaseForMediaStreamTrack
+    #pragma mark IRTPForMediaEngine
     #pragma mark
 
-    //-------------------------------------------------------------------------
-    ElementPtr IRTPSenderChannelMediaBaseForMediaStreamTrack::toDebug(ForMediaStreamTrackPtr object)
-    {
-      if (!object) return ElementPtr();
-
-      {
-        auto pThis = RTPSenderChannelAudio::convert(object);
-        if (pThis) return pThis->toDebug();
-      }
-      {
-        auto pThis = RTPSenderChannelVideo::convert(object);
-        if (pThis) return pThis->toDebug();
-      }
-
-      return ElementPtr();
-    }
-
-  } // internal namespace
+  } // namespace internal
 
 }
diff --git a/ortc/cpp/ortc_RTPDecoderAudio.cpp b/ortc/cpp/ortc_RTPDecoderAudio.cpp
new file mode 100644
index 00000000..cb4bc436
--- /dev/null
+++ b/ortc/cpp/ortc_RTPDecoderAudio.cpp
@@ -0,0 +1,614 @@
+/*
+
+ Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_RTPDecoderAudio.h>
+#include <ortc/internal/ortc_MediaEngine.h>
+#include <ortc/internal/ortc_ORTC.h>
+#include <ortc/internal/ortc_StatsReport.h>
+#include <ortc/internal/ortc.events.h>
+#include <ortc/internal/platform.h>
+
+#include <ortc/IStatsReport.h>
+
+#include <ortc/services/IHTTP.h>
+
+#include <zsLib/ISettings.h>
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#endif //__GNUC__
+
+
+#ifdef _DEBUG
+#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
+#else
+#define ASSERT(x)
+#endif //_DEBUG
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+
+  namespace internal
+  {
+    ZS_DECLARE_CLASS_PTR(RTPDecoderAudioSettingsDefaults);
+    ZS_DECLARE_TYPEDEF_PTR(IStatsReportForInternal, UseStatsReport);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudioSettingsDefaults
+    #pragma mark
+
+    class RTPDecoderAudioSettingsDefaults : public ISettingsApplyDefaultsDelegate
+    {
+    public:
+      //-----------------------------------------------------------------------
+      ~RTPDecoderAudioSettingsDefaults()
+      {
+        ISettings::removeDefaults(*this);
+      }
+
+      //-----------------------------------------------------------------------
+      static RTPDecoderAudioSettingsDefaultsPtr singleton()
+      {
+        static SingletonLazySharedPtr<RTPDecoderAudioSettingsDefaults> singleton(create());
+        return singleton.singleton();
+      }
+
+      //-----------------------------------------------------------------------
+      static RTPDecoderAudioSettingsDefaultsPtr create()
+      {
+        auto pThis(make_shared<RTPDecoderAudioSettingsDefaults>());
+        ISettings::installDefaults(pThis);
+        return pThis;
+      }
+
+      //-----------------------------------------------------------------------
+      virtual void notifySettingsApplyDefaults() override
+      {
+      }
+      
+    };
+
+    //-------------------------------------------------------------------------
+    void installRTPDecoderAudioSettingsDefaults()
+    {
+      RTPDecoderAudioSettingsDefaults::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderAudioForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPDecoderAudio::PromiseWithRTPDecoderAudioPtr IRTPDecoderAudio::create(
+                                                                             const Parameters &parameters,
+                                                                             IRTPDecoderDelegatePtr delegate
+                                                                             )
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderAudio, UseEngine);
+      return UseEngine::createRTPDecoderAudio(parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPDecoderAudio
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPDecoderAudioForMediaEngine::ForMediaEnginePtr IRTPDecoderAudioForMediaEngine::create(
+                                                                                             PromiseWithRTPDecoderAudioPtr promise,
+                                                                                             UseMediaEnginePtr mediaEngine,
+                                                                                             ParametersPtr parameters,
+                                                                                             IRTPDecoderDelegatePtr delegate
+                                                                                             )
+    {
+      return internal::IRTPDecoderAudioFactory::singleton().create(promise, mediaEngine, parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    RTPDecoderAudio::RTPDecoderAudio(
+                                     const make_private &,
+                                     IMessageQueuePtr queue,
+                                     PromiseWithRTPDecoderAudioPtr promise,
+                                     UseMediaEnginePtr mediaEngine,
+                                     ParametersPtr parameters,
+                                     IRTPDecoderDelegatePtr delegate
+                                     ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      mediaEngine_(mediaEngine),
+      promise_(promise),
+      parameters_(parameters),
+      notifyDelegate_(delegate_),
+      delegate_(IRTPDecoderDelegateProxy::createWeak(delegate)),
+      traceHelper_(id_)
+    {
+      ZS_EVENTING_1(x, i, Detail, RTPDecoderAudioCreate, ol, MediaEngine, Start, puid, id, id_);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::init()
+    {
+      asyncThisDelegate_ = IRTPDecoderAysncDelegateProxy::createWeak(thisWeak_.lock());
+      AutoRecursiveLock lock(*this);
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPDecoderAudio::~RTPDecoderAudio()
+    {
+      if (isNoop()) return;
+
+      thisWeak_.reset();
+
+      cancel();
+      ZS_EVENTING_1(x, i, Detail, RTPDecoderAudioDestroy, ol, MediaEngine, Stop, puid, id, id_);
+    }
+
+    //-----------------------------------------------------------------------
+    RTPDecoderAudioPtr RTPDecoderAudio::create(
+                                               PromiseWithRTPDecoderAudioPtr promise,
+                                               UseMediaEnginePtr mediaEngine,
+                                               ParametersPtr parameters,
+                                               IRTPDecoderDelegatePtr delegate
+                                               )
+    {
+      auto pThis(make_shared<RTPDecoderAudio>(make_private{}, IORTCForInternal::queueRTP(), promise, mediaEngine, parameters, delegate));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    RTPDecoderAudioPtr RTPDecoderAudio::convert(ForMediaEnginePtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(RTPDecoderAudio, object);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio => IRTP
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::cancel()
+    {
+      ZS_EVENTING_1(x, i, Debug, RTPDecoderAudioCancel, ol, MediaEngine, Cancel, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      innerCancel();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPDecoderAudio::States RTPDecoderAudio::getState() const
+    {
+      AutoRecursiveLock lock(*this);
+      return currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio => IRTPDecoder
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::notifyRTPPacket(
+                                          ImmutableMediaChannelTracePtr trace,
+                                          RTPPacketPtr packet
+                                          )
+    {
+      try {
+        asyncThisDelegate_->onRTPDecoderRTPPacket(trace, packet);
+      } catch (const IRTPDecoderAysncDelegateProxy::Exceptions::DelegateGone &) {
+        // should never happen
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::notifyRTCPPacket(
+                                           ImmutableMediaChannelTracePtr trace,
+                                           RTCPPacketPtr packet
+                                           )
+    {
+      try {
+        asyncThisDelegate_->onRTPDecoderRTCPPacket(trace, packet);
+      } catch (const IRTPDecoderAysncDelegateProxy::Exceptions::DelegateGone &) {
+        // should never happen
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio => IRTPDecoderAudio
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio => IRTPForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, RTPDecoderAudioShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      cancel();
+    }
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio => IRTPDecoderForMediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio => IRTPDecoderAudioForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::onWake()
+    {
+      ZS_EVENTING_1(x, i, Trace, RTPDecoderAudioOnWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio => IPromiseSettledDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::onPromiseSettled(PromisePtr promise)
+    {
+      ZS_EVENTING_2(x, i, Trace, RTPDecoderAudioOnPromiseSettled, ol, MediaEngine, Event, puid, id, id_, puid, promiseId, promise->getID());
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio => IRTPDecoderAysncDelegate
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::onRTPDecoderRTPPacket(
+                                                ImmutableMediaChannelTracePtr trace,
+                                                RTPPacketPtr packet
+                                                )
+    {
+#define TODO 1
+#define TODO 2
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::onRTPDecoderRTCPPacket(
+                                                 ImmutableMediaChannelTracePtr trace,
+                                                 RTCPPacketPtr packet
+                                                 )
+    {
+#define TODO 1
+#define TODO 2
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::innerCancel()
+    {
+      //.......................................................................
+      // try to gracefully shutdown
+
+      if (isShutdown()) return;
+
+      setState(IRTP::State_ShuttingDown);
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+        ZS_EVENTING_2(x, i, Debug, RTPDecoderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "graceful");
+
+        // perform any graceful asynchronous shutdown processes needed and
+        // re-attempt shutdown again later if needed.
+
+        if (!stepShutdownPendingPromise()) return;
+        if (!stepShutdownCoder()) return;
+      }
+
+      //.......................................................................
+      // final cleanup (hard shutdown)
+
+      setState(IRTP::State_Shutdown);
+
+      stepShutdownPendingPromise();
+      stepShutdownCoder();
+
+      auto engine = mediaEngine_.lock();
+      if (engine) {
+        engine->notifyRTPShutdownStateChanged();
+      }
+
+      // make sure to cleanup any final reference to self
+      gracefulShutdownReference_.reset();
+
+      mediaEngine_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPDecoderAudio::stepShutdownPendingPromise()
+    {
+      if (!promise_) {
+        ZS_EVENTING_2(x, i, Debug, RTPDecoderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no pending promise");
+        return true;
+      }
+
+      ZS_EVENTING_2(x, i, Debug, RTPDecoderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "pending promise");
+
+      promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+      promise_.reset();
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPDecoderAudio::stepShutdownCoder()
+    {
+      ZS_EVENTING_2(x, i, Debug, RTPDecoderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "coder");
+
+#define TODO 1
+#define TODO 2
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, RTPDecoderAudioStep, ol, MediaEngine, Step, puid, id, id_);
+
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, RTPDecoderAudioStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      if (!stepSetup()) goto not_ready;
+      if (!stepResolve()) goto not_ready;
+
+      goto ready;
+
+    not_ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, RTPDecoderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "not ready");
+        return;
+      }
+
+    ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, RTPDecoderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "ready");
+        setState(IRTP::State_Ready);
+        return;
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPDecoderAudio::stepSetup()
+    {
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPDecoderAudio::stepResolve()
+    {
+      if (!promise_) {
+        ZS_EVENTING_2(x, i, Trace, RTPDecoderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "promise already resolved");
+        return true;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, RTPDecoderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "resolving promise");
+
+      promise_->resolve(thisWeak_.lock());
+      promise_.reset();
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::setState(States state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, RTPDecoderAudioSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, IRTP::toString(state), string, oldState, IRTP::toString(currentState_));
+
+      currentState_ = state;
+
+      auto pThis = thisWeak_.lock();
+
+      if ((delegate_) &&
+          (pThis)) {
+        try {
+          delegate_->onRTPDecoderStateChanged(thisWeak_.lock(), state);
+        } catch (IRTPDecoderDelegateProxy::Exceptions::DelegateGone &) {
+        }
+      }
+
+//      MediaEnginePtr pThis = mThisWeak.lock();
+//      if (pThis) {
+//        mSubscriptions.delegate()->onMediaEngineStateChanged(pThis, currentState_);
+//      }
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, RTPDecoderAudioSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, RTPDecoderAudioSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderAudio::innerNotifyAudioFrame(
+                                                ImmutableMediaChannelTracePtr trace,
+                                                AudioFramePtr frame
+                                                )
+    {
+      IRTPDecoderDelegatePtr delegate;
+
+      {
+        AutoRecursiveLock lock(*this);
+        delegate = notifyDelegate_.lock();
+      }
+
+      if (!delegate) return;
+
+      delegate->notifyRTPDecoderAudioFrame(traceHelper_.trace(trace), frame);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderAudioFactory
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPDecoderAudioFactory &IRTPDecoderAudioFactory::singleton()
+    {
+      return RTPDecoderAudioFactory::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPDecoderAudioPtr IRTPDecoderAudioFactory::create(
+                                                       PromiseWithRTPDecoderAudioPtr promise,
+                                                       UseMediaEnginePtr mediaEngine,
+                                                       ParametersPtr parameters,
+                                                       IRTPDecoderDelegatePtr delegate
+                                                       )
+    {
+      if (this) {}
+      return internal::RTPDecoderAudio::create(promise, mediaEngine, parameters, delegate);
+    }
+
+  } // internal namespace
+}
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif //__GNUC__
diff --git a/ortc/cpp/ortc_RTPDecoderVideo.cpp b/ortc/cpp/ortc_RTPDecoderVideo.cpp
new file mode 100644
index 00000000..81a1a285
--- /dev/null
+++ b/ortc/cpp/ortc_RTPDecoderVideo.cpp
@@ -0,0 +1,614 @@
+/*
+
+ Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_RTPDecoderVideo.h>
+#include <ortc/internal/ortc_MediaEngine.h>
+#include <ortc/internal/ortc_ORTC.h>
+#include <ortc/internal/ortc_StatsReport.h>
+#include <ortc/internal/ortc.events.h>
+#include <ortc/internal/platform.h>
+
+#include <ortc/IStatsReport.h>
+
+#include <ortc/services/IHTTP.h>
+
+#include <zsLib/ISettings.h>
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#endif //__GNUC__
+
+
+#ifdef _DEBUG
+#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
+#else
+#define ASSERT(x)
+#endif //_DEBUG
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+
+  namespace internal
+  {
+    ZS_DECLARE_CLASS_PTR(RTPDecoderVideoSettingsDefaults);
+    ZS_DECLARE_TYPEDEF_PTR(IStatsReportForInternal, UseStatsReport);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideoSettingsDefaults
+    #pragma mark
+
+    class RTPDecoderVideoSettingsDefaults : public ISettingsApplyDefaultsDelegate
+    {
+    public:
+      //-----------------------------------------------------------------------
+      ~RTPDecoderVideoSettingsDefaults()
+      {
+        ISettings::removeDefaults(*this);
+      }
+
+      //-----------------------------------------------------------------------
+      static RTPDecoderVideoSettingsDefaultsPtr singleton()
+      {
+        static SingletonLazySharedPtr<RTPDecoderVideoSettingsDefaults> singleton(create());
+        return singleton.singleton();
+      }
+
+      //-----------------------------------------------------------------------
+      static RTPDecoderVideoSettingsDefaultsPtr create()
+      {
+        auto pThis(make_shared<RTPDecoderVideoSettingsDefaults>());
+        ISettings::installDefaults(pThis);
+        return pThis;
+      }
+
+      //-----------------------------------------------------------------------
+      virtual void notifySettingsApplyDefaults() override
+      {
+      }
+      
+    };
+
+    //-------------------------------------------------------------------------
+    void installRTPDecoderVideoSettingsDefaults()
+    {
+      RTPDecoderVideoSettingsDefaults::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderVideoForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPDecoderVideo::PromiseWithRTPDecoderVideoPtr IRTPDecoderVideo::create(
+                                                                             const Parameters &parameters,
+                                                                             IRTPDecoderDelegatePtr delegate
+                                                                             )
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderVideo, UseEngine);
+      return UseEngine::createRTPDecoderVideo(parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPDecoderVideo
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPDecoderVideoForMediaEngine::ForMediaEnginePtr IRTPDecoderVideoForMediaEngine::create(
+                                                                                             PromiseWithRTPDecoderVideoPtr promise,
+                                                                                             UseMediaEnginePtr mediaEngine,
+                                                                                             ParametersPtr parameters,
+                                                                                             IRTPDecoderDelegatePtr delegate
+                                                                                             )
+    {
+      return internal::IRTPDecoderVideoFactory::singleton().create(promise, mediaEngine, parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    RTPDecoderVideo::RTPDecoderVideo(
+                                     const make_private &,
+                                     IMessageQueuePtr queue,
+                                     PromiseWithRTPDecoderVideoPtr promise,
+                                     UseMediaEnginePtr mediaEngine,
+                                     ParametersPtr parameters,
+                                     IRTPDecoderDelegatePtr delegate
+                                     ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      mediaEngine_(mediaEngine),
+      promise_(promise),
+      parameters_(parameters),
+      notifyDelegate_(delegate_),
+      delegate_(IRTPDecoderDelegateProxy::createWeak(delegate)),
+      traceHelper_(id_)
+    {
+      ZS_EVENTING_1(x, i, Detail, RTPDecoderVideoCreate, ol, MediaEngine, Start, puid, id, id_);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::init()
+    {
+      asyncThisDelegate_ = IRTPDecoderAysncDelegateProxy::createWeak(thisWeak_.lock());
+      AutoRecursiveLock lock(*this);
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPDecoderVideo::~RTPDecoderVideo()
+    {
+      if (isNoop()) return;
+
+      thisWeak_.reset();
+
+      cancel();
+      ZS_EVENTING_1(x, i, Detail, RTPDecoderVideoDestroy, ol, MediaEngine, Stop, puid, id, id_);
+    }
+
+    //-----------------------------------------------------------------------
+    RTPDecoderVideoPtr RTPDecoderVideo::create(
+                                               PromiseWithRTPDecoderVideoPtr promise,
+                                               UseMediaEnginePtr mediaEngine,
+                                               ParametersPtr parameters,
+                                               IRTPDecoderDelegatePtr delegate
+                                               )
+    {
+      auto pThis(make_shared<RTPDecoderVideo>(make_private{}, IORTCForInternal::queueRTP(), promise, mediaEngine, parameters, delegate));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    RTPDecoderVideoPtr RTPDecoderVideo::convert(ForMediaEnginePtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(RTPDecoderVideo, object);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo => IRTP
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::cancel()
+    {
+      ZS_EVENTING_1(x, i, Debug, RTPDecoderVideoCancel, ol, MediaEngine, Cancel, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      innerCancel();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPDecoderVideo::States RTPDecoderVideo::getState() const
+    {
+      AutoRecursiveLock lock(*this);
+      return currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo => IRTPDecoder
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::notifyRTPPacket(
+                                          ImmutableMediaChannelTracePtr trace,
+                                          RTPPacketPtr packet
+                                          )
+    {
+      try {
+        asyncThisDelegate_->onRTPDecoderRTPPacket(trace, packet);
+      } catch (const IRTPDecoderAysncDelegateProxy::Exceptions::DelegateGone &) {
+        // should never happen
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::notifyRTCPPacket(
+                                           ImmutableMediaChannelTracePtr trace,
+                                           RTCPPacketPtr packet
+                                           )
+    {
+      try {
+        asyncThisDelegate_->onRTPDecoderRTCPPacket(trace, packet);
+      } catch (const IRTPDecoderAysncDelegateProxy::Exceptions::DelegateGone &) {
+        // should never happen
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo => IRTPDecoderVideo
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo => IRTPForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, RTPDecoderVideoShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      cancel();
+    }
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo => IRTPDecoderForMediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo => IRTPDecoderVideoForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::onWake()
+    {
+      ZS_EVENTING_1(x, i, Trace, RTPDecoderVideoOnWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo => IPromiseSettledDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::onPromiseSettled(PromisePtr promise)
+    {
+      ZS_EVENTING_2(x, i, Trace, RTPDecoderVideoOnPromiseSettled, ol, MediaEngine, Event, puid, id, id_, puid, promiseId, promise->getID());
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo => IRTPDecoderAysncDelegate
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::onRTPDecoderRTPPacket(
+                                                ImmutableMediaChannelTracePtr trace,
+                                                RTPPacketPtr packet
+                                                )
+    {
+#define TODO 1
+#define TODO 2
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::onRTPDecoderRTCPPacket(
+                                                 ImmutableMediaChannelTracePtr trace,
+                                                 RTCPPacketPtr packet
+                                                 )
+    {
+#define TODO 1
+#define TODO 2
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::innerCancel()
+    {
+      //.......................................................................
+      // try to gracefully shutdown
+
+      if (isShutdown()) return;
+
+      setState(IRTP::State_ShuttingDown);
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+        ZS_EVENTING_2(x, i, Debug, RTPDecoderVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "graceful");
+
+        // perform any graceful asynchronous shutdown processes needed and
+        // re-attempt shutdown again later if needed.
+
+        if (!stepShutdownPendingPromise()) return;
+        if (!stepShutdownCoder()) return;
+      }
+
+      //.......................................................................
+      // final cleanup (hard shutdown)
+
+      setState(IRTP::State_Shutdown);
+
+      stepShutdownPendingPromise();
+      stepShutdownCoder();
+
+      auto engine = mediaEngine_.lock();
+      if (engine) {
+        engine->notifyRTPShutdownStateChanged();
+      }
+
+      // make sure to cleanup any final reference to self
+      gracefulShutdownReference_.reset();
+
+      mediaEngine_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPDecoderVideo::stepShutdownPendingPromise()
+    {
+      if (!promise_) {
+        ZS_EVENTING_2(x, i, Debug, RTPDecoderVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no pending promise");
+        return true;
+      }
+
+      ZS_EVENTING_2(x, i, Debug, RTPDecoderVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "pending promise");
+
+      promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+      promise_.reset();
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPDecoderVideo::stepShutdownCoder()
+    {
+      ZS_EVENTING_2(x, i, Debug, RTPDecoderVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "coder");
+
+#define TODO 1
+#define TODO 2
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, RTPDecoderVideoStep, ol, MediaEngine, Step, puid, id, id_);
+
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, RTPDecoderVideoStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      if (!stepSetup()) goto not_ready;
+      if (!stepResolve()) goto not_ready;
+
+      goto ready;
+
+    not_ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, RTPDecoderVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "not ready");
+        return;
+      }
+
+    ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, RTPDecoderVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "ready");
+        setState(IRTP::State_Ready);
+        return;
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPDecoderVideo::stepSetup()
+    {
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPDecoderVideo::stepResolve()
+    {
+      if (!promise_) {
+        ZS_EVENTING_2(x, i, Trace, RTPDecoderVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "promise already resolved");
+        return true;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, RTPDecoderVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "resolving promise");
+
+      promise_->resolve(thisWeak_.lock());
+      promise_.reset();
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::setState(States state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, RTPDecoderVideoSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, IRTP::toString(state), string, oldState, IRTP::toString(currentState_));
+
+      currentState_ = state;
+
+      auto pThis = thisWeak_.lock();
+
+      if ((delegate_) &&
+          (pThis)) {
+        try {
+          delegate_->onRTPDecoderStateChanged(thisWeak_.lock(), state);
+        } catch (IRTPDecoderDelegateProxy::Exceptions::DelegateGone &) {
+        }
+      }
+
+//      MediaEnginePtr pThis = mThisWeak.lock();
+//      if (pThis) {
+//        mSubscriptions.delegate()->onMediaEngineStateChanged(pThis, currentState_);
+//      }
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, RTPDecoderVideoSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, RTPDecoderVideoSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPDecoderVideo::innerNotifyVideoFrame(
+                                                ImmutableMediaChannelTracePtr trace,
+                                                VideoFramePtr frame
+                                                )
+    {
+      IRTPDecoderDelegatePtr delegate;
+
+      {
+        AutoRecursiveLock lock(*this);
+        delegate = notifyDelegate_.lock();
+      }
+
+      if (!delegate) return;
+
+      delegate->notifyRTPDecoderVideoFrame(traceHelper_.trace(trace), frame);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderVideoFactory
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPDecoderVideoFactory &IRTPDecoderVideoFactory::singleton()
+    {
+      return RTPDecoderVideoFactory::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPDecoderVideoPtr IRTPDecoderVideoFactory::create(
+                                                       PromiseWithRTPDecoderVideoPtr promise,
+                                                       UseMediaEnginePtr mediaEngine,
+                                                       ParametersPtr parameters,
+                                                       IRTPDecoderDelegatePtr delegate
+                                                       )
+    {
+      if (this) {}
+      return internal::RTPDecoderVideo::create(promise, mediaEngine, parameters, delegate);
+    }
+
+  } // internal namespace
+}
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif //__GNUC__
diff --git a/ortc/cpp/ortc_RTPEncoderAudio.cpp b/ortc/cpp/ortc_RTPEncoderAudio.cpp
new file mode 100644
index 00000000..4d3bce49
--- /dev/null
+++ b/ortc/cpp/ortc_RTPEncoderAudio.cpp
@@ -0,0 +1,609 @@
+/*
+
+ Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_RTPEncoderAudio.h>
+#include <ortc/internal/ortc_MediaEngine.h>
+#include <ortc/internal/ortc_ORTC.h>
+#include <ortc/internal/ortc_StatsReport.h>
+#include <ortc/internal/ortc.events.h>
+#include <ortc/internal/platform.h>
+
+#include <ortc/IStatsReport.h>
+
+#include <ortc/services/IHTTP.h>
+
+#include <zsLib/ISettings.h>
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#endif //__GNUC__
+
+
+#ifdef _DEBUG
+#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
+#else
+#define ASSERT(x)
+#endif //_DEBUG
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+
+  namespace internal
+  {
+    ZS_DECLARE_CLASS_PTR(RTPEncoderAudioSettingsDefaults);
+    ZS_DECLARE_TYPEDEF_PTR(IStatsReportForInternal, UseStatsReport);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudioSettingsDefaults
+    #pragma mark
+
+    class RTPEncoderAudioSettingsDefaults : public ISettingsApplyDefaultsDelegate
+    {
+    public:
+      //-----------------------------------------------------------------------
+      ~RTPEncoderAudioSettingsDefaults()
+      {
+        ISettings::removeDefaults(*this);
+      }
+
+      //-----------------------------------------------------------------------
+      static RTPEncoderAudioSettingsDefaultsPtr singleton()
+      {
+        static SingletonLazySharedPtr<RTPEncoderAudioSettingsDefaults> singleton(create());
+        return singleton.singleton();
+      }
+
+      //-----------------------------------------------------------------------
+      static RTPEncoderAudioSettingsDefaultsPtr create()
+      {
+        auto pThis(make_shared<RTPEncoderAudioSettingsDefaults>());
+        ISettings::installDefaults(pThis);
+        return pThis;
+      }
+
+      //-----------------------------------------------------------------------
+      virtual void notifySettingsApplyDefaults() override
+      {
+      }
+      
+    };
+
+    //-------------------------------------------------------------------------
+    void installRTPEncoderAudioSettingsDefaults()
+    {
+      RTPEncoderAudioSettingsDefaults::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderAudioForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPEncoderAudio::PromiseWithRTPEncoderAudioPtr IRTPEncoderAudio::create(
+                                                                             const Parameters &parameters,
+                                                                             IRTPEncoderDelegatePtr delegate
+                                                                             )
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderAudio, UseEngine);
+      return UseEngine::createRTPEncoderAudio(parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPEncoderAudio
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPEncoderAudioForMediaEngine::ForMediaEnginePtr IRTPEncoderAudioForMediaEngine::create(
+                                                                                             PromiseWithRTPEncoderAudioPtr promise,
+                                                                                             UseMediaEnginePtr mediaEngine,
+                                                                                             ParametersPtr parameters,
+                                                                                             IRTPEncoderDelegatePtr delegate
+                                                                                             )
+    {
+      return internal::IRTPEncoderAudioFactory::singleton().create(promise, mediaEngine, parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    RTPEncoderAudio::RTPEncoderAudio(
+                                     const make_private &,
+                                     IMessageQueuePtr queue,
+                                     PromiseWithRTPEncoderAudioPtr promise,
+                                     UseMediaEnginePtr mediaEngine,
+                                     ParametersPtr parameters,
+                                     IRTPEncoderDelegatePtr delegate
+                                     ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      mediaEngine_(mediaEngine),
+      promise_(promise),
+      parameters_(parameters),
+      notifyDelegate_(delegate_),
+      delegate_(IRTPEncoderDelegateProxy::createWeak(delegate)),
+      traceHelper_(id_)
+    {
+      ZS_EVENTING_1(x, i, Detail, RTPEncoderAudioCreate, ol, MediaEngine, Start, puid, id, id_);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::init()
+    {
+      asyncThisDelegate_ = IRTPEncoderAysncDelegateProxy::createWeak(thisWeak_.lock());
+      AutoRecursiveLock lock(*this);
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPEncoderAudio::~RTPEncoderAudio()
+    {
+      if (isNoop()) return;
+
+      thisWeak_.reset();
+
+      cancel();
+      ZS_EVENTING_1(x, i, Detail, RTPEncoderAudioDestroy, ol, MediaEngine, Stop, puid, id, id_);
+    }
+
+    //-----------------------------------------------------------------------
+    RTPEncoderAudioPtr RTPEncoderAudio::create(
+                                               PromiseWithRTPEncoderAudioPtr promise,
+                                               UseMediaEnginePtr mediaEngine,
+                                               ParametersPtr parameters,
+                                               IRTPEncoderDelegatePtr delegate
+                                               )
+    {
+      auto pThis(make_shared<RTPEncoderAudio>(make_private{}, IORTCForInternal::queueRTP(), promise, mediaEngine, parameters, delegate));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    RTPEncoderAudioPtr RTPEncoderAudio::convert(ForMediaEnginePtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(RTPEncoderAudio, object);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio => IRTP
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::cancel()
+    {
+      ZS_EVENTING_1(x, i, Debug, RTPEncoderAudioCancel, ol, MediaEngine, Cancel, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      innerCancel();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPEncoderAudio::States RTPEncoderAudio::getState() const
+    {
+      AutoRecursiveLock lock(*this);
+      return currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio => IRTPEncoder
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::notifyAudioFrame(
+                                           ImmutableMediaChannelTracePtr trace,
+                                           AudioFramePtr frame
+                                           )
+    {
+      try {
+        asyncThisDelegate_->onRTPEncoderAudioFrame(trace, frame);
+      } catch (const IRTPEncoderAysncDelegateProxy::Exceptions::DelegateGone &) {
+        // should never happen
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio => IRTPEncoderAudio
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio => IRTPForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, RTPEncoderAudioShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      cancel();
+    }
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio => IRTPEncoderForMediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio => IRTPEncoderAudioForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::onWake()
+    {
+      ZS_EVENTING_1(x, i, Trace, RTPEncoderAudioOnWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio => IPromiseSettledDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::onPromiseSettled(PromisePtr promise)
+    {
+      ZS_EVENTING_2(x, i, Trace, RTPEncoderAudioOnPromiseSettled, ol, MediaEngine, Event, puid, id, id_, puid, promiseId, promise->getID());
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio => IRTPEncoderAysncDelegate
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::onRTPEncoderAudioFrame(
+                                                 ImmutableMediaChannelTracePtr trace,
+                                                 AudioFramePtr frame
+                                                 )
+    {
+#define TODO 1
+#define TODO 2
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::innerCancel()
+    {
+      //.......................................................................
+      // try to gracefully shutdown
+
+      if (isShutdown()) return;
+
+      setState(IRTP::State_ShuttingDown);
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+        ZS_EVENTING_2(x, i, Debug, RTPEncoderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "graceful");
+
+        // perform any graceful asynchronous shutdown processes needed and
+        // re-attempt shutdown again later if needed.
+
+        if (!stepShutdownPendingPromise()) return;
+        if (!stepShutdownCoder()) return;
+      }
+
+      //.......................................................................
+      // final cleanup (hard shutdown)
+
+      setState(IRTP::State_Shutdown);
+
+      stepShutdownPendingPromise();
+      stepShutdownCoder();
+
+      auto engine = mediaEngine_.lock();
+      if (engine) {
+        engine->notifyRTPShutdownStateChanged();
+      }
+
+      // make sure to cleanup any final reference to self
+      gracefulShutdownReference_.reset();
+
+      mediaEngine_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPEncoderAudio::stepShutdownPendingPromise()
+    {
+      if (!promise_) {
+        ZS_EVENTING_2(x, i, Debug, RTPEncoderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no pending promise");
+        return true;
+      }
+
+      ZS_EVENTING_2(x, i, Debug, RTPEncoderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "pending promise");
+
+      promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+      promise_.reset();
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPEncoderAudio::stepShutdownCoder()
+    {
+      ZS_EVENTING_2(x, i, Debug, RTPEncoderAudioShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "coder");
+
+#define TODO 1
+#define TODO 2
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, RTPEncoderAudioStep, ol, MediaEngine, Step, puid, id, id_);
+
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, RTPEncoderAudioStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      if (!stepSetup()) goto not_ready;
+      if (!stepResolve()) goto not_ready;
+
+      goto ready;
+
+    not_ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, RTPEncoderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "not ready");
+        return;
+      }
+
+    ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, RTPEncoderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "ready");
+        setState(IRTP::State_Ready);
+        return;
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPEncoderAudio::stepSetup()
+    {
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPEncoderAudio::stepResolve()
+    {
+      if (!promise_) {
+        ZS_EVENTING_2(x, i, Trace, RTPEncoderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "promise already resolved");
+        return true;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, RTPEncoderAudioStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "resolving promise");
+
+      promise_->resolve(thisWeak_.lock());
+      promise_.reset();
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::setState(States state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, RTPEncoderAudioSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, IRTP::toString(state), string, oldState, IRTP::toString(currentState_));
+
+      currentState_ = state;
+
+      auto pThis = thisWeak_.lock();
+
+      if ((delegate_) &&
+          (pThis)) {
+        try {
+          delegate_->onRTPEncoderStateChanged(thisWeak_.lock(), state);
+        } catch (IRTPEncoderDelegateProxy::Exceptions::DelegateGone &) {
+        }
+      }
+
+//      MediaEnginePtr pThis = mThisWeak.lock();
+//      if (pThis) {
+//        mSubscriptions.delegate()->onMediaEngineStateChanged(pThis, currentState_);
+//      }
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, RTPEncoderAudioSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, RTPEncoderAudioSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::innerNotifyRTP(
+                                         ImmutableMediaChannelTracePtr trace,
+                                         RTPPacketPtr packet
+                                         )
+    {
+      IRTPEncoderDelegatePtr delegate;
+
+      {
+        AutoRecursiveLock lock(*this);
+        delegate = notifyDelegate_.lock();
+      }
+
+      if (!delegate) return;
+
+      delegate->notifyRTPEncoderRTPPacket(traceHelper_.trace(trace), packet);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderAudio::innerNotifyRTCP(
+                                          ImmutableMediaChannelTracePtr trace,
+                                          RTCPPacketPtr packet
+                                          )
+    {
+      IRTPEncoderDelegatePtr delegate;
+
+      {
+        AutoRecursiveLock lock(*this);
+        delegate = notifyDelegate_.lock();
+      }
+
+      if (!delegate) return;
+
+      delegate->notifyRTPEncoderRTCPPacket(traceHelper_.trace(trace), packet);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderAudioFactory
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPEncoderAudioFactory &IRTPEncoderAudioFactory::singleton()
+    {
+      return RTPEncoderAudioFactory::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPEncoderAudioPtr IRTPEncoderAudioFactory::create(
+                                                       PromiseWithRTPEncoderAudioPtr promise,
+                                                       UseMediaEnginePtr mediaEngine,
+                                                       ParametersPtr parameters,
+                                                       IRTPEncoderDelegatePtr delegate
+                                                       )
+    {
+      if (this) {}
+      return internal::RTPEncoderAudio::create(promise, mediaEngine, parameters, delegate);
+    }
+
+  } // internal namespace
+}
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif //__GNUC__
diff --git a/ortc/cpp/ortc_RTPEncoderVideo.cpp b/ortc/cpp/ortc_RTPEncoderVideo.cpp
new file mode 100644
index 00000000..67a9dd8e
--- /dev/null
+++ b/ortc/cpp/ortc_RTPEncoderVideo.cpp
@@ -0,0 +1,610 @@
+/*
+
+ Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#include <ortc/internal/ortc_RTPEncoderVideo.h>
+#include <ortc/internal/ortc_MediaEngine.h>
+#include <ortc/internal/ortc_ORTC.h>
+#include <ortc/internal/ortc_StatsReport.h>
+#include <ortc/internal/ortc.events.h>
+#include <ortc/internal/platform.h>
+
+#include <ortc/IStatsReport.h>
+
+#include <ortc/services/IHTTP.h>
+
+#include <zsLib/ISettings.h>
+
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedef"
+#endif //__GNUC__
+
+
+#ifdef _DEBUG
+#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
+#else
+#define ASSERT(x)
+#endif //_DEBUG
+
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_media_engine) }
+
+namespace ortc
+{
+  ZS_DECLARE_USING_PTR(zsLib, ISettings);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+
+  namespace internal
+  {
+    ZS_DECLARE_CLASS_PTR(RTPEncoderVideoSettingsDefaults);
+    ZS_DECLARE_TYPEDEF_PTR(IStatsReportForInternal, UseStatsReport);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideoSettingsDefaults
+    #pragma mark
+
+    class RTPEncoderVideoSettingsDefaults : public ISettingsApplyDefaultsDelegate
+    {
+    public:
+      //-----------------------------------------------------------------------
+      ~RTPEncoderVideoSettingsDefaults()
+      {
+        ISettings::removeDefaults(*this);
+      }
+
+      //-----------------------------------------------------------------------
+      static RTPEncoderVideoSettingsDefaultsPtr singleton()
+      {
+        static SingletonLazySharedPtr<RTPEncoderVideoSettingsDefaults> singleton(create());
+        return singleton.singleton();
+      }
+
+      //-----------------------------------------------------------------------
+      static RTPEncoderVideoSettingsDefaultsPtr create()
+      {
+        auto pThis(make_shared<RTPEncoderVideoSettingsDefaults>());
+        ISettings::installDefaults(pThis);
+        return pThis;
+      }
+
+      //-----------------------------------------------------------------------
+      virtual void notifySettingsApplyDefaults() override
+      {
+      }
+      
+    };
+
+    //-------------------------------------------------------------------------
+    void installRTPEncoderVideoSettingsDefaults()
+    {
+      RTPEncoderVideoSettingsDefaults::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderVideoForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPEncoderVideo::PromiseWithRTPEncoderVideoPtr IRTPEncoderVideo::create(
+                                                                             const Parameters &parameters,
+                                                                             IRTPEncoderDelegatePtr delegate
+                                                                             )
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderVideo, UseEngine);
+      return UseEngine::createRTPEncoderVideo(parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPEncoderVideo
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPEncoderVideoForMediaEngine::ForMediaEnginePtr IRTPEncoderVideoForMediaEngine::create(
+                                                                                             PromiseWithRTPEncoderVideoPtr promise,
+                                                                                             UseMediaEnginePtr mediaEngine,
+                                                                                             ParametersPtr parameters,
+                                                                                             IRTPEncoderDelegatePtr delegate
+                                                                                             )
+    {
+      return internal::IRTPEncoderVideoFactory::singleton().create(promise, mediaEngine, parameters, delegate);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    RTPEncoderVideo::RTPEncoderVideo(
+                                     const make_private &,
+                                     IMessageQueuePtr queue,
+                                     PromiseWithRTPEncoderVideoPtr promise,
+                                     UseMediaEnginePtr mediaEngine,
+                                     ParametersPtr parameters,
+                                     IRTPEncoderDelegatePtr delegate
+                                     ) :
+      MessageQueueAssociator(queue),
+      SharedRecursiveLock(SharedRecursiveLock::create()),
+      mediaEngine_(mediaEngine),
+      promise_(promise),
+      parameters_(parameters),
+      notifyDelegate_(delegate_),
+      delegate_(IRTPEncoderDelegateProxy::createWeak(delegate)),
+      traceHelper_(id_)
+    {
+      ZS_EVENTING_1(x, i, Detail, RTPEncoderVideoCreate, ol, MediaEngine, Start, puid, id, id_);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::init()
+    {
+      asyncThisDelegate_ = IRTPEncoderAysncDelegateProxy::createWeak(thisWeak_.lock());
+      AutoRecursiveLock lock(*this);
+      IWakeDelegateProxy::create(thisWeak_.lock())->onWake();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPEncoderVideo::~RTPEncoderVideo()
+    {
+      if (isNoop()) return;
+
+      thisWeak_.reset();
+
+      cancel();
+      ZS_EVENTING_1(x, i, Detail, RTPEncoderVideoDestroy, ol, MediaEngine, Stop, puid, id, id_);
+    }
+
+    //-----------------------------------------------------------------------
+    RTPEncoderVideoPtr RTPEncoderVideo::create(
+                                               PromiseWithRTPEncoderVideoPtr promise,
+                                               UseMediaEnginePtr mediaEngine,
+                                               ParametersPtr parameters,
+                                               IRTPEncoderDelegatePtr delegate
+                                               )
+    {
+      auto pThis(make_shared<RTPEncoderVideo>(make_private{}, IORTCForInternal::queueRTP(), promise, mediaEngine, parameters, delegate));
+      pThis->thisWeak_ = pThis;
+      pThis->init();
+      return pThis;
+    }
+
+    //-------------------------------------------------------------------------
+    RTPEncoderVideoPtr RTPEncoderVideo::convert(ForMediaEnginePtr object)
+    {
+      return ZS_DYNAMIC_PTR_CAST(RTPEncoderVideo, object);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo => IRTP
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::cancel()
+    {
+      ZS_EVENTING_1(x, i, Debug, RTPEncoderVideoCancel, ol, MediaEngine, Cancel, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      innerCancel();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPEncoderVideo::States RTPEncoderVideo::getState() const
+    {
+      AutoRecursiveLock lock(*this);
+      return currentState_;
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo => IRTPEncoder
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::notifyVideoFrame(
+                                           ImmutableMediaChannelTracePtr trace,
+                                           VideoFramePtr frame
+                                           )
+    {
+      try {
+        asyncThisDelegate_->onRTPEncoderVideoFrame(trace, frame);
+      } catch (const IRTPEncoderAysncDelegateProxy::Exceptions::DelegateGone &) {
+        // should never happen
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo => IRTPEncoderVideo
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo => IRTPForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::shutdown()
+    {
+      ZS_EVENTING_1(x, i, Detail, RTPEncoderVideoShutdown, ol, MediaEngine, Close, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      cancel();
+    }
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo => IRTPEncoderForMediaEngine
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo => IRTPEncoderVideoForMediaEngine
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo => IWakeDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::onWake()
+    {
+      ZS_EVENTING_1(x, i, Trace, RTPEncoderVideoOnWake, ol, MediaEngine, Event, puid, id, id_);
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo => IPromiseSettledDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::onPromiseSettled(PromisePtr promise)
+    {
+      ZS_EVENTING_2(x, i, Trace, RTPEncoderVideoOnPromiseSettled, ol, MediaEngine, Event, puid, id, id_, puid, promiseId, promise->getID());
+
+      AutoRecursiveLock lock(*this);
+      step();
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo => IRTPEncoderAysncDelegate
+    #pragma mark
+    
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::onRTPEncoderVideoFrame(
+                                                 ImmutableMediaChannelTracePtr trace,
+                                                 VideoFramePtr frame
+                                                 )
+    {
+#define TODO 1
+#define TODO 2
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo => (internal)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::innerCancel()
+    {
+      //.......................................................................
+      // try to gracefully shutdown
+
+      if (isShutdown()) return;
+
+      setState(IRTP::State_ShuttingDown);
+
+      if (!gracefulShutdownReference_) gracefulShutdownReference_ = thisWeak_.lock();
+
+      if (gracefulShutdownReference_) {
+        ZS_EVENTING_2(x, i, Debug, RTPEncoderVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "graceful");
+
+        // perform any graceful asynchronous shutdown processes needed and
+        // re-attempt shutdown again later if needed.
+
+        if (!stepShutdownPendingPromise()) return;
+        if (!stepShutdownCoder()) return;
+      }
+
+      //.......................................................................
+      // final cleanup (hard shutdown)
+
+      setState(IRTP::State_Shutdown);
+
+      stepShutdownPendingPromise();
+      stepShutdownCoder();
+
+      auto engine = mediaEngine_.lock();
+      if (engine) {
+        engine->notifyRTPShutdownStateChanged();
+      }
+
+      // make sure to cleanup any final reference to self
+      gracefulShutdownReference_.reset();
+
+      mediaEngine_.reset();
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPEncoderVideo::stepShutdownPendingPromise()
+    {
+      if (!promise_) {
+        ZS_EVENTING_2(x, i, Debug, RTPEncoderVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "no pending promise");
+        return true;
+      }
+
+      ZS_EVENTING_2(x, i, Debug, RTPEncoderVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "pending promise");
+
+      promise_->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "media engine is shutting down"));
+      promise_.reset();
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPEncoderVideo::stepShutdownCoder()
+    {
+      ZS_EVENTING_2(x, i, Debug, RTPEncoderVideoShutdownStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "coder");
+
+#define TODO 1
+#define TODO 2
+
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::step()
+    {
+      ZS_EVENTING_1(x, i, Trace, RTPEncoderVideoStep, ol, MediaEngine, Step, puid, id, id_);
+
+      if ((isShuttingDown()) ||
+          (isShutdown())) {
+        ZS_EVENTING_1(x, i, Trace, RTPEncoderVideoStepForwardCancel, ol, MediaEngine, Step, puid, id, id_);
+        cancel();
+        return;
+      }
+
+      if (!stepSetup()) goto not_ready;
+      if (!stepResolve()) goto not_ready;
+
+      goto ready;
+
+    not_ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, RTPEncoderVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "not ready");
+        return;
+      }
+
+    ready:
+      {
+        ZS_EVENTING_2(x, i, Trace, RTPEncoderVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "ready");
+        setState(IRTP::State_Ready);
+        return;
+      }
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPEncoderVideo::stepSetup()
+    {
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    bool RTPEncoderVideo::stepResolve()
+    {
+      if (!promise_) {
+        ZS_EVENTING_2(x, i, Trace, RTPEncoderVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "promise already resolved");
+        return true;
+      }
+
+      ZS_EVENTING_2(x, i, Trace, RTPEncoderVideoStepMessage, ol, MediaEngine, Step, puid, id, id_, string, message, "resolving promise");
+
+      promise_->resolve(thisWeak_.lock());
+      promise_.reset();
+      return true;
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::setState(States state)
+    {
+      if (state == currentState_) return;
+
+      ZS_EVENTING_3(x, i, Detail, RTPEncoderVideoSetState, ol, MediaEngine, StateEvent, puid, id, id_, string, newState, IRTP::toString(state), string, oldState, IRTP::toString(currentState_));
+
+      currentState_ = state;
+
+      auto pThis = thisWeak_.lock();
+
+      if ((delegate_) &&
+          (pThis)) {
+        try {
+          delegate_->onRTPEncoderStateChanged(thisWeak_.lock(), state);
+        } catch (IRTPEncoderDelegateProxy::Exceptions::DelegateGone &) {
+        }
+      }
+
+//      MediaEnginePtr pThis = mThisWeak.lock();
+//      if (pThis) {
+//        mSubscriptions.delegate()->onMediaEngineStateChanged(pThis, currentState_);
+//      }
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::setError(PromisePtr promise)
+    {
+      if (!promise) return;
+
+      auto reason = promise->reason<ErrorAny>();
+      if (!reason) return;
+
+      setError(reason->mErrorCode, reason->mReason);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::setError(WORD errorCode, const char *inReason)
+    {
+      String reason(inReason);
+      if (reason.isEmpty()) {
+        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
+      }
+
+      if (0 != lastError_) {
+        ZS_EVENTING_3(x, e, Detail, RTPEncoderVideoSetErrorIgnored, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+        return;
+      }
+
+      lastError_ = errorCode;
+      lastErrorReason_ = reason;
+
+      ZS_EVENTING_3(x, e, Detail, RTPEncoderVideoSetError, ol, MediaEngine, ErrorEvent, puid, id, id_, word, error, lastError_, string, reason, lastErrorReason_);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::innerNotifyRTP(
+                                         ImmutableMediaChannelTracePtr trace,
+                                         RTPPacketPtr packet
+                                         )
+    {
+      IRTPEncoderDelegatePtr delegate;
+
+      {
+        AutoRecursiveLock lock(*this);
+        delegate = notifyDelegate_.lock();
+      }
+
+      if (!delegate) return;
+
+      delegate->notifyRTPEncoderRTPPacket(traceHelper_.trace(trace), packet);
+    }
+
+    //-------------------------------------------------------------------------
+    void RTPEncoderVideo::innerNotifyRTCP(
+                                          ImmutableMediaChannelTracePtr trace,
+                                          RTCPPacketPtr packet
+                                          )
+    {
+      IRTPEncoderDelegatePtr delegate;
+
+      {
+        AutoRecursiveLock lock(*this);
+        delegate = notifyDelegate_.lock();
+      }
+
+      if (!delegate) return;
+
+      delegate->notifyRTPEncoderRTCPPacket(traceHelper_.trace(trace), packet);
+    }
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderVideoFactory
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    IRTPEncoderVideoFactory &IRTPEncoderVideoFactory::singleton()
+    {
+      return RTPEncoderVideoFactory::singleton();
+    }
+
+    //-------------------------------------------------------------------------
+    RTPEncoderVideoPtr IRTPEncoderVideoFactory::create(
+                                                       PromiseWithRTPEncoderVideoPtr promise,
+                                                       UseMediaEnginePtr mediaEngine,
+                                                       ParametersPtr parameters,
+                                                       IRTPEncoderDelegatePtr delegate
+                                                       )
+    {
+      if (this) {}
+      return internal::RTPEncoderVideo::create(promise, mediaEngine, parameters, delegate);
+    }
+
+  } // internal namespace
+}
+
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif //__GNUC__
diff --git a/ortc/cpp/ortc_RTPListener.cpp b/ortc/cpp/ortc_RTPListener.cpp
index e4fd1e0d..c57eb450 100644
--- a/ortc/cpp/ortc_RTPListener.cpp
+++ b/ortc/cpp/ortc_RTPListener.cpp
@@ -29,12 +29,12 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+ 
 #include <ortc/internal/ortc_RTPListener.h>
 #include <ortc/internal/ortc_RTPReceiver.h>
 #include <ortc/internal/ortc_RTPSender.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
-#include <ortc/internal/ortc_RTPPacket.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
 #include <ortc/internal/ortc_SRTPSDESTransport.h>
 #include <ortc/internal/ortc_RTPTypes.h>
 #include <ortc/internal/ortc_ORTC.h>
@@ -42,6 +42,9 @@
 #include <ortc/internal/platform.h>
 
 #include <ortc/IHelper.h>
+#include <ortc/RTPPacket.h>
+#include <ortc/RTCPPacket.h>
+
 #include <ortc/services/IHTTP.h>
 
 #include <zsLib/ISettings.h>
@@ -60,7 +63,7 @@
 #endif //_DEBUG
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtplistener) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_rtp_listener) }
 
 namespace ortc
 {
@@ -94,11 +97,13 @@ namespace ortc
         case IRTPTypes::HeaderExtensionURI_RID:                               return false;
         case IRTPTypes::HeaderExtensionURI_3gpp_VideoOrientation:             return true;
         case IRTPTypes::HeaderExtensionURI_3gpp_VideoOrientation6:            return true;
+        case IRTPTypes::HeaderExtensionURI_TransmissionTimeOffsets:           return true;
+        case IRTPTypes::HeaderExtensionURI_AbsoluteSendTime:                  return true;
+        case IRTPTypes::HeaderExtensionURI_TransportSequenceNumber:           return true;
       }
       return true;
     }
     
-    
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -426,6 +431,7 @@ namespace ortc
                              ) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create()),
       mRTPTransport(transport),
       mMaxBufferedRTPPackets(SafeInt<decltype(mMaxBufferedRTPPackets)>(ISettings::getUInt(ORTC_SETTING_RTP_LISTENER_MAX_RTP_PACKETS_IN_BUFFER))),
       mMaxRTPPacketAge(ISettings::getUInt(ORTC_SETTING_RTP_LISTENER_MAX_AGE_RTP_PACKETS_IN_SECONDS)),
@@ -433,9 +439,9 @@ namespace ortc
       mMaxRTCPPacketAge(ISettings::getUInt(ORTC_SETTING_RTP_LISTENER_MAX_AGE_RTCP_PACKETS_IN_SECONDS)),
       mReceivers(make_shared<ReceiverObjectMap>()),
       mSenders(make_shared<SenderObjectMap>()),
-      mAmbiguousPayloadMappingMinDifference(ISettings::getUInt(ORTC_SETTING_RTP_LISTENER_ONLY_RESOLVE_AMBIGUOUS_PAYLOAD_MAPPING_IF_ACTIVITY_DIFFERS_IN_MILLISECONDS)),
       mSSRCTableExpires(ISettings::getUInt(ORTC_SETTING_RTP_LISTENER_SSRC_TIMEOUT_IN_SECONDS)),
-      mUnhandledEventsExpires(ISettings::getUInt(ORTC_SETTING_RTP_LISTENER_UNHANDLED_EVENTS_TIMEOUT_IN_SECONDS))
+      mUnhandledEventsExpires(ISettings::getUInt(ORTC_SETTING_RTP_LISTENER_UNHANDLED_EVENTS_TIMEOUT_IN_SECONDS)),
+      mAmbiguousPayloadMappingMinDifference(ISettings::getUInt(ORTC_SETTING_RTP_LISTENER_ONLY_RESOLVE_AMBIGUOUS_PAYLOAD_MAPPING_IF_ACTIVITY_DIFFERS_IN_MILLISECONDS))
     {
       ZS_EVENTING_8(
                     x, i, Detail, RtpListenerCreate, ol, RtpListener, Start,
@@ -781,12 +787,12 @@ namespace ortc
       {
         for (auto iter = receivers->begin(); iter != receivers->end(); ++iter) {
           ReceiverID receiverID = (*iter).first;
-          auto receiverInfo = (*iter).second;
+          auto currentReceiverInfo = (*iter).second;
 
           auto receiver = (*iter).second->mReceiver.lock();
 
           if (!receiver) {
-            ZS_LOG_WARNING(Trace, log("receiver is gone") + ZS_PARAM("receiver ID", receiverID) + receiverInfo->toDebug())
+            ZS_LOG_WARNING(Trace, log("receiver is gone") + ZS_PARAM("receiver ID", receiverID) + currentReceiverInfo->toDebug())
             continue;
           }
 
@@ -1102,7 +1108,7 @@ namespace ortc
                                      )
     {
       ZS_EVENTING_2(
-                    x, i, Debug, cRtpListenerRegisterSender, ol, RtpListener, Info,
+                    x, i, Debug, RtpListenerRegisterSender, ol, RtpListener, Info,
                     puid, id, mID,
                     puid, senderId, inSender->getID()
                     );
diff --git a/ortc/cpp/ortc_RTPMediaEngine.cpp b/ortc/cpp/ortc_RTPMediaEngine.cpp
deleted file mode 100644
index 73e90b9b..00000000
--- a/ortc/cpp/ortc_RTPMediaEngine.cpp
+++ /dev/null
@@ -1,4952 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#include <ortc/internal/ortc_RTPMediaEngine.h>
-#include <ortc/internal/ortc_MediaStreamTrack.h>
-#include <ortc/internal/ortc_RTPReceiverChannelAudio.h>
-#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
-#include <ortc/internal/ortc_RTPSenderChannelAudio.h>
-#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
-#include <ortc/internal/ortc_RTPPacket.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
-#include <ortc/internal/ortc_ORTC.h>
-#include <ortc/internal/ortc_StatsReport.h>
-#include <ortc/internal/ortc.events.h>
-#include <ortc/internal/platform.h>
-
-#include <ortc/IStatsReport.h>
-
-#include <ortc/IHelper.h>
-#include <ortc/services/IHTTP.h>
-
-#include <zsLib/ISettings.h>
-#include <zsLib/Singleton.h>
-#include <zsLib/Log.h>
-#include <zsLib/XML.h>
-#include <zsLib/SafeInt.h>
-
-#include <cryptopp/sha.h>
-
-#include <limits>
-#include <float.h>
-#include <math.h>
-
-#include <mfapi.h>
-
-#include <webrtc/base/timeutils.h>
-#include <webrtc/base/event_tracer.h>
-#include <webrtc/voice_engine/include/voe_codec.h>
-#include <webrtc/voice_engine/include/voe_rtp_rtcp.h>
-#include <webrtc/voice_engine/include/voe_network.h>
-#include <webrtc/voice_engine/include/voe_hardware.h>
-#include <webrtc/system_wrappers/include/cpu_info.h>
-#include <webrtc/base/scoped_ptr.h>
-#include <webrtc/voice_engine/include/voe_audio_processing.h>
-#include <webrtc/modules/video_capture/video_capture_factory.h>
-#ifdef WINRT
-#include <third_party/h264_winrt/h264_winrt_factory.h>
-#endif
-
-#pragma comment(lib, "mfplat")
-
-#ifdef _DEBUG
-#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
-#else
-#define ASSERT(x)
-#endif //_DEBUG
-
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpmediaengine) }
-
-namespace ortc
-{
-  ZS_DECLARE_USING_PTR(zsLib, ISettings);
-  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
-
-  namespace internal
-  {
-    ZS_DECLARE_CLASS_PTR(RTPMediaEngineSettingsDefaults);
-    ZS_DECLARE_CLASS_PTR(RTPMediaEngineRegistration);
-    ZS_DECLARE_CLASS_PTR(RTPMediaEngineSingleton);
-    ZS_DECLARE_TYPEDEF_PTR(IStatsReportForInternal, UseStatsReport);
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark (helpers)
-    #pragma mark
-
-    // foreward declaration
-    void webrtcTrace(Log::Severity severity, Log::Level level, const char *message);
-
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngineSettingsDefaults
-    #pragma mark
-
-    class RTPMediaEngineSettingsDefaults : public ISettingsApplyDefaultsDelegate
-    {
-    public:
-      //-----------------------------------------------------------------------
-      ~RTPMediaEngineSettingsDefaults()
-      {
-        ISettings::removeDefaults(*this);
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPMediaEngineSettingsDefaultsPtr singleton()
-      {
-        static SingletonLazySharedPtr<RTPMediaEngineSettingsDefaults> singleton(create());
-        return singleton.singleton();
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPMediaEngineSettingsDefaultsPtr create()
-      {
-        auto pThis(make_shared<RTPMediaEngineSettingsDefaults>());
-        ISettings::installDefaults(pThis);
-        return pThis;
-      }
-
-      //-----------------------------------------------------------------------
-      virtual void notifySettingsApplyDefaults() override
-      {
-      }
-      
-    };
-
-    //-------------------------------------------------------------------------
-    void installRTPMediaEngineSettingsDefaults()
-    {
-      RTPMediaEngineSettingsDefaults::singleton();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngineRegistration
-    #pragma mark
-
-    class RTPMediaEngineRegistration : public IRTPMediaEngineRegistration
-    {
-    protected:
-      struct make_private {};
-    public:
-      //-----------------------------------------------------------------------
-      RTPMediaEngineRegistration(const make_private &)
-      {}
-
-      //-----------------------------------------------------------------------
-      ~RTPMediaEngineRegistration()
-      {
-        mEngine->shutdown();
-        mEngine.reset();
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPMediaEngineRegistrationPtr create()
-      {
-        RTPMediaEngineRegistrationPtr pThis(make_shared<RTPMediaEngineRegistration>(make_private{}));
-        pThis->mThisWeak = pThis;
-        pThis->init();
-        return pThis;
-      }
-
-      //-----------------------------------------------------------------------
-      void init()
-      {
-        mEngine = IRTPMediaEngineFactory::singleton().create(mThisWeak.lock());
-      }
-
-      //-----------------------------------------------------------------------
-      PromiseWithRTPMediaEnginePtr notify()
-      {
-        auto promise = PromiseWithRTPMediaEngine::create(IORTCForInternal::queueORTC());
-        promise->setReferenceHolder(mThisWeak.lock());
-        mEngine->notify(promise);
-        return promise;
-      }
-
-    public:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark IRTPMediaEngineRegistration
-      #pragma mark
-
-      virtual RTPMediaEnginePtr getRTPEngine() const {return mEngine;}
-
-    protected:
-      RTPMediaEngineRegistrationWeakPtr mThisWeak;
-      RTPMediaEnginePtr mEngine;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngineSingleton
-    #pragma mark
-
-    class RTPMediaEngineSingleton : public SharedRecursiveLock,
-                                    public ISingletonManagerDelegate
-    {
-    protected:
-      struct make_private {};
-
-    public:
-      //-----------------------------------------------------------------------
-      RTPMediaEngineSingleton(const make_private &) :
-        SharedRecursiveLock(SharedRecursiveLock::create())
-      {
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPMediaEngineSingletonPtr create()
-      {
-        RTPMediaEngineSingletonPtr pThis(make_shared<RTPMediaEngineSingleton>(make_private{}));
-        return pThis;
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPMediaEngineSingletonPtr singleton()
-      {
-        AutoRecursiveLock lock(*IHelper::getGlobalLock());
-        static SingletonLazySharedPtr<RTPMediaEngineSingleton> singleton(create());
-        RTPMediaEngineSingletonPtr result = singleton.singleton();
-
-        static zsLib::SingletonManager::Register registerSingleton("org.ortc.RTPMediaEngineSingleton", result);
-
-        if (!result) {
-          ZS_LOG_WARNING(Detail, slog("singleton gone"))
-        }
-
-        return result;
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPMediaEnginePtr getEngineIfAlive()
-      {
-        auto pThis(singleton());
-        if (!pThis) return RTPMediaEnginePtr();
-
-        AutoRecursiveLock lock(*pThis);
-        auto result = pThis->mEngineRegistration.lock();
-        if (!result) return RTPMediaEnginePtr();
-
-        return result->getRTPEngine();
-      }
-
-      //-----------------------------------------------------------------------
-      Log::Params log(const char *message) const
-      {
-        ElementPtr objectEl = Element::create("ortc::RTPMediaEngineSingleton");
-        IHelper::debugAppend(objectEl, "id", mID);
-        return Log::Params(message, objectEl);
-      }
-
-      //-----------------------------------------------------------------------
-      static Log::Params slog(const char *message)
-      {
-        return Log::Params(message, "ortc::RTPMediaEngineSingleton");
-      }
-
-      //-----------------------------------------------------------------------
-      Log::Params debug(const char *message) const
-      {
-        return Log::Params(message, toDebug());
-      }
-
-      //-----------------------------------------------------------------------
-      virtual ElementPtr toDebug() const
-      {
-        AutoRecursiveLock lock(*this);
-        ElementPtr resultEl = Element::create("ortc::RTPMediaEngineSingleton");
-
-        IHelper::debugAppend(resultEl, "id", mID);
-
-        return resultEl;
-      }
-
-      //-----------------------------------------------------------------------
-      RTPMediaEngineRegistrationPtr getEngineRegistration()
-      {
-        AutoRecursiveLock lock(*this);
-        auto result = mEngineRegistration.lock();
-        if (!result) {
-          result = RTPMediaEngineRegistration::create();
-          mEngineRegistration = result;
-        }
-        return result;
-      }
-
-    protected:
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark ISingletonManagerDelegate
-      #pragma mark
-
-      virtual void notifySingletonCleanup()
-      {
-        AutoRecursiveLock lock(*this);
-        mEngineRegistration.reset();
-      }
-
-    protected:
-      AutoPUID mID;
-
-      RTPMediaEngineRegistrationWeakPtr mEngineRegistration;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForORTC
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void IRTPMediaEngineForORTC::setLogLevel(Log::Level level)
-    {
-      RTPMediaEngine::setLogLevel(level);
-    }
-
-    //-------------------------------------------------------------------------
-    void IRTPMediaEngineForORTC::ntpServerTime(const Milliseconds &value)
-    {
-      RTPMediaEngine::ntpServerTime(value);
-    }
-
-    //-------------------------------------------------------------------------
-    void IRTPMediaEngineForORTC::startMediaTracing()
-    {
-      RTPMediaEngine::startMediaTracing();
-    }
-
-    //-------------------------------------------------------------------------
-    void IRTPMediaEngineForORTC::stopMediaTracing()
-    {
-      RTPMediaEngine::stopMediaTracing();
-    }
-
-    //-------------------------------------------------------------------------
-    bool IRTPMediaEngineForORTC::isMediaTracing()
-    {
-      return RTPMediaEngine::isMediaTracing();
-    }
-
-    //-------------------------------------------------------------------------
-    bool IRTPMediaEngineForORTC::saveMediaTrace(String filename)
-    {
-      return RTPMediaEngine::saveMediaTrace(filename);
-    }
-
-    //-------------------------------------------------------------------------
-    bool IRTPMediaEngineForORTC::saveMediaTrace(String host, int port)
-    {
-      return RTPMediaEngine::saveMediaTrace(host, port);
-    }
-
-    //-------------------------------------------------------------------------
-    bool IRTPMediaEngineForORTC::isMRPInstalled()
-    {
-      return RTPMediaEngine::isMRPInstalled();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForSettings
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void IRTPMediaEngineForSettings::applyDefaults()
-    {
-//      UseSettings::setUInt(ORTC_SETTING_SCTP_TRANSPORT_MAX_MESSAGE_SIZE, 5*1024);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForRTPReceiverChannelMediaBase
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    ElementPtr IRTPMediaEngineForRTPReceiverChannelMediaBase::toDebug(ForRTPReceiverChannelMediaBasePtr object)
-    {
-      if (!object) return ElementPtr();
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object)->toDebug();
-    }
-
-    //-------------------------------------------------------------------------
-    PromiseWithRTPMediaEnginePtr IRTPMediaEngineForRTPReceiverChannelMediaBase::create()
-    {
-      return RTPMediaEngine::createEnginePromise();
-    }
-
-    //-------------------------------------------------------------------------
-    PromiseWithRTPMediaEngineChannelResourcePtr IRTPMediaEngineForRTPReceiverChannelMediaBase::setupChannel(
-                                                                                                            UseReceiverChannelMediaBasePtr channel,
-                                                                                                            TransportPtr transport,
-                                                                                                            UseMediaStreamTrackPtr track,
-                                                                                                            ParametersPtr parameters,
-                                                                                                            RTPPacketPtr packet
-                                                                                                            )
-    {
-      auto singleton = RTPMediaEngineSingleton::singleton();
-      if (!singleton) return PromiseWithRTPMediaEngineChannelResource::createRejected(IORTCForInternal::queueORTC());
-      return singleton->getEngineRegistration()->getRTPEngine()->setupChannel(
-                                                                              channel,
-                                                                              transport,
-                                                                              track,
-                                                                              parameters,
-                                                                              packet
-                                                                              );
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForRTPSenderChannelMediaBase
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    ElementPtr IRTPMediaEngineForRTPSenderChannelMediaBase::toDebug(ForRTPSenderChannelMediaBasePtr object)
-    {
-      if (!object) return ElementPtr();
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object)->toDebug();
-    }
-
-    //-------------------------------------------------------------------------
-    PromiseWithRTPMediaEnginePtr IRTPMediaEngineForRTPSenderChannelMediaBase::create()
-    {
-      return RTPMediaEngine::createEnginePromise();
-    }
-
-    //-------------------------------------------------------------------------
-    PromiseWithRTPMediaEngineChannelResourcePtr IRTPMediaEngineForRTPSenderChannelMediaBase::setupChannel(
-                                                                                                          UseSenderChannelMediaBasePtr channel,
-                                                                                                          TransportPtr transport,
-                                                                                                          UseMediaStreamTrackPtr track,
-                                                                                                          ParametersPtr parameters,
-                                                                                                          IDTMFSenderDelegatePtr dtmfDelegate
-                                                                                                          )
-    {
-      auto singleton = RTPMediaEngineSingleton::singleton();
-      if (!singleton) return PromiseWithRTPMediaEngineChannelResource::createRejected(IORTCForInternal::queueORTC());
-      return singleton->getEngineRegistration()->getRTPEngine()->setupChannel(
-                                                                              channel,
-                                                                              transport,
-                                                                              track,
-                                                                              parameters,
-                                                                              dtmfDelegate
-                                                                              );
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForMediaStreamTrack
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    ElementPtr IRTPMediaEngineForMediaStreamTrack::toDebug(ForMediaStreamTrackPtr object)
-    {
-      if (!object) return ElementPtr();
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object)->toDebug();
-    }
-
-    //-------------------------------------------------------------------------
-    PromiseWithRTPMediaEnginePtr IRTPMediaEngineForMediaStreamTrack::create()
-    {
-      return RTPMediaEngine::createEnginePromise();
-    }
-
-    //-------------------------------------------------------------------------
-    PromiseWithRTPMediaEngineDeviceResourcePtr IRTPMediaEngineForMediaStreamTrack::setupDevice(UseMediaStreamTrackPtr track)
-    {
-      auto singleton = RTPMediaEngineSingleton::singleton();
-      if (!singleton) return PromiseWithRTPMediaEngineDeviceResource::createRejected(IORTCForInternal::queueORTC());
-      return singleton->getEngineRegistration()->getRTPEngine()->setupDevice(track);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine
-    #pragma mark
-    
-    //---------------------------------------------------------------------------
-    const char *RTPMediaEngine::toString(States state)
-    {
-      switch (state) {
-        case State_Pending:       return "pending";
-        case State_Ready:         return "ready";
-        case State_ShuttingDown:  return "shutting down";
-        case State_Shutdown:      return "shutdown";
-      }
-      return "UNDEFINED";
-    }
-    
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::RTPMediaEngine(
-                                   const make_private &,
-                                   IMessageQueuePtr queue,
-                                   IRTPMediaEngineRegistrationPtr registration
-                                   ) :
-      MessageQueueAssociator(queue),
-      SharedRecursiveLock(SharedRecursiveLock::create()),
-      mRegistration(registration),
-      mTraceCallback(new WebRtcTraceCallback()),
-      mLogSink(new WebRtcLogSink())
-    {
-      ZS_EVENTING_1(x, i, Detail, RtpMediaEngineCreate, ol, RtpMediaEngine, Start, puid, id, mID);
-      ZS_LOG_DETAIL(debug("created"));
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::init()
-    {
-      webrtc::Trace::CreateTrace();
-      webrtc::Trace::SetTraceCallback(mTraceCallback.get());
-
-      auto level = IORTCForInternal::webrtcLogLevel();
-      if (level.hasValue()) {
-        internalSetLogLevel(level);
-      }
-
-#if defined(WINRT)
-      webrtc::SetupEventTracer(&GetCategoryGroupEnabled, &AddTraceEvent);
-#endif
-
-      AutoRecursiveLock lock(*this);
-
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::~RTPMediaEngine()
-    {
-      if (isNoop()) return;
-
-      webrtc::Trace::SetTraceCallback(nullptr);
-      webrtc::Trace::ReturnTrace();
-
-      ZS_LOG_DETAIL(log("destroyed"));
-      mThisWeak.reset();
-
-      cancel();
-      ZS_EVENTING_1(x, i, Detail, RtpMediaEngineDestroy, ol, RtpMediaEngine, Stop, puid, id, mID);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForSettingsPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForRTPReceiverChannelPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForRTPReceiverChannelMediaBasePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForRTPReceiverChannelAudioPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForRTPReceiverChannelVideoPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForRTPSenderChannelMediaBasePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForRTPSenderChannelAudioPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForRTPSenderChannelVideoPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForMediaStreamTrackPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForDeviceResourcePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-    RTPMediaEnginePtr RTPMediaEngine::convert(ForChannelResourcePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPMediaEngine, object);
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => RTPMediaEngineSingleton/RTPMediaEngineRegistration
-    #pragma mark
-    
-    //-------------------------------------------------------------------------
-    PromiseWithRTPMediaEnginePtr RTPMediaEngine::createEnginePromise()
-    {
-      auto singleton = RTPMediaEngineSingleton::singleton();
-      if (!singleton) {
-        return PromiseWithRTPMediaEngine::createRejected(IORTCForInternal::queueORTC());
-      }
-      return singleton->getEngineRegistration()->notify();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr RTPMediaEngine::create(IRTPMediaEngineRegistrationPtr registration)
-    {
-      RTPMediaEnginePtr pThis(make_shared<RTPMediaEngine>(make_private {}, IORTCForInternal::queueBlockingMediaStartStopThread(), registration));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::notify(PromiseWithRTPMediaEnginePtr promise)
-    {
-      IRTPMediaEngineRegistrationPtr registration;
-
-      {
-        AutoRecursiveLock lock(*this);
-        if (!isReady()) {
-          mPendingReady.push_back(promise);
-          return;
-        }
-        registration = mRegistration.lock();
-      }
-
-      if (registration) {
-        promise->resolve(registration->getRTPEngine());
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::shutdown()
-    {
-      AutoRecursiveLock lock(*this);
-
-      // WARNING: Do NOT call cancel directly as this object must only be
-      // shutdown on the object's media queue.
-      setState(State_ShuttingDown);
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForORTC
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::setLogLevel(Log::Level level)
-    {
-      auto engine = RTPMediaEngineSingleton::getEngineIfAlive();
-      if (engine) {
-        engine->internalSetLogLevel(level);
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::ntpServerTime(const Milliseconds &value)
-    {
-			rtc::SyncWithNtp(value.count());
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::startMediaTracing()
-    {
-      auto engine = RTPMediaEngineSingleton::getEngineIfAlive();
-      if (engine) {
-        engine->internalStartMediaTracing();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::stopMediaTracing()
-    {
-      auto engine = RTPMediaEngineSingleton::getEngineIfAlive();
-      if (engine) {
-        engine->internalStopMediaTracing();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::isMediaTracing()
-    {
-      auto engine = RTPMediaEngineSingleton::getEngineIfAlive();
-      if (engine) {
-        return engine->internalIsMediaTracing();
-      }
-      return false;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::saveMediaTrace(String filename)
-    {
-      auto engine = RTPMediaEngineSingleton::getEngineIfAlive();
-      if (engine) {
-        return engine->internalSaveMediaTrace(filename);
-      }
-      return false;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::saveMediaTrace(String host, int port)
-    {
-      auto engine = RTPMediaEngineSingleton::getEngineIfAlive();
-      if (engine) {
-        return engine->internalSaveMediaTrace(host, port);
-      }
-      return false;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::isMRPInstalled()
-    {
-      auto engine = RTPMediaEngineSingleton::getEngineIfAlive();
-      if (engine) {
-        return engine->internalIsMRPInstalled();
-      }
-      return false;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPReceiverChannel
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPReceiverChannelMediaBase
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    PromiseWithRTPMediaEngineChannelResourcePtr RTPMediaEngine::setupChannel(
-                                                                             UseReceiverChannelMediaBasePtr channel,
-                                                                             TransportPtr transport,
-                                                                             UseMediaStreamTrackPtr track,
-                                                                             ParametersPtr parameters,
-                                                                             RTPPacketPtr packet
-                                                                             )
-    {
-      // WARNING - DO NOT ENTER A LOCK!
-
-      auto setup = make_shared<IRTPMediaEngineAsyncDelegate::SetupReceiverChannel>();
-      setup->mRegistration = mRegistration.lock();
-      setup->mPromise = PromiseWithRTPMediaEngineChannelResource::create(IORTCForInternal::queueORTC());
-      setup->mChannel = channel;
-      setup->mTransport = transport;
-      setup->mTrack = track;
-      setup->mParameters = parameters;
-      setup->mPacket = packet;
-
-      IRTPMediaEngineAsyncDelegateProxy::create(mThisWeak.lock())->onSetupReceiverChannel(setup);
-
-      return setup->mPromise;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPReceiverChannelAudio
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPReceiverChannelVideo
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPSenderChannel
-    #pragma mark
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPSenderChannelMediaBase
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    PromiseWithRTPMediaEngineChannelResourcePtr RTPMediaEngine::setupChannel(
-                                                                             UseSenderChannelMediaBasePtr channel,
-                                                                             TransportPtr transport,
-                                                                             UseMediaStreamTrackPtr track,
-                                                                             ParametersPtr parameters,
-                                                                             IDTMFSenderDelegatePtr dtmfDelegate
-                                                                             )
-    {
-      auto setup = make_shared<IRTPMediaEngineAsyncDelegate::SetupSenderChannel>();
-      setup->mRegistration = mRegistration.lock();
-      setup->mPromise = PromiseWithRTPMediaEngineChannelResource::create(IORTCForInternal::queueORTC());
-      setup->mChannel = channel;
-      setup->mTransport = transport;
-      setup->mTrack = track;
-      setup->mParameters = parameters;
-      setup->mDTMFDelegate = dtmfDelegate;
-
-      IRTPMediaEngineAsyncDelegateProxy::create(mThisWeak.lock())->onSetupSenderChannel(setup);
-
-      return setup->mPromise;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPSenderChannelAudio
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPSenderChannelVideo
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForMediaStreamTrack
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    PromiseWithRTPMediaEngineDeviceResourcePtr RTPMediaEngine::setupDevice(UseMediaStreamTrackPtr track)
-    {
-      auto setup = make_shared<IRTPMediaEngineAsyncDelegate::SetupDevice>();
-      setup->mRegistration = mRegistration.lock();
-      setup->mPromise = PromiseWithRTPMediaEngineDeviceResource::create(IORTCForInternal::queueORTC());
-      setup->mTrack = track;
-
-      IRTPMediaEngineAsyncDelegateProxy::create(mThisWeak.lock())->onSetupDevice(setup);
-
-      return setup->mPromise;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForDeviceResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::notifyResourceGone(IDeviceResourceForRTPMediaEngine &inResource)
-    {
-      PUID resourceID = inResource.getID();
-
-      AutoRecursiveLock lock(*this);
-
-      auto found = mDeviceResources.find(resourceID);
-      if (found != mDeviceResources.end()) {
-        mDeviceResources.erase(found);
-      }
-
-      // invoke "step" mechanism again
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineForChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::notifyResourceGone(IChannelResourceForRTPMediaEngine &inResource)
-    {
-      PUID resourceID = inResource.getID();
-
-      AutoRecursiveLock lock(*this);
-
-      auto found = mChannelResources.find(resourceID);
-      if (found != mChannelResources.end()) {
-        mChannelResources.erase(found);
-      }
-
-      // invoke "step" mechanism again
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-    }
-
-    //-------------------------------------------------------------------------
-    webrtc::VoiceEngine *RTPMediaEngine::getVoiceEngine()
-    {
-      return mVoiceEngine.get();
-    }
-
-    //-------------------------------------------------------------------------
-    rtc::scoped_refptr<webrtc::AudioState> RTPMediaEngine::getAudioState()
-    {
-      return mAudioState;
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IWakeDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::onWake()
-    {
-      ZS_LOG_DEBUG(log("wake"))
-
-      AutoRecursiveLock lock(*this);
-      step();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => ITimerDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::onTimer(ITimerPtr timer)
-    {
-      ZS_LOG_DEBUG(log("timer") + ZS_PARAM("timer id", timer->getID()))
-
-      AutoRecursiveLock lock(*this);
-      // NOTE: ADD IF NEEDED...
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => IRTPMediaEngineAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::onSetupSenderChannel(SetupSenderChannelPtr setup)
-    {
-      AutoRecursiveLock lock(*this);
-
-      if (ZS_DYNAMIC_PTR_CAST(IRTPSenderChannelAudioForRTPMediaEngine, setup->mChannel)) {
-        ChannelResourcePtr resource = AudioSenderChannelResource::create(
-                                                                         setup->mRegistration,
-                                                                         setup->mTransport,
-                                                                         setup->mTrack,
-                                                                         setup->mParameters,
-                                                                         setup->mDTMFDelegate
-                                                                         );
-        resource->registerPromise(setup->mPromise);
-        mChannelResources[resource->getID()] = resource;
-        mPendingSetupChannelResources.push_back(resource);
-      } else if (ZS_DYNAMIC_PTR_CAST(IRTPSenderChannelVideoForRTPMediaEngine, setup->mChannel)) {
-        ChannelResourcePtr resource = VideoSenderChannelResource::create(
-                                                                         setup->mRegistration,
-                                                                         setup->mTransport,
-                                                                         setup->mTrack,
-                                                                         setup->mParameters
-                                                                         );
-        resource->registerPromise(setup->mPromise);
-        mChannelResources[resource->getID()] = resource;
-        mPendingSetupChannelResources.push_back(resource);
-      }
-
-      step();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::onSetupReceiverChannel(SetupReceiverChannelPtr setup)
-    {
-      AutoRecursiveLock lock(*this);
-
-      if (ZS_DYNAMIC_PTR_CAST(IRTPReceiverChannelAudioForRTPMediaEngine, setup->mChannel)) {
-        AudioReceiverChannelResourcePtr resource = AudioReceiverChannelResource::create(
-                                                                                        setup->mRegistration,
-                                                                                        setup->mTransport,
-                                                                                        setup->mTrack,
-                                                                                        setup->mParameters,
-                                                                                        setup->mPacket
-                                                                                        );
-        resource->registerPromise(setup->mPromise);
-        mChannelResources[resource->getID()] = resource;
-        mPendingSetupChannelResources.push_back(resource);
-      } else if (ZS_DYNAMIC_PTR_CAST(IRTPReceiverChannelVideoForRTPMediaEngine, setup->mChannel)) {
-        VideoReceiverChannelResourcePtr resource = VideoReceiverChannelResource::create(
-                                                                                        setup->mRegistration,
-                                                                                        setup->mTransport,
-                                                                                        setup->mTrack,
-                                                                                        setup->mParameters,
-                                                                                        setup->mPacket
-                                                                                        );
-        resource->registerPromise(setup->mPromise);
-        mChannelResources[resource->getID()] = resource;
-        mPendingSetupChannelResources.push_back(resource);
-      }
-
-      step();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::onSetupDevice(SetupDevicePtr setup)
-    {
-      AutoRecursiveLock lock(*this);
-      DeviceResourcePtr resource = DeviceResource::create(
-                                                         setup->mRegistration,
-                                                         setup->mTrack
-                                                         );
-
-      resource->registerPromise(setup->mPromise);
-
-      mDeviceResources[resource->getID()] = resource;
-      mPendingSetupDeviceResources.push_back(resource);
-
-      step();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => (friend DeviceResource)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::shutdownDeviceResource(DeviceResourcePtr deviceResource)
-    {
-      {
-        AutoRecursiveLock lock(*this);
-        mPendingCloseDeviceResources.push_back(deviceResource);
-      }
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => webrtc::SetupEventTracer
-    #pragma mark
-
-#if defined(WINRT)
-    const unsigned char *RTPMediaEngine::GetCategoryGroupEnabled(const char *categoryGroup)
-    {
-      return reinterpret_cast<const unsigned char*>("webrtc");
-    }
-
-    void __cdecl RTPMediaEngine::AddTraceEvent(
-                                               char phase,
-                                               const unsigned char *categoryGroupEnabled,
-                                               const char *name,
-                                               uint64 id,
-                                               int numArgs,
-                                               const char **argNames,
-                                               const unsigned char *argTypes,
-                                               const uint64 *argValues,
-                                               unsigned char flags
-                                               )
-    {
-      auto engine = RTPMediaEngineSingleton::getEngineIfAlive();
-      if (engine) {
-        engine->internalAddTraceEvent(phase, categoryGroupEnabled, name, id,
-          numArgs, argNames, argTypes, argValues, flags);
-      }
-    }
-#endif
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => (friend ChannelResource)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::shutdownChannelResource(ChannelResourcePtr channelResource)
-    {
-      {
-        AutoRecursiveLock lock(*this);
-        mPendingCloseChannelResources.push_back(channelResource);
-      }
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine => (internal)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPMediaEngine::log(const char *message) const
-    {
-      ElementPtr objectEl = Element::create("ortc::RTPMediaEngine");
-      IHelper::debugAppend(objectEl, "id", mID);
-      return Log::Params(message, objectEl);
-    }
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPMediaEngine::debug(const char *message) const
-    {
-      return Log::Params(message, toDebug());
-    }
-
-    //-------------------------------------------------------------------------
-    ElementPtr RTPMediaEngine::toDebug() const
-    {
-      AutoRecursiveLock lock(*this);
-
-      ElementPtr resultEl = Element::create("ortc::RTPMediaEngine");
-
-      IHelper::debugAppend(resultEl, "id", mID);
-
-      IHelper::debugAppend(resultEl, "graceful shutdown", (bool)mGracefulShutdownReference);
-
-      IHelper::debugAppend(resultEl, "state", toString(mCurrentState));
-
-      IHelper::debugAppend(resultEl, "error", mLastError);
-      IHelper::debugAppend(resultEl, "error reason", mLastErrorReason);
-
-      auto registration = mRegistration.lock();
-      IHelper::debugAppend(resultEl, "registration", (bool)registration);
-
-      IHelper::debugAppend(resultEl, "pending ready", mPendingReady.size());
-
-      IHelper::debugAppend(resultEl, "device resources", mDeviceResources.size());
-      IHelper::debugAppend(resultEl, "pending setup device resources", mPendingSetupDeviceResources.size());
-      IHelper::debugAppend(resultEl, "pending close device resources", mPendingCloseDeviceResources.size());
-
-      IHelper::debugAppend(resultEl, "channel resources", mChannelResources.size());
-      IHelper::debugAppend(resultEl, "pending setup channel resources", mPendingSetupChannelResources.size());
-      IHelper::debugAppend(resultEl, "pending close channel resources", mPendingCloseChannelResources.size());
-
-      return resultEl;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::internalSetLogLevel(Log::Level level)
-    {
-      webrtc::TraceLevel traceLevel {webrtc::kTraceAll};
-      rtc::LoggingSeverity rtcLevel {rtc::LS_INFO};
-
-      switch (level)
-      {
-        case Log::Level::None:    rtcLevel = rtc::LS_NONE; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceNone); break;
-        case Log::Level::Basic:   rtcLevel = rtc::LS_ERROR; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceCritical | webrtc::kTraceError); break;
-        case Log::Level::Detail:  rtcLevel = rtc::LS_WARNING; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceWarning | webrtc::kTraceError | webrtc::kTraceCritical); break;
-        case Log::Level::Debug:   rtcLevel = rtc::LS_INFO; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceDefault); break;
-        case Log::Level::Trace:   rtcLevel = rtc::LS_VERBOSE; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceDefault | webrtc::kTraceModuleCall | webrtc::kTraceTimer | webrtc::kTraceDebug); break;
-        case Log::Level::Insane:  rtcLevel = rtc::LS_SENSITIVE; traceLevel = static_cast<webrtc::TraceLevel>(webrtc::kTraceAll); break;
-      }
-
-      rtc::LogMessage::RemoveLogToStream(mLogSink.get());
-      rtc::LogMessage::AddLogToStream(mLogSink.get(), rtcLevel);
-
-      webrtc::Trace::set_level_filter(traceLevel);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::internalStartMediaTracing()
-    {
-      mTraceLog.EnableTraceInternalStorage();
-      mTraceLog.StartTracing();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::internalStopMediaTracing()
-    {
-      mTraceLog.StopTracing();
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::internalIsMediaTracing()
-    {
-      return mTraceLog.IsTracing();
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::internalSaveMediaTrace(String filename)
-    {
-      return mTraceLog.Save(filename);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::internalSaveMediaTrace(String host, int port)
-    {
-      return mTraceLog.Save(host, port);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::internalAddTraceEvent(
-                                               char phase,
-                                               const unsigned char *categoryGroupEnabled,
-                                               const char *name,
-                                               uint64_t id,
-                                               int numArgs,
-                                               const char **argNames,
-                                               const unsigned char *argTypes,
-                                               const uint64_t *argValues,
-                                               unsigned char flags
-                                               )
-    {
-      mTraceLog.Add(phase, categoryGroupEnabled, name, id,
-        numArgs, argNames, argTypes, argValues, flags);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::internalIsMRPInstalled()
-    {
-      static bool isMRPInstalledValueSet = false;
-      static bool isMRPInstalled = false;
-
-      if (isMRPInstalledValueSet)
-        return isMRPInstalled;
-
-      // MFStartup fails when Media Resource Pack is not installed.
-      if (SUCCEEDED(MFStartup(MF_VERSION)))
-      {
-        MFShutdown();
-        isMRPInstalled = true;
-        isMRPInstalledValueSet = true;
-      }
-      return isMRPInstalled;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::isReady() const
-    {
-      return State_Ready == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::isShuttingDown() const
-    {
-      return State_ShuttingDown == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::isShutdown() const
-    {
-      return State_Shutdown == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::step()
-    {
-      ZS_LOG_DEBUG(debug("step"))
-
-      if ((isShuttingDown()) ||
-          (isShutdown())) {
-        ZS_LOG_DEBUG(debug("step forwarding to cancel"))
-        stepCancel();
-        return;
-      }
-
-      // ... other steps here ...
-      if (!stepSetup()) goto not_ready;
-      if (!stepSetupDevices()) goto not_ready;
-      if (!stepSetupChannels()) goto not_ready;
-      if (!stepCloseChannels()) goto not_ready;
-      // ... other steps here ...
-
-      goto ready;
-
-    not_ready:
-      {
-        ZS_LOG_TRACE(debug("not ready"))
-        return;
-      }
-
-    ready:
-      {
-        ZS_LOG_TRACE(log("ready"))
-        setState(State_Ready);
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::stepSetup()
-    {
-      if (isReady()) {
-        ZS_LOG_TRACE(log("already setup"))
-        return true;
-      }
-
-      if (!isMRPInstalled())
-        return true;
-
-      mVoiceEngine = rtc::scoped_ptr<webrtc::VoiceEngine, VoiceEngineDeleter>(webrtc::VoiceEngine::Create());
-
-      webrtc::VoEBase::GetInterface(mVoiceEngine.get())->Init();
-
-      webrtc::AudioState::Config audioStateConfig;
-      audioStateConfig.voice_engine = mVoiceEngine.get();
-      mAudioState = rtc::scoped_refptr<webrtc::AudioState>(webrtc::AudioState::Create(audioStateConfig));
-
-      webrtc::EcModes ecMode = webrtc::kEcConference;
-      webrtc::AecmModes aecmMode = webrtc::kAecmSpeakerphone;
-      webrtc::AgcModes agcMode = webrtc::kAgcAdaptiveAnalog;
-      webrtc::NsModes nsMode = webrtc::kNsHighSuppression;
-#if defined(WINRT)
-      ecMode = webrtc::kEcAecm;
-#endif
-
-      if (webrtc::VoEHardware::GetInterface(mVoiceEngine.get())->BuiltInAECIsAvailable())
-        webrtc::VoEHardware::GetInterface(mVoiceEngine.get())->EnableBuiltInAEC(true);
-      webrtc::VoEAudioProcessing::GetInterface(mVoiceEngine.get())->SetEcStatus(true, ecMode);
-#if !defined(WINRT)
-      webrtc::VoEAudioProcessing::GetInterface(mVoiceEngine.get())->SetEcMetricsStatus(true);
-#endif
-      if (ecMode == webrtc::kEcAecm)
-        webrtc::VoEAudioProcessing::GetInterface(mVoiceEngine.get())->SetAecmMode(aecmMode);
-
-      if (webrtc::VoEHardware::GetInterface(mVoiceEngine.get())->BuiltInAGCIsAvailable())
-        webrtc::VoEHardware::GetInterface(mVoiceEngine.get())->EnableBuiltInAGC(true);
-      webrtc::VoEAudioProcessing::GetInterface(mVoiceEngine.get())->SetAgcStatus(true, agcMode);
-
-      if (webrtc::VoEHardware::GetInterface(mVoiceEngine.get())->BuiltInNSIsAvailable())
-        webrtc::VoEHardware::GetInterface(mVoiceEngine.get())->EnableBuiltInNS(true);
-      webrtc::VoEAudioProcessing::GetInterface(mVoiceEngine.get())->SetNsStatus(true, nsMode);
-
-      webrtc::VoEAudioProcessing::GetInterface(mVoiceEngine.get())->EnableHighPassFilter(true);
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::stepSetupDevices()
-    {
-      if (!isMRPInstalled())
-        return true;
-
-      while (mPendingSetupDeviceResources.size() > 0) {
-        auto deviceResource = mPendingSetupDeviceResources.front();
-
-        deviceResource->stepSetup();
-
-        mPendingSetupDeviceResources.pop_front();
-      }
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::stepCloseDevices()
-    {
-      if (!isMRPInstalled())
-        return true;
-
-      while (mPendingCloseDeviceResources.size() > 0) {
-        auto deviceResource = mPendingCloseDeviceResources.front();
-
-        deviceResource->stepShutdown();
-
-        mPendingCloseDeviceResources.pop_front();
-      }
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::stepSetupChannels()
-    {
-      if (!isMRPInstalled())
-        return true;
-
-      while (mPendingSetupChannelResources.size() > 0) {
-        auto channelResource = mPendingSetupChannelResources.front();
-
-        channelResource->stepSetup();
-
-        mPendingSetupChannelResources.pop_front();
-      }
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::stepCloseChannels()
-    {
-      if (!isMRPInstalled())
-        return true;
-
-      while (mPendingCloseChannelResources.size() > 0) {
-        auto channelResource = mPendingCloseChannelResources.front();
-
-        channelResource->stepShutdown();
-        
-        mPendingCloseChannelResources.pop_front();
-      }
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::cancel()
-    {
-      //.......................................................................
-      // try to gracefully shutdown
-
-      if (isShutdown()) return;
-
-      setState(State_ShuttingDown);
-
-      if (!mGracefulShutdownReference) mGracefulShutdownReference = mThisWeak.lock();
-
-      {
-        for (auto iter = mPendingSetupChannelResources.begin(); iter != mPendingSetupChannelResources.end(); ++iter)
-        {
-          auto channelResource = (*iter);
-          channelResource->notifyPromisesReject();
-        }
-        mPendingSetupChannelResources.clear();
-      }
-
-      if (mGracefulShutdownReference) {
-        // perform any graceful asynchronous shutdown processes needed and
-        // re-attempt shutdown again later if needed.
-
-#define TODO_IMPLEMENT_MEDIA_GRACEFUL_SHUTDOWN 1
-#define TODO_IMPLEMENT_MEDIA_GRACEFUL_SHUTDOWN 2
-//        return;
-      }
-
-      //.......................................................................
-      // final cleanup (hard shutdown)
-
-      setState(State_Shutdown);
-
-#define TODO_IMPLEMENT_MEDIA_HARD_SHUTDOWN 1
-#define TODO_IMPLEMENT_MEDIA_HARD_SHUTDOWN 2
-
-      // resolve any outstanding promises
-      {
-        auto registration = mRegistration.lock();
-        while (mPendingReady.size() > 0)
-        {
-          auto &front = mPendingReady.front();
-          if (registration) {
-            front->resolve(registration);
-          } else {
-            front->reject();
-          }
-          mPendingReady.pop_front();
-        }
-      }
-
-      // make sure to cleanup any final reference to self
-      mGracefulShutdownReference.reset();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::stepCancel()
-    {
-      {
-        for (auto iter = mPendingCloseChannelResources.begin(); iter != mPendingCloseChannelResources.end(); ++iter)
-        {
-          auto channelResource = (*iter);
-          channelResource->stepShutdown();
-        }
-        mPendingCloseChannelResources.clear();
-      }
-
-      {
-        for (auto iter = mChannelResources.begin(); iter != mChannelResources.end(); ++iter)
-        {
-          auto channelResource = (*iter).second.lock();
-          channelResource->stepShutdown();
-        }
-
-        mChannelResources.clear();
-      }
-      cancel();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::setState(States state)
-    {
-      if (state == mCurrentState) return;
-
-      ZS_LOG_DETAIL(debug("state changed") + ZS_PARAM("new state", toString(state)) + ZS_PARAM("old state", toString(mCurrentState)))
-
-      mCurrentState = state;
-
-      if (isReady()) {
-        auto registration = mRegistration.lock();
-
-        while (mPendingReady.size() > 0)
-        {
-          auto &front = mPendingReady.front();
-          if (registration) {
-            front->resolve(registration->getRTPEngine());
-          } else {
-            front->reject();
-          }
-          mPendingReady.pop_front();
-        }
-      }
-
-//      RTPMediaEnginePtr pThis = mThisWeak.lock();
-//      if (pThis) {
-//        mSubscriptions.delegate()->onRTPMediaEngineStateChanged(pThis, mCurrentState);
-//      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::setError(WORD errorCode, const char *inReason)
-    {
-      String reason(inReason);
-      if (reason.isEmpty()) {
-        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
-      }
-
-      if (0 != mLastError) {
-        ZS_LOG_WARNING(Detail, debug("error already set thus ignoring new error") + ZS_PARAM("new error", errorCode) + ZS_PARAM("new reason", reason))
-        return;
-      }
-
-      mLastError = errorCode;
-      mLastErrorReason = reason;
-
-      ZS_LOG_WARNING(Detail, debug("error set") + ZS_PARAM("error", mLastError) + ZS_PARAM("reason", mLastErrorReason))
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::WebRtcTraceCallback
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::WebRtcTraceCallback::Print(webrtc::TraceLevel trace, const char* message, int length)
-    {
-      static const size_t stripLength = 34;
-
-      Log::Severity severity {Log::Severity::Informational};
-      Log::Level level {Log::Level::Basic};
-
-      switch (trace)
-      {
-        case webrtc::kTraceNone:        level = Log::Level::None; break;
-        case webrtc::kTraceStateInfo:   level = Log::Level::Debug; break;
-        case webrtc::kTraceCritical:    severity = Log::Severity::Fatal; level = Log::Level::Basic; break;
-        case webrtc::kTraceError:       severity = Log::Severity::Error; level = Log::Level::Basic; break;
-        case webrtc::kTraceWarning:     severity = Log::Severity::Warning; level = Log::Level::Detail; break;
-        case webrtc::kTraceApiCall:     level = Log::Level::Debug; break;
-        case webrtc::kTraceDefault:     level = Log::Level::Debug; break;
-        case webrtc::kTraceModuleCall:  level = Log::Level::Trace; break;
-        case webrtc::kTraceMemory:      level = Log::Level::Trace; break;
-        case webrtc::kTraceTimer:       level = Log::Level::Trace; break;
-        case webrtc::kTraceStream:      level = Log::Level::Insane; break;
-        case webrtc::kTraceDebug:       level = Log::Level::Insane; break;
-        case webrtc::kTraceInfo:        level = Log::Level::Insane; break;
-        case webrtc::kTraceTerseInfo:   level = Log::Level::Insane; break;
-        case webrtc::kTraceAll:         level = Log::Level::Insane; break;
-      }
-
-      // Skip past boilerplate prefix text
-      if (length < stripLength) {
-        std::string msg(message, length);
-        webrtcTrace(Log::Severity::Error, Log::Level::Basic, (std::string("Malformed webrtc log message: ") + msg).c_str());
-      } else {
-        std::string msg(message + (stripLength-1), length - stripLength);
-        webrtcTrace(severity, level, msg.c_str());
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::WebRtcTraceCallback
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::WebRtcLogSink::OnLogMessage(const std::string& message)
-    {
-      if (message.length() < 1) return;
-
-      bool hasEOL = ('\n' == message[message.length() - 1]);
-     
-      std::string msg(message.c_str(), message.length() - (hasEOL ? 1 : 0));
-
-      webrtcTrace(Log::Severity::Informational, Log::Level::Basic, msg.c_str());
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::BaseResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::BaseResource::BaseResource(
-                                               const make_private &,
-                                               IRTPMediaEngineRegistrationPtr registration,
-                                               RTPMediaEnginePtr engine
-                                               ) :
-      SharedRecursiveLock(engine ? SharedRecursiveLock(engine->getSharedLock()) : SharedRecursiveLock::create()),
-      MessageQueueAssociator(engine ? engine->getAssociatedMessageQueue() : IORTCForInternal::queueBlockingMediaStartStopThread()),
-      mMediaEngine(engine),
-      mRegistration(registration)
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::BaseResource::~BaseResource()
-    {
-      mThisWeak.reset();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::BaseResource::notifyPromisesResolve()
-    {
-      {
-        AutoRecursiveLock lock(*this);
-        mNotifiedReady = true;
-      }
-      internalFixState();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::BaseResource::notifyPromisesReject()
-    {
-      {
-        AutoRecursiveLock lock(*this);
-        mNotifiedRejected = true;
-      }
-      internalFixState();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::BaseResource => (internal)
-    #pragma mark
-
-
-    //-------------------------------------------------------------------------
-    IMessageQueuePtr RTPMediaEngine::BaseResource::delegateQueue()
-    {
-      return IORTCForInternal::queueORTC();
-    }
-
-    //-------------------------------------------------------------------------
-    PromisePtr RTPMediaEngine::BaseResource::internalSetupPromise(PromisePtr promise)
-    {
-      auto lifetime = make_shared<LifetimeHolder>(mThisWeak.lock());
-      promise->setReferenceHolder(lifetime);
-
-      {
-        AutoRecursiveLock lock(*this);
-        mPendingPromises.push_back(promise);
-      }
-      internalFixState();
-      return promise;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::BaseResource::internalFixState()
-    {
-      PendingPromiseList promises;
-
-      {
-        AutoRecursiveLock lock(*this);
-
-        {
-          if (mNotifiedRejected) goto prepare_reject_all;
-          if (mNotifiedReady) goto prepare_resolve_all;
-          return;
-        }
-
-      prepare_resolve_all:
-        {
-          promises = mPendingPromises;
-          mPendingPromises.clear();
-          goto resolve_all;
-        }
-
-      prepare_reject_all:
-        {
-          promises = mPendingPromises;
-          mPendingPromises.clear();
-          goto reject_all;
-        }
-      }
-
-    resolve_all:
-      {
-        for (auto iter = promises.begin(); iter != promises.end(); ++iter) {
-          auto promise = (*iter).lock();
-          if (!promise) continue;
-          promise->resolve(mThisWeak.lock());
-        }
-        return;
-      }
-
-    reject_all:
-      {
-        for (auto iter = promises.begin(); iter != promises.end(); ++iter) {
-          auto promise = (*iter).lock();
-          if (!promise) continue;
-          promise->reject();
-        }
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::DeviceResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::DeviceResource::DeviceResource(
-                                                   const make_private &priv,
-                                                   IRTPMediaEngineRegistrationPtr registration,
-                                                   UseMediaStreamTrackPtr track
-                                                   ) :
-      BaseResource(priv, registration, registration ? registration->getRTPEngine() : RTPMediaEnginePtr()),
-      mTrack(track)
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::DeviceResource::~DeviceResource()
-    {
-      mThisWeak.reset();  // shared pointer to self is no longer valid
-
-      // inform the rtp media engine of this resource no longer being in use
-      UseEnginePtr engine = getEngine<UseEngine>();
-      if (engine) {
-        engine->notifyResourceGone(*this);
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::DeviceResourcePtr RTPMediaEngine::DeviceResource::create(
-                                                                             IRTPMediaEngineRegistrationPtr registration,
-                                                                             UseMediaStreamTrackPtr track
-                                                                             )
-    {
-      auto pThis = make_shared<DeviceResource>(
-                                               make_private{},
-                                               registration,
-                                               track
-                                               );
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::lifetimeHolderGone()
-    {
-      auto shutdownPromise = shutdown();
-      if (shutdownPromise) {
-        // don't really care about result
-        shutdownPromise->then(IPromiseDelegateProxy::createNoop(IORTCForInternal::queueBlockingMediaStartStopThread()));
-        shutdownPromise->background();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::init()
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::DeviceResource => IRTPMediaEngineDeviceResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    String RTPMediaEngine::DeviceResource::getDeviceID() const
-    {
-      return mDeviceID;
-    }
-
-    //-------------------------------------------------------------------------
-    PromisePtr RTPMediaEngine::DeviceResource::shutdown()
-    {
-      PromisePtr promise = getShutdownPromise();
-      if (isShutdown()) return promise;
-      if (mShuttingDown) return promise;
-
-      mShuttingDown = true;
-
-      auto outer = mMediaEngine.lock();
-      if (outer) {
-        outer->shutdownDeviceResource(ZS_DYNAMIC_PTR_CAST(DeviceResource, mThisWeak.lock()));
-      } else {
-        stepShutdown();
-      }
-      return promise;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::stop()
-    {
-      AutoRecursiveLock lock(*this);
-
-      if (mVideoCaptureModule) {
-        mVideoCaptureModule->StopCapture();
-        mVideoCaptureModule->DeRegisterCaptureDataCallback();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::updateConstraints(PromisePtr promise, TrackConstraintsPtr constraints)
-    {
-      auto pThis = ZS_DYNAMIC_PTR_CAST(DeviceResource, mThisWeak.lock());
-      IRTPMediaEngineDeviceResourceAsyncDelegateProxy::create(pThis)->onUpdateConstraints(promise, constraints);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats)
-    {
-      auto pThis = ZS_DYNAMIC_PTR_CAST(DeviceResource, mThisWeak.lock());
-      IRTPMediaEngineDeviceResourceAsyncDelegateProxy::create(pThis)->onProvideStats(promise, stats);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::setVideoRenderCallback(IMediaStreamTrackRenderCallbackPtr callback)
-    {
-      auto track = mTrack.lock();
-      if (!track) return;
-      auto kind = track->kind();
-
-      AutoRecursiveLock lock(*this);
-
-      if (kind == Kinds::Kind_Video) {
-        mVideoRenderCallbackReferenceHolder = callback;
-        mVideoRendererCallback = dynamic_cast<webrtc::VideoRenderCallback*>(callback.get());
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::renderVideoFrame(VideoFramePtr videoFrame)
-    {
-      ++mFramesReceived;
-
-      auto track = mTrack.lock();
-      if (!track) return;
-
-      auto settings = track->getSettings();
-      if (!settings) return;
-
-      AutoRecursiveLock lock(*this);
-
-      if (mVideoRendererCallback) {
-        mVideoRendererCallback->RenderFrame(1, *videoFrame);
-      }
-
-      if (!settings->mWidth.hasValue() || (settings->mWidth != videoFrame->width()))
-        settings->mWidth = videoFrame->width();
-      if (!settings->mHeight.hasValue() || (settings->mHeight != videoFrame->height()))
-        settings->mHeight = videoFrame->height();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::setFrameCount()
-    {
-      AutoRecursiveLock lock(*this);
-
-      if (mFramesSent > 5) {
-        mAverageFramesSent += mFramesSent;
-      }
-      if (mFramesReceived > 5) {
-        mAverageFramesReceived += mFramesReceived;
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::DeviceResource => IRTPMediaEngineDeviceResourceAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::onUpdateConstraints(PromisePtr promise, TrackConstraintsPtr constraints)
-    {
-      auto track = mTrack.lock();
-      if (!track) return;
-
-      auto settings = track->getSettings();
-      if (!settings) return;
-
-      auto kind = track->kind();
-      auto remote = track->remote();
-
-      AutoRecursiveLock lock(*this);
-
-      if (kind == Kinds::Kind_Audio && remote) {
-
-        mDeviceID = constraints->mAdvanced.front()->mDeviceID.mValue.value().mValue.value();
-
-        auto engine = mMediaEngine.lock();
-        if (!engine) return;
-
-        auto voiceEngine = engine->getVoiceEngine();
-        if (!voiceEngine) return;
-
-        int audioDeviceIndex = getAudioDeviceIndex(voiceEngine, mDeviceID);
-
-        if (webrtc::VoEHardware::GetInterface(voiceEngine)->SetPlayoutDevice(audioDeviceIndex) == -1) {
-          return;
-        }
-
-        settings->mDeviceID = mDeviceID;
-      }
-
-      promise->resolve();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats)
-    {
-      auto track = mTrack.lock();
-      if (!track) return;
-
-      auto remote = track->remote();
-      auto id = track->id();
-
-      auto settings = track->getSettings();
-      if (!settings) return;
-
-      AutoRecursiveLock lock(*this);
-
-      UseStatsReport::StatMap reportStats;
-
-      if (stats.hasStatType(IStatsReportTypes::StatsTypes::StatsType_Track)) {
-
-        auto report = make_shared<IStatsReport::MediaStreamTrackStats>();
-
-        decltype(report->mFramesPerSecond) framesPerSecond{};
-
-        if (!remote)
-          framesPerSecond = mAverageFramesSent.value<decltype(framesPerSecond)>();
-        else
-          framesPerSecond = mAverageFramesReceived.value<decltype(framesPerSecond)>();
-
-        report->mID = id;
-        report->mTrackID = id;
-        report->mRemoteSource = remote;
-        report->mFrameWidth = settings->mWidth.hasValue() ? settings->mWidth : 0;
-        report->mFrameHeight = settings->mHeight.hasValue() ? settings->mHeight : 0;
-        report->mFramesPerSecond = framesPerSecond;
-        report->mFramesSent = mFramesSent;
-        report->mFramesReceived = mFramesReceived;
-        report->mAudioLevel = 0.0;
-
-        reportStats[report->mID] = report;
-      }
-
-      promise->resolve(UseStatsReport::create(reportStats));
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::onCapturedVideoFrame(VideoFramePtr frame)
-    {
-      UseMediaStreamTrackPtr track = mTrack.lock();
-
-      {
-        AutoRecursiveLock lock(*this);
-
-        if (mVideoRendererCallback) mVideoRendererCallback->RenderFrame(1, *frame);
-      }
-
-      if (!track) return;
-
-      track->sendCapturedVideoFrame(frame);
-      ++mFramesSent;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::DeviceResource => friend RTPMediaEngine
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::stepSetup()
-    {
-      auto track = mTrack.lock();
-      if (!track) {
-        notifyPromisesReject();
-        return;
-      }
-
-      auto settings = track->getSettings();
-      if (!settings) {
-        notifyPromisesReject();
-        return;
-      }
-
-      auto kind = track->kind();
-      auto remote = track->remote();
-
-      auto constraints = track->getConstraints();
-      auto pThis = ZS_DYNAMIC_PTR_CAST(DeviceResource, mThisWeak.lock());
-
-      AutoRecursiveLock lock(*this);
-
-      mTransport = VideoCaptureTransport::create(pThis);
-
-      if (kind == Kinds::Kind_Video && !remote) {
-        if (!constraints) {
-          notifyPromisesReject();
-          return;
-        }
-
-        mDeviceID = constraints->mAdvanced.front()->mDeviceID.mValue.value().mValue.value();
-        mVideoCaptureModule = webrtc::VideoCaptureFactory::Create(0, mDeviceID.c_str());
-        if (!mVideoCaptureModule) {
-          return;
-        }
-
-        mVideoCaptureModule->AddRef();
-
-        mVideoCaptureModule->RegisterCaptureDataCallback(*mTransport);
-
-        webrtc::VideoCaptureModule::DeviceInfo* info = webrtc::VideoCaptureFactory::CreateDeviceInfo(0);
-        if (!info) return;
-
-        std::list<VideoCaptureCapabilityWithDistance> capabilityCandidates;
-        int32_t numCapabilities = info->NumberOfCapabilities(mDeviceID.c_str());
-        for (INT i = 0; i < numCapabilities; ++i) {
-          webrtc::VideoCaptureCapability capability;
-          if (info->GetCapability(mDeviceID.c_str(), i, capability) == -1)
-            continue;
-          ConstrainLongRange widthRange;
-          ConstrainLongRange heightRange;
-          if (constraints->mWidth.mValue.hasValue())
-            widthRange.mIdeal = constraints->mWidth.mValue.value();
-          if (constraints->mHeight.mValue.hasValue())
-            heightRange.mIdeal = constraints->mHeight.mValue.value();
-          if (constraints->mWidth.mRange.hasValue())
-            widthRange = constraints->mWidth.mRange;
-          if (constraints->mHeight.mRange.hasValue())
-            heightRange = constraints->mHeight.mRange;
-          FLOAT sizeDistance = calculateSizeDistance(widthRange, heightRange, capability);
-          if (sizeDistance == FLT_MAX)
-            continue;
-          ConstrainDoubleRange frameRateRange;
-          if (constraints->mFrameRate.mValue.hasValue())
-            frameRateRange.mIdeal = constraints->mFrameRate.mValue.value();
-          if (constraints->mFrameRate.mRange.hasValue())
-            frameRateRange = constraints->mFrameRate.mRange;
-          FLOAT frameRateDistance = calculateFrameRateDistance(frameRateRange, capability);
-          if (frameRateDistance == FLT_MAX)
-            continue;
-          ConstrainDoubleRange aspectRatioRange;
-          if (constraints->mAspectRatio.mValue.hasValue())
-            aspectRatioRange.mIdeal = constraints->mAspectRatio.mValue.value();
-          if (constraints->mAspectRatio.mRange.hasValue())
-            aspectRatioRange = constraints->mAspectRatio.mRange;
-          FLOAT aspectRatioDistance = calculateAspectRatioDistance(aspectRatioRange, capability);
-          if (aspectRatioDistance == FLT_MAX)
-            continue;
-          FLOAT formatDistance = calculateFormatDistance(capability);
-          FLOAT totalDistance = 200.0F * sizeDistance + 20.0F * frameRateDistance + 10.0F * aspectRatioDistance + formatDistance;
-          VideoCaptureCapabilityWithDistance capabilityWithDistance;
-          capabilityWithDistance.mCapability = capability;
-          capabilityWithDistance.mDistance = totalDistance;
-          capabilityCandidates.push_back(capabilityWithDistance);
-        }
-        delete info;
-
-        std::list<VideoCaptureCapabilityWithDistance> advancedCapabilityCandidates;
-        std::list<ConstraintSetPtr>::iterator constraintsIter = constraints->mAdvanced.begin();
-        while (constraintsIter != constraints->mAdvanced.end()) {
-          std::list<VideoCaptureCapabilityWithDistance>::iterator capabilityCandidatesIter = capabilityCandidates.begin();
-          while (capabilityCandidatesIter != capabilityCandidates.end()) {
-            ConstrainLongRange widthRange;
-            ConstrainLongRange heightRange;
-            if ((*constraintsIter)->mWidth.mValue.hasValue())
-              widthRange.mExact = (*constraintsIter)->mWidth.mValue.value();
-            if ((*constraintsIter)->mHeight.mValue.hasValue())
-              heightRange.mExact = (*constraintsIter)->mHeight.mValue.value();
-            if ((*constraintsIter)->mWidth.mRange.hasValue())
-              widthRange = (*constraintsIter)->mWidth.mRange;
-            if ((*constraintsIter)->mHeight.mRange.hasValue())
-              heightRange = (*constraintsIter)->mHeight.mRange;
-            FLOAT sizeDistance = calculateSizeDistance(widthRange, heightRange, capabilityCandidatesIter->mCapability);
-            if (sizeDistance == FLT_MAX) {
-              capabilityCandidatesIter++;
-              continue;
-            }
-            ConstrainDoubleRange frameRateRange;
-            if ((*constraintsIter)->mFrameRate.mValue.hasValue())
-              frameRateRange.mExact = (*constraintsIter)->mFrameRate.mValue.value();
-            if ((*constraintsIter)->mFrameRate.mRange.hasValue())
-              frameRateRange = (*constraintsIter)->mFrameRate.mRange;
-            FLOAT frameRateDistance = calculateFrameRateDistance(frameRateRange, capabilityCandidatesIter->mCapability);
-            if (frameRateDistance == FLT_MAX) {
-              capabilityCandidatesIter++;
-              continue;
-            }
-            ConstrainDoubleRange aspectRatioRange;
-            if ((*constraintsIter)->mAspectRatio.mValue.hasValue())
-              aspectRatioRange.mExact = (*constraintsIter)->mAspectRatio.mValue.value();
-            if ((*constraintsIter)->mAspectRatio.mRange.hasValue())
-              aspectRatioRange = (*constraintsIter)->mAspectRatio.mRange;
-            FLOAT aspectRatioDistance = calculateAspectRatioDistance(aspectRatioRange, capabilityCandidatesIter->mCapability);
-            if (aspectRatioDistance == FLT_MAX) {
-              capabilityCandidatesIter++;
-              continue;
-            }
-            FLOAT formatDistance = calculateFormatDistance(capabilityCandidatesIter->mCapability);
-            FLOAT totalDistance = 200.0F * sizeDistance + 20.0F * frameRateDistance + 10.0F * aspectRatioDistance + formatDistance;
-            VideoCaptureCapabilityWithDistance capabilityWithDistance;
-            capabilityWithDistance.mCapability = capabilityCandidatesIter->mCapability;
-            capabilityWithDistance.mDistance = totalDistance;
-            advancedCapabilityCandidates.push_back(capabilityWithDistance);
-            capabilityCandidatesIter++;
-          }
-          if (advancedCapabilityCandidates.size() > 0)
-            break;
-          constraintsIter++;
-        }
-
-        FLOAT bestDistance = FLT_MAX;
-        webrtc::VideoCaptureCapability bestCapability;
-        if (advancedCapabilityCandidates.size() > 0) {
-          std::list<VideoCaptureCapabilityWithDistance>::iterator advancedCapabilityCandidatesIter = advancedCapabilityCandidates.begin();
-          while (advancedCapabilityCandidatesIter != advancedCapabilityCandidates.end()) {
-            if (advancedCapabilityCandidatesIter->mDistance <= bestDistance) {
-              bestDistance = advancedCapabilityCandidatesIter->mDistance;
-              bestCapability = advancedCapabilityCandidatesIter->mCapability;
-            }
-            advancedCapabilityCandidatesIter++;
-          }
-        } else if (advancedCapabilityCandidates.size() > 0) {
-          std::list<VideoCaptureCapabilityWithDistance>::iterator capabilityCandidatesIter = capabilityCandidates.begin();
-          while (capabilityCandidatesIter != capabilityCandidates.end()) {
-            if (capabilityCandidatesIter->mDistance <= bestDistance) {
-              bestDistance = capabilityCandidatesIter->mDistance;
-              bestCapability = capabilityCandidatesIter->mCapability;
-            }
-            capabilityCandidatesIter++;
-          }
-        }
-
-        if (bestDistance == FLT_MAX)
-          return;
-
-        settings->mWidth = bestCapability.width;
-        settings->mHeight = bestCapability.height;
-        settings->mFrameRate = bestCapability.maxFPS;
-        settings->mDeviceID = mDeviceID;
-
-        if (mVideoCaptureModule->StartCapture(bestCapability) != 0) {
-          mVideoCaptureModule->DeRegisterCaptureDataCallback();
-          return;
-        }
-      } else if (kind == Kinds::Kind_Audio && !remote) {
-
-        if (!constraints) {
-          notifyPromisesReject();
-          return;
-        }
-
-        mDeviceID = constraints->mAdvanced.front()->mDeviceID.mValue.value().mValue.value();
-
-        auto engine = mMediaEngine.lock();
-        if (!engine) return;
-
-        auto voiceEngine = engine->getVoiceEngine();
-        if (!voiceEngine) return;
-
-        int audioDeviceIndex = getAudioDeviceIndex(voiceEngine, mDeviceID);
-
-        if (webrtc::VoEHardware::GetInterface(voiceEngine)->SetRecordingDevice(audioDeviceIndex) == -1) {
-          return;
-        }
-
-        settings->mDeviceID = mDeviceID;
-      }
-
-      notifyPromisesResolve();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::stepShutdown()
-    {
-      mDenyNonLockedAccess = true;
-
-      // rare race condition that can happen so
-      while (mAccessFromNonLockedMethods > 0)
-      {
-        // NOTE: very temporary lock so should clear itself out fast
-        std::this_thread::yield();
-      }
-
-      //AutoRecursiveLock lock(*this);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::DeviceResource => (internal friend derived)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::notifyPromisesShutdown()
-    {
-      AutoRecursiveLock lock(*this);
-
-      mShutdown = true;
-      mShuttingDown = false;
-
-      for (auto iter = mShutdownPromises.begin(); iter != mShutdownPromises.end(); ++iter) {
-        auto promise = (*iter);
-        promise->resolve();
-      }
-      mShutdownPromises.clear();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::DeviceResource => friend VideoCaptureTransport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::OnIncomingCapturedFrame(const int32_t id, const webrtc::VideoFrame& videoFrame)
-    {
-      auto newFrame = make_shared<VideoFrame>();
-      newFrame->ShallowCopy(videoFrame);
-
-      auto pThis = ZS_DYNAMIC_PTR_CAST(DeviceResource, mThisWeak.lock());
-
-      IRTPMediaEngineDeviceResourceAsyncDelegateProxy::create(pThis)->onCapturedVideoFrame(newFrame);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::OnCaptureDelayChanged(const int32_t id, const int32_t delay)
-    {
-#define TODO 1
-#define TODO 2
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::DeviceResource::VideoCaptureTransport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::DeviceResource::VideoCaptureTransport::VideoCaptureTransport(
-                                                                                 const make_private &,
-                                                                                 DeviceResourcePtr outer
-                                                                                 ) :
-      mOuter(outer)
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::DeviceResource::VideoCaptureTransport::~VideoCaptureTransport()
-    {
-      mThisWeak.reset();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::VideoCaptureTransport::init()
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::DeviceResource::VideoCaptureTransportPtr RTPMediaEngine::DeviceResource::VideoCaptureTransport::create(DeviceResourcePtr outer)
-    {
-      VideoCaptureTransportPtr pThis(make_shared<VideoCaptureTransport>(make_private{}, outer));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::DeviceResource::Transport => webrtc::VideoCaptureDataCallback
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::VideoCaptureTransport::OnIncomingCapturedFrame(const int32_t id, const webrtc::VideoFrame& videoFrame)
-    {
-      auto outer = mOuter.lock();
-      if (!outer) return;
-      return outer->OnIncomingCapturedFrame(id, videoFrame);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::DeviceResource::VideoCaptureTransport::OnCaptureDelayChanged(const int32_t id, const int32_t delay)
-    {
-      auto outer = mOuter.lock();
-      if (!outer) return;
-      return outer->OnCaptureDelayChanged(id, delay);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::DeviceResource => (internal)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    PromisePtr RTPMediaEngine::DeviceResource::getShutdownPromise()
-    {
-      if (isShutdown()) {
-        return Promise::createResolved(delegateQueue());
-      }
-      PromisePtr promise = Promise::create(delegateQueue());
-      mShutdownPromises.push_back(promise);
-      return promise;
-    }
-
-    int RTPMediaEngine::DeviceResource::getAudioDeviceIndex(webrtc::VoiceEngine *voiceEngine, String deviceID)
-    {
-      int devices;
-      if (webrtc::VoEHardware::GetInterface(voiceEngine)->GetNumOfRecordingDevices(devices) != 0) {
-        return -1;
-      }
-      int index = -1;
-      char deviceName[128];
-      char deviceUniqueId[128];
-      for (int i = 0; i < devices; i++) {
-        webrtc::VoEHardware::GetInterface(voiceEngine)->GetRecordingDeviceName(i, deviceName, deviceUniqueId);
-        if (0 == String(deviceUniqueId).compareNoCase(deviceID)) {
-          index = i;
-          break;
-        }
-      }
-      return index;
-    }
-
-    //-------------------------------------------------------------------------
-    FLOAT RTPMediaEngine::DeviceResource::calculateSizeDistance(
-                                                                ConstrainLongRange width,
-                                                                ConstrainLongRange height,
-                                                                webrtc::VideoCaptureCapability capability
-                                                                )
-    {
-      if (width.mMin.hasValue() && width.mMin.value() > capability.width)
-        return FLT_MAX;
-      if (width.mMax.hasValue() && width.mMax.value() < capability.width)
-        return FLT_MAX;
-      if (width.mExact.hasValue() && width.mExact.value() != capability.width)
-        return FLT_MAX;
-      FLOAT withDistance = 0.0F;
-      if (width.mIdeal.hasValue() && width.mIdeal.value() != capability.width) {
-        withDistance = (FLOAT)(abs((int)(capability.width - width.mIdeal.value()))) / (FLOAT)width.mIdeal.value();
-      }
-
-      if (height.mMin.hasValue() && height.mMin.value() > capability.height)
-        return FLT_MAX;
-      if (height.mMax.hasValue() && height.mMax.value() < capability.height)
-        return FLT_MAX;
-      if (height.mExact.hasValue() && height.mExact.value() != capability.height)
-        return FLT_MAX;
-      FLOAT heightDistance = 0.0F;
-      if (height.mIdeal.hasValue() && height.mIdeal.value() != capability.height) {
-        heightDistance = (FLOAT)(abs((int)(capability.height - height.mIdeal.value()))) / (FLOAT)height.mIdeal.value();
-      }
-
-
-      return withDistance + heightDistance;
-    }
-
-    //-------------------------------------------------------------------------
-    FLOAT RTPMediaEngine::DeviceResource::calculateFrameRateDistance(
-                                                                     ConstrainDoubleRange frameRate,
-                                                                     webrtc::VideoCaptureCapability capability
-                                                                     )
-    {
-      if (frameRate.mMin.hasValue() && frameRate.mMin.value() > (DOUBLE)capability.maxFPS)
-        return FLT_MAX;
-      if (frameRate.mMax.hasValue() && frameRate.mMax.value() < (DOUBLE)capability.maxFPS)
-        return FLT_MAX;
-      if (frameRate.mExact.hasValue() && fabs(frameRate.mExact.value() - (DOUBLE)capability.maxFPS) > 0.01F)
-        return FLT_MAX;
-      FLOAT frameRateDistance = 0.0F;
-      if (frameRate.mIdeal.hasValue() && fabs(frameRate.mExact.value() - (DOUBLE)capability.maxFPS) > 0.01F) {
-        frameRateDistance = (FLOAT)(abs((int)(capability.maxFPS - frameRate.mIdeal.value()))) / (FLOAT)frameRate.mIdeal.value();
-      }
-
-      return frameRateDistance;
-    }
-
-    //-------------------------------------------------------------------------
-    FLOAT RTPMediaEngine::DeviceResource::calculateAspectRatioDistance(
-                                                                       ConstrainDoubleRange aspectRatio,
-                                                                       webrtc::VideoCaptureCapability capability
-                                                                       )
-    {
-      DOUBLE capabilityAspectRatio = (DOUBLE)capability.width / (DOUBLE)capability.height;
-
-      if (aspectRatio.mMin.hasValue() && aspectRatio.mMin.value() > capabilityAspectRatio)
-        return FLT_MAX;
-      if (aspectRatio.mMax.hasValue() && aspectRatio.mMax.value() < capabilityAspectRatio)
-        return FLT_MAX;
-      if (aspectRatio.mExact.hasValue() && fabs(aspectRatio.mExact.value() - capabilityAspectRatio) > 0.001F)
-        return FLT_MAX;
-      FLOAT aspectRatioDistance = 0.0F;
-      if (aspectRatio.mIdeal.hasValue() && fabs(aspectRatio.mIdeal.value() - capabilityAspectRatio) > 0.001F) {
-        aspectRatioDistance = static_cast<FLOAT>((capabilityAspectRatio - aspectRatio.mIdeal.value()) / aspectRatio.mIdeal.value());
-      }
-
-      return aspectRatioDistance;
-    }
-
-    //-------------------------------------------------------------------------
-    FLOAT RTPMediaEngine::DeviceResource::calculateFormatDistance(webrtc::VideoCaptureCapability capability)
-    {
-      switch (capability.rawType) {
-      case webrtc::kVideoI420:
-      case webrtc::kVideoYV12:
-      case webrtc::kVideoYUY2:
-      case webrtc::kVideoUYVY:
-      case webrtc::kVideoIYUV:
-      case webrtc::kVideoARGB:
-      case webrtc::kVideoRGB24:
-      case webrtc::kVideoRGB565:
-      case webrtc::kVideoARGB4444:
-      case webrtc::kVideoARGB1555:
-      case webrtc::kVideoNV12:
-      case webrtc::kVideoNV21:
-      case webrtc::kVideoBGRA:
-        return 0.0F;
-      case webrtc::kVideoMJPEG:
-        return 1.0F;
-      default:
-        return FLT_MAX;
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::ChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::ChannelResource::ChannelResource(
-                                                     const make_private &priv,
-                                                     IRTPMediaEngineRegistrationPtr registration
-                                                     ) : 
-      BaseResource(priv, registration, registration ? registration->getRTPEngine() : RTPMediaEnginePtr()),
-      mHandlePacketQueue(IORTCForInternal::queuePacket()),
-      mClock(webrtc::Clock::GetRealTimeClock()),
-      mRemb(mClock)
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::ChannelResource::~ChannelResource()
-    {
-      mThisWeak.reset();
-      UseEnginePtr engine = getEngine<UseEngine>();
-      if (engine) {
-        engine->notifyResourceGone(*this);
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::ChannelResource::lifetimeHolderGone()
-    {
-      auto shutdownPromise = shutdown();
-      if (shutdownPromise) {
-        // don't really care about result
-        shutdownPromise->then(IPromiseDelegateProxy::createNoop(IORTCForInternal::queueBlockingMediaStartStopThread()));
-        shutdownPromise->background();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::ChannelResource => IRTPMediaEngineChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    PromisePtr RTPMediaEngine::ChannelResource::shutdown()
-    {
-      PromisePtr promise = getShutdownPromise();
-      if (isShutdown()) return promise;
-      if (mShuttingDown) return promise;
-
-      mShuttingDown = true;
-
-      auto outer = mMediaEngine.lock();
-      if (outer) {
-        outer->shutdownChannelResource(ZS_DYNAMIC_PTR_CAST(ChannelResource, mThisWeak.lock()));
-      } else {
-        stepShutdown();
-      }
-      return promise;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::ChannelResource::notifyTransportState(ISecureTransportTypes::States state)
-    {
-      auto pThis = ZS_DYNAMIC_PTR_CAST(ChannelResource, mThisWeak.lock());
-      IRTPMediaEngineChannelResourceAsyncDelegateProxy::create(pThis)->onSecureTransportState(state);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::ChannelResource::notifyUpdate(ParametersPtr param)
-    {
-      auto pThis = ZS_DYNAMIC_PTR_CAST(ChannelResource, mThisWeak.lock());
-      IRTPMediaEngineChannelResourceAsyncDelegateProxy::create(pThis)->onUpdate(param);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::ChannelResource::requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats)
-    {
-      auto pThis = ZS_DYNAMIC_PTR_CAST(ChannelResource, mThisWeak.lock());
-      IRTPMediaEngineChannelResourceAsyncDelegateProxy::create(pThis)->onProvideStats(promise, stats);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::ChannelResource => (internal friend derived)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::ChannelResource::notifyPromisesShutdown()
-    {
-      AutoRecursiveLock lock(*this);
-
-      mShutdown = true;
-      mShuttingDown = false;
-
-      for (auto iter = mShutdownPromises.begin(); iter != mShutdownPromises.end(); ++iter) {
-        auto promise = (*iter);
-        promise->resolve();
-      }
-      mShutdownPromises.clear();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::ChannelResource => (internal)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    PromisePtr RTPMediaEngine::ChannelResource::getShutdownPromise()
-    {
-      if (isShutdown()) {
-        return Promise::createResolved(delegateQueue());
-      }
-      PromisePtr promise = Promise::create(delegateQueue());
-      mShutdownPromises.push_back(promise);
-      return promise;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioReceiverChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::AudioReceiverChannelResource::AudioReceiverChannelResource(
-                                                                               const make_private &priv,
-                                                                               IRTPMediaEngineRegistrationPtr registration,
-                                                                               TransportPtr transport,
-                                                                               UseMediaStreamTrackPtr track,
-                                                                               ParametersPtr parameters,
-                                                                               RTPPacketPtr packet
-                                                                               ) :
-      ChannelResource(priv, registration),
-      mTransport(transport),
-      mTrack(track),
-      mParameters(parameters),
-      mInitPacket(packet)
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::AudioReceiverChannelResource::~AudioReceiverChannelResource()
-    {
-      mThisWeak.reset();  // shared pointer to self is no longer valid
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::AudioReceiverChannelResourcePtr RTPMediaEngine::AudioReceiverChannelResource::create(
-                                                                                                         IRTPMediaEngineRegistrationPtr registration,
-                                                                                                         TransportPtr transport,
-                                                                                                         UseMediaStreamTrackPtr track,
-                                                                                                         ParametersPtr parameters,
-                                                                                                         RTPPacketPtr packet  
-                                                                                                         )
-    {
-      auto pThis = make_shared<AudioReceiverChannelResource>(
-                                                             make_private{},
-                                                             registration,
-                                                             transport,
-                                                             track,
-                                                             parameters,
-                                                             packet
-                                                             );
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioReceiverChannelResource::init()
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioReceiverChannelResource => IRTPMediaEngineChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioReceiverChannelResource => IRTPMediaEngineChannelResourceAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioReceiverChannelResource::onSecureTransportState(ISecureTransport::States state)
-    {
-      AutoRecursiveLock lock(*this);
-
-      if (state == mTransportState) return;
-
-      auto engine = mMediaEngine.lock();
-      if (!engine) return;
-
-      auto voiceEngine = engine->getVoiceEngine();
-      if (!voiceEngine) return;
-
-      ISecureTransport::States previousState = mTransportState;
-      mTransportState = state;
-      if (mParameters && (mParameters->mEncodings.size() == 0 ||
-        (mParameters->mEncodings.size() > 0 && mParameters->mEncodings.begin()->mActive))) {
-        if (state == ISecureTransport::State_Connected) {
-          webrtc::VoEBase::GetInterface(voiceEngine)->StartReceive(mChannel);
-          webrtc::VoEBase::GetInterface(voiceEngine)->StartPlayout(mChannel);
-        } else if (previousState == ISecureTransport::State_Connected) {
-          webrtc::VoEBase::GetInterface(voiceEngine)->StopPlayout(mChannel);
-          webrtc::VoEBase::GetInterface(voiceEngine)->StopReceive(mChannel);
-        }
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioReceiverChannelResource::onUpdate(ParametersPtr params)
-    {
-      AutoRecursiveLock lock(*this);
-
-      auto engine = mMediaEngine.lock();
-      if (!engine) return;
-
-      auto voiceEngine = engine->getVoiceEngine();
-      if (!voiceEngine) return;
-
-      ParametersPtr previousParams = mParameters;
-      mParameters = params;
-      bool previousActive = false;
-      bool currentActive = false;
-      if (previousParams->mEncodings.size() == 0 ||
-        (previousParams->mEncodings.size() > 0 && previousParams->mEncodings.begin()->mActive)) {
-        previousActive = true;
-      }
-      if (params->mEncodings.size() == 0 ||
-        (params->mEncodings.size() > 0 && params->mEncodings.begin()->mActive)) {
-        currentActive = true;
-      }
-      if (mTransportState == ISecureTransport::State_Connected) {
-        if (!previousActive && currentActive) {
-          webrtc::VoEBase::GetInterface(voiceEngine)->StartReceive(mChannel);
-          webrtc::VoEBase::GetInterface(voiceEngine)->StartPlayout(mChannel);
-        } else if (previousActive && !currentActive) {
-          webrtc::VoEBase::GetInterface(voiceEngine)->StopPlayout(mChannel);
-          webrtc::VoEBase::GetInterface(voiceEngine)->StopReceive(mChannel);
-        }
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioReceiverChannelResource::onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats)
-    {
-      AutoRecursiveLock lock(*this);
-
-      UseStatsReport::StatMap reportStats;
-
-      webrtc::AudioReceiveStream::Stats receiveStreamStats = mReceiveStream->GetStats();
-
-      auto track = mTrack.lock();
-      if (!track) {
-        return;
-      }
-
-      if (stats.hasStatType(IStatsReportTypes::StatsTypes::StatsType_InboundRTP)) {
-
-        auto report = make_shared<IStatsReport::InboundRTPStreamStats>();
-
-        report->mID = string(receiveStreamStats.remote_ssrc) + "_recv";
-
-        report->mSSRC = receiveStreamStats.remote_ssrc;
-        report->mIsRemote = true;
-        report->mMediaType = "audio";
-        report->mMediaTrackID = track->id();
-        report->mCodecID = mCodecPayloadName;
-        report->mPacketsReceived = receiveStreamStats.packets_rcvd;
-        report->mBytesReceived = receiveStreamStats.bytes_rcvd;
-        report->mPacketsLost = receiveStreamStats.packets_lost;
-        report->mJitter = receiveStreamStats.jitter_ms;
-        report->mFractionLost = receiveStreamStats.fraction_lost;
-#ifdef WINRT
-        report->mEndToEndDelay = Milliseconds(receiveStreamStats.end_to_end_delayMs);
-#endif
-        reportStats[report->mID] = report;
-      }
-
-      if (stats.hasStatType(IStatsReportTypes::StatsTypes::StatsType_Codec)) {
-
-        auto report = make_shared<IStatsReport::Codec>();
-
-        report->mID = string(receiveStreamStats.remote_ssrc) + "_recv_codec";
-
-        report->mPayloadType = mCodecPayloadType;
-        report->mCodec = mCodecPayloadName;
-        report->mClockRate = 0;
-        report->mChannels = 0;
-
-        reportStats[report->mID] = report;
-      }
-
-      promise->resolve(UseStatsReport::create(reportStats));
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioReceiverChannelResource => IRTPMediaEngineAudioReceiverChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::AudioReceiverChannelResource::handlePacket(const RTPPacket &packet)
-    {
-      IRTPMediaEngineHandlePacketAsyncDelegateProxy::createUsingQueue(mHandlePacketQueue, getThis<AudioReceiverChannelResource>())->onHandleRTPPacket(packet.timestamp(), packet.buffer());
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::AudioReceiverChannelResource::handlePacket(const RTCPPacket &packet)
-    {
-      IRTPMediaEngineHandlePacketAsyncDelegateProxy::createUsingQueue(mHandlePacketQueue, getThis<AudioReceiverChannelResource>())->onHandleRTCPPacket(packet.buffer());
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioReceiverChannelResource => IRTPMediaEngineHandlePacketAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioReceiverChannelResource::onHandleRTPPacket(DWORD timestamp, SecureByteBlockPtr buffer)
-    {
-      AutoIncrementLock incLock(mAccessFromNonLockedMethods);
-
-      if (mDenyNonLockedAccess) return;
-
-      webrtc::PacketTime time(timestamp, 0);
-
-      auto engine = mMediaEngine.lock();
-      if (!engine) return;
-
-      auto voiceEngine = engine->getVoiceEngine();
-      if (!voiceEngine) return;
-
-      webrtc::VoENetwork::GetInterface(voiceEngine)->ReceivedRTPPacket(getChannel(), buffer->BytePtr(), buffer->SizeInBytes(), time);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioReceiverChannelResource::onHandleRTCPPacket(SecureByteBlockPtr buffer)
-    {
-      AutoIncrementLock incLock(mAccessFromNonLockedMethods);
-      
-      if (mDenyNonLockedAccess) return;
-
-      auto engine = mMediaEngine.lock();
-      if (!engine) return;
-
-      auto voiceEngine = engine->getVoiceEngine();
-      if (!voiceEngine) return;
-
-      webrtc::VoENetwork::GetInterface(voiceEngine)->ReceivedRTCPPacket(getChannel(), buffer->BytePtr(), buffer->SizeInBytes());
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioReceiverChannelResource => webrtc::BitrateObserver
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioReceiverChannelResource::OnNetworkChanged(uint32_t targetBitrateBps, uint8_t fractionLoss, int64_t rttMs)
-    {
-      AutoRecursiveLock lock(*this);
-
-      mCurrentTargetBitrate = targetBitrateBps;
-
-      uint32_t allocatedBitrateBps = mBitrateAllocator->OnNetworkChanged(
-                                                                         targetBitrateBps,
-                                                                         fractionLoss,
-                                                                         rttMs
-                                                                         );
-
-      int padUpToBitrateBps = 0;
-      uint32_t pacerBitrateBps = std::max(targetBitrateBps, allocatedBitrateBps);
-
-      if (mCongestionController)
-        mCongestionController->UpdatePacerBitrate(
-                                                  targetBitrateBps / 1000,
-                                                  webrtc::PacedSender::kDefaultPaceMultiplier * pacerBitrateBps / 1000,
-                                                  padUpToBitrateBps / 1000
-                                                  );
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioReceiverChannelResource => friend RTPMediaEngine
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioReceiverChannelResource::stepSetup()
-    {
-      AutoRecursiveLock lock(*this);
-
-      auto engine = mMediaEngine.lock();
-      if (!engine) {
-        notifyPromisesReject();
-        return;
-      }
-
-      auto voiceEngine = engine->getVoiceEngine();
-      if (NULL == voiceEngine) {
-        notifyPromisesReject();
-        return;
-      }
-
-      auto audioState = engine->getAudioState();
-
-      mModuleProcessThread = webrtc::ProcessThread::Create("AudioReceiverChannelResourceModuleProcessThread");
-      mPacerThread = webrtc::ProcessThread::Create("AudioReceiverChannelResourcePacerThread");
-
-      mBitrateAllocator = rtc::scoped_ptr<webrtc::BitrateAllocator>(new webrtc::BitrateAllocator());
-      mCallStats = rtc::scoped_ptr<webrtc::CallStats>(new webrtc::CallStats(mClock));
-      mCongestionController =
-        rtc::scoped_ptr<webrtc::CongestionController>(new webrtc::CongestionController(
-                                                                                       mClock,
-                                                                                       this,
-                                                                                       &mRemb
-                                                                                       ));
-
-      mCallStats->RegisterStatsObserver(mCongestionController.get());
-
-      mChannel = webrtc::VoEBase::GetInterface(voiceEngine)->CreateChannel();
-
-      bool audioCodecSet = false;
-      webrtc::CodecInst codec;
-      for (auto codecIter = mParameters->mCodecs.begin(); codecIter != mParameters->mCodecs.end(); codecIter++) {
-        auto supportedCodec = IRTPTypes::toSupportedCodec(codecIter->mName);
-        if (IRTPTypes::getCodecKind(supportedCodec) == IRTPTypes::CodecKind_Audio && audioCodecSet)
-          continue;
-        codec = getAudioCodec(voiceEngine, codecIter->mName);
-        codec.pltype = codecIter->mPayloadType;
-        if (codecIter->mPTime != Milliseconds::zero())
-          codec.pacsize = (codec.plfreq / 1000) * codecIter->mPTime.count();
-        if (codecIter->mNumChannels.hasValue())
-          codec.channels = codecIter->mNumChannels;
-        switch (supportedCodec) {
-          case IRTPTypes::SupportedCodec_Opus:
-            codec.rate = 48000;
-            webrtc::VoECodec::GetInterface(voiceEngine)->SetRecPayloadType(mChannel, codec);
-            goto set_rtcp_feedback;
-          case IRTPTypes::SupportedCodec_Isac:
-          case IRTPTypes::SupportedCodec_G722:
-          case IRTPTypes::SupportedCodec_ILBC:
-          case IRTPTypes::SupportedCodec_PCMU:
-          case IRTPTypes::SupportedCodec_PCMA:
-            webrtc::VoECodec::GetInterface(voiceEngine)->SetRecPayloadType(mChannel, codec);
-            goto set_rtcp_feedback;
-          case IRTPTypes::SupportedCodec_RED:
-            webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetREDStatus(mChannel, true, codecIter->mPayloadType);
-            break;
-        }
-        continue;
-
-      set_rtcp_feedback:
-        for (auto rtcpFeedbackIter = codecIter->mRTCPFeedback.begin(); rtcpFeedbackIter != codecIter->mRTCPFeedback.end(); rtcpFeedbackIter++) {
-          IRTPTypes::KnownFeedbackTypes feedbackType = IRTPTypes::toKnownFeedbackType(rtcpFeedbackIter->mType);
-          IRTPTypes::KnownFeedbackParameters feedbackParameter = IRTPTypes::toKnownFeedbackParameter(rtcpFeedbackIter->mParameter);
-          if (IRTPTypes::KnownFeedbackType_NACK == feedbackType && IRTPTypes::KnownFeedbackParameter_Unknown == feedbackParameter) {
-            webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetNACKStatus(mChannel, true, 250);
-          }
-        }
-        audioCodecSet = true;
-      }
-
-      mCodecPayloadName = codec.plname;
-      mCodecPayloadType = codec.pltype;
-
-      webrtc::AudioReceiveStream::Config config;
-      config.voe_channel_id = mChannel;
-
-      for (auto encodingParamIter = mParameters->mEncodings.begin(); encodingParamIter != mParameters->mEncodings.end(); encodingParamIter++) {
-
-        IRTPTypes::PayloadType codecPayloadType {};
-        if (encodingParamIter->mCodecPayloadType.hasValue())
-          codecPayloadType = encodingParamIter->mCodecPayloadType;
-        else
-          codecPayloadType = codec.pltype;
-
-        if (codecPayloadType == codec.pltype) {
-          uint32_t ssrc = 0;
-          if (encodingParamIter->mSSRC.hasValue())
-            ssrc = encodingParamIter->mSSRC;
-          if (encodingParamIter->mFEC.hasValue()) {
-            IRTPTypes::FECParameters fec = encodingParamIter->mFEC;
-            if (fec.mSSRC.hasValue())
-              ssrc = fec.mSSRC;
-          }
-          config.rtp.remote_ssrc = ssrc;
-        }
-      }
-      if (config.rtp.remote_ssrc == 0) {
-        config.rtp.remote_ssrc = mInitPacket->ssrc();
-        mInitPacket.reset();
-      }
-
-      for (auto headerExtensionIter = mParameters->mHeaderExtensions.begin(); headerExtensionIter != mParameters->mHeaderExtensions.end(); headerExtensionIter++) {
-        IRTPTypes::HeaderExtensionURIs headerExtensionURI = IRTPTypes::toHeaderExtensionURI(headerExtensionIter->mURI);
-        switch (headerExtensionURI) {
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_ClienttoMixerAudioLevelIndication:
-            webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetReceiveAudioLevelIndicationStatus(mChannel, true, headerExtensionIter->mID);
-            config.rtp.extensions.push_back(webrtc::RtpExtension(headerExtensionIter->mURI, headerExtensionIter->mID));
-            break;
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_AbsoluteSendTime:
-            webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetReceiveAbsoluteSenderTimeStatus(mChannel, true, headerExtensionIter->mID);
-            config.rtp.extensions.push_back(webrtc::RtpExtension(headerExtensionIter->mURI, headerExtensionIter->mID));
-            break;
-          default:
-            break;
-        }
-      }
-
-      uint32_t localSSRC = mParameters->mRTCP.mSSRC;
-      if (localSSRC == 0)
-        localSSRC = 1;
-      webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetLocalSSRC(mChannel, localSSRC);
-      config.rtp.local_ssrc = localSSRC;
-      config.receive_transport = mTransport.get();
-      config.rtcp_send_transport = mTransport.get();
-
-      mModuleProcessThread->Start();
-      mModuleProcessThread->RegisterModule(mCallStats.get());
-      mModuleProcessThread->RegisterModule(mCongestionController.get());
-      mPacerThread->RegisterModule(mCongestionController->pacer());
-      mPacerThread->RegisterModule(mCongestionController->GetRemoteBitrateEstimator(true));
-      mPacerThread->Start();
-
-      mReceiveStream = rtc::scoped_ptr<webrtc::AudioReceiveStream>(
-        new webrtc::internal::AudioReceiveStream(
-                                                 mCongestionController.get(),
-                                                 config,
-                                                 audioState
-                                                 ));
-
-      webrtc::VoENetwork::GetInterface(voiceEngine)->RegisterExternalTransport(mChannel, *mTransport);
-
-      if (mTransportState == ISecureTransport::State_Connected) {
-        webrtc::VoEBase::GetInterface(voiceEngine)->StartReceive(mChannel);
-        webrtc::VoEBase::GetInterface(voiceEngine)->StartPlayout(mChannel);
-      }
-
-      notifyPromisesResolve();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioReceiverChannelResource::stepShutdown()
-    {
-      mDenyNonLockedAccess = true;
-
-      // rare race condition that can happen so
-      while (mAccessFromNonLockedMethods > 0)
-      {
-        // NOTE: very temporary lock so should clear itself out fast
-        std::this_thread::yield();
-      }
-
-      AutoRecursiveLock lock(*this);
-
-      auto outer = mMediaEngine.lock();
-
-      if (outer) {
-        auto voiceEngine = outer->getVoiceEngine();
-        if (voiceEngine) {
-          if (mTransportState == ISecureTransport::State_Connected) {
-            webrtc::VoEBase::GetInterface(voiceEngine)->StopPlayout(mChannel);
-            webrtc::VoEBase::GetInterface(voiceEngine)->StopReceive(mChannel);
-          }
-          webrtc::VoENetwork::GetInterface(voiceEngine)->DeRegisterExternalTransport(mChannel);
-        }
-      }
-
-      mPacerThread->Stop();
-      mPacerThread->DeRegisterModule(mCongestionController->pacer());
-      mPacerThread->DeRegisterModule(mCongestionController->GetRemoteBitrateEstimator(true));
-      mModuleProcessThread->DeRegisterModule(mCongestionController.get());
-      mModuleProcessThread->DeRegisterModule(mCallStats.get());
-      mModuleProcessThread->Stop();
-
-      mCallStats->DeregisterStatsObserver(mCongestionController.get());
-
-      mReceiveStream.reset();
-      mCongestionController.reset();
-      mCallStats.reset();
-      mBitrateAllocator.reset();
-      mModuleProcessThread.reset();
-      mPacerThread.reset();
-
-      notifyPromisesShutdown();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioReceiverChannelResource => (internal)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    int RTPMediaEngine::AudioReceiverChannelResource::getChannel() const
-    {
-      return mChannel;
-    }
-
-    //-------------------------------------------------------------------------
-    webrtc::CodecInst RTPMediaEngine::AudioReceiverChannelResource::getAudioCodec(
-                                                                                  webrtc::VoiceEngine *voiceEngine,
-                                                                                  String payloadName
-                                                                                  )
-    {
-      webrtc::CodecInst codec;
-      int numOfCodecs = webrtc::VoECodec::GetInterface(voiceEngine)->NumOfCodecs();
-      for (int i = 0; i < numOfCodecs; ++i) {
-        webrtc::CodecInst currentCodec;
-        webrtc::VoECodec::GetInterface(voiceEngine)->GetCodec(i, currentCodec);
-        if (0 == String(currentCodec.plname).compareNoCase(payloadName)) {
-          codec = currentCodec;
-          break;
-        }
-      }
-
-      return codec;
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioSenderChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::AudioSenderChannelResource::AudioSenderChannelResource(
-                                                                           const make_private &priv,
-                                                                           IRTPMediaEngineRegistrationPtr registration,
-                                                                           TransportPtr transport,
-                                                                           UseMediaStreamTrackPtr track,
-                                                                           ParametersPtr parameters,
-                                                                           IDTMFSenderDelegatePtr dtmfDelegate
-                                                                           ) :
-      ChannelResource(priv, registration),
-      mTransport(transport),
-      mTrack(track),
-      mParameters(parameters),
-      mDTMFSenderDelegate(IDTMFSenderDelegateProxy::createWeak(dtmfDelegate))
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::AudioSenderChannelResource::~AudioSenderChannelResource()
-    {
-      mThisWeak.reset();  // shared pointer to self is no longer valid
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::AudioSenderChannelResourcePtr RTPMediaEngine::AudioSenderChannelResource::create(
-                                                                                                     IRTPMediaEngineRegistrationPtr registration,
-                                                                                                     TransportPtr transport,
-                                                                                                     UseMediaStreamTrackPtr track,
-                                                                                                     ParametersPtr parameters,
-                                                                                                     IDTMFSenderDelegatePtr dtmfDelegate
-                                                                                                     )
-    {
-      auto pThis = make_shared<AudioSenderChannelResource>(
-                                                           make_private{},
-                                                           registration,
-                                                           transport,
-                                                           track,
-                                                           parameters,
-                                                           dtmfDelegate
-                                                           );
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::init()
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioSenderChannelResource => IRTPMediaEngineChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioSenderChannelResource => IRTPMediaEngineChannelResourceAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::onSecureTransportState(ISecureTransport::States state)
-    {
-      auto engine = mMediaEngine.lock();
-      if (!engine) return;
-
-      auto voiceEngine = engine->getVoiceEngine();
-      if (!voiceEngine) return;
-
-      ISecureTransport::States previousState = mTransportState;
-      mTransportState = state;
-      if (mParameters && (mParameters->mEncodings.size() == 0 ||
-        (mParameters->mEncodings.size() > 0 && mParameters->mEncodings.begin()->mActive))) {
-        if (state == ISecureTransport::State_Connected) {
-          webrtc::VoEBase::GetInterface(voiceEngine)->StartSend(mChannel);
-        } else if (previousState == ISecureTransport::State_Connected) {
-          webrtc::VoEBase::GetInterface(voiceEngine)->StopSend(mChannel);
-        }
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::onUpdate(ParametersPtr params)
-    {
-      AutoRecursiveLock lock(*this);
-
-      auto engine = mMediaEngine.lock();
-      if (!engine) return;
-
-      auto voiceEngine = engine->getVoiceEngine();
-      if (!voiceEngine) return;
-
-      ParametersPtr previousParams = mParameters;
-      mParameters = params;
-      bool previousActive = false;
-      bool currentActive = false;
-      if (previousParams->mEncodings.size() == 0 ||
-        (previousParams->mEncodings.size() > 0 && previousParams->mEncodings.begin()->mActive)) {
-        previousActive = true;
-      }
-      if (params->mEncodings.size() == 0 ||
-        (params->mEncodings.size() > 0 && params->mEncodings.begin()->mActive)) {
-        currentActive = true;
-      }
-      if (mTransportState == ISecureTransport::State_Connected) {
-        if (!previousActive && currentActive) {
-          webrtc::VoEBase::GetInterface(voiceEngine)->StartSend(mChannel);
-        } else if (previousActive && !currentActive) {
-          webrtc::VoEBase::GetInterface(voiceEngine)->StopSend(mChannel);
-        }
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats)
-    {
-      AutoRecursiveLock lock(*this);
-
-      UseStatsReport::StatMap reportStats;
-
-      webrtc::AudioSendStream::Stats sendStreamStats = mSendStream->GetStats();
-
-      auto track = mTrack.lock();
-      if (!track) {
-        return;
-      }
-
-      if (stats.hasStatType(IStatsReportTypes::StatsTypes::StatsType_OutboundRTP)) {
-
-        auto report = make_shared<IStatsReport::OutboundRTPStreamStats>();
-
-        report->mID = string(sendStreamStats.local_ssrc) + "_send";
-
-        report->mSSRC = sendStreamStats.local_ssrc;
-        report->mIsRemote = false;
-        report->mMediaType = "audio";
-        report->mMediaTrackID = track->id();
-        report->mCodecID = mCodecPayloadName;
-        report->mPacketsSent = sendStreamStats.packets_sent;
-        report->mBytesSent = sendStreamStats.bytes_sent;
-        report->mTargetBitrate = (DOUBLE)mCurrentTargetBitrate;
-        report->mRoundTripTime = (DOUBLE)mCallStats->rtcp_rtt_stats()->LastProcessedRtt();
-
-        reportStats[report->mID] = report;
-      }
-
-      if (stats.hasStatType(IStatsReportTypes::StatsTypes::StatsType_Codec)) {
-        auto report = make_shared<IStatsReport::Codec>();
-
-        report->mID = string(sendStreamStats.local_ssrc) + "_send_codec";
-
-        report->mPayloadType = mCodecPayloadType;
-        report->mCodec = mCodecPayloadName;
-        report->mClockRate = 0;
-        report->mChannels = 0;
-
-        reportStats[report->mID] = report;
-      }
-
-      promise->resolve(UseStatsReport::create(reportStats));
-    }
-
-    void RTPMediaEngine::AudioSenderChannelResource::onSendDTMFTone()
-    {
-      AutoRecursiveLock lock(*this);
-
-      if (mDTMFPayloadType == 0)
-        return;
-
-      size_t firstTonePosition = mDTMFTones.find_first_of(dtmfValidTones);
-      int code = 0;
-      if (firstTonePosition == std::string::npos) {
-        mDTMFTones.clear();
-        notifyToneEvent("");
-        return;
-      } else {
-        char tone = mDTMFTones[firstTonePosition];
-        char event = toupper(tone);
-        const char* p = strchr(dtmfTonesTable, event);
-        if (!p) {
-          mDTMFTones.clear();
-          notifyToneEvent("");
-          return;
-        }
-        code = p - dtmfTonesTable - 1;
-      }
-
-      int toneGap = mDTMFInterToneGap.count();
-      if (code == dtmfTwoSecondsDelayCode) {
-        toneGap = dtmfTwoSecondInMs;
-      } else {
-        mSendStream->SendTelephoneEvent(mDTMFPayloadType, code, mDTMFDuration.count());
-        toneGap += mDTMFDuration.count();
-      }
-
-      notifyToneEvent(mDTMFTones.substr(firstTonePosition, 1).c_str());
-
-      mDTMFTones.erase(0, firstTonePosition + 1);
-
-      auto pThis = ZS_DYNAMIC_PTR_CAST(AudioSenderChannelResource, mThisWeak.lock());
-      mDTMFTimer = ITimer::create(pThis, Milliseconds(toneGap), false);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioSenderChannelResource => IRTPMediaEngineAudioSenderChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::AudioSenderChannelResource::handlePacket(const RTCPPacket &packet)
-    {
-      IRTPMediaEngineHandlePacketAsyncDelegateProxy::createUsingQueue(mHandlePacketQueue, getThis<AudioSenderChannelResource>())->onHandleRTCPPacket(packet.buffer());
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::insertDTMF(
-                                                                const char *tones,
-                                                                Milliseconds duration,
-                                                                Milliseconds interToneGap
-                                                                )
-    {
-      AutoRecursiveLock lock(*this);
-
-      auto pThis = ZS_DYNAMIC_PTR_CAST(AudioSenderChannelResource, mThisWeak.lock());
-      mDTMFTones = tones;
-      mDTMFDuration = duration;
-      mDTMFInterToneGap = interToneGap;
-      mDTMFTimer = ITimer::create(pThis, Milliseconds(0), false);
-    }
-
-    //-------------------------------------------------------------------------
-    String RTPMediaEngine::AudioSenderChannelResource::toneBuffer() const
-    {
-      AutoRecursiveLock lock(*this);
-
-      return mDTMFTones;
-    }
-
-    //-------------------------------------------------------------------------
-    Milliseconds RTPMediaEngine::AudioSenderChannelResource::duration() const
-    {
-      AutoRecursiveLock lock(*this);
-
-      return mDTMFDuration;
-    }
-
-    //-------------------------------------------------------------------------
-    Milliseconds RTPMediaEngine::AudioSenderChannelResource::interToneGap() const
-    {
-      AutoRecursiveLock lock(*this);
-
-      return mDTMFInterToneGap;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioSenderChannelResource => IRTPMediaEngineHandlePacketAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::onHandleRTCPPacket(SecureByteBlockPtr buffer)
-    {
-      AutoIncrementLock incLock(mAccessFromNonLockedMethods);
-
-      if (mDenyNonLockedAccess) return;
-
-      auto stream = mSendStream.get();
-      if (NULL == stream) return;
-
-      bool result = stream->DeliverRtcp(buffer->BytePtr(), buffer->SizeInBytes());
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioSenderChannelResource => ITimerDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::onTimer(ITimerPtr timer)
-    {
-      AutoRecursiveLock lock(*this);
-
-      auto pThis = ZS_DYNAMIC_PTR_CAST(AudioSenderChannelResource, mThisWeak.lock());
-      IRTPMediaEngineChannelResourceAsyncDelegateProxy::create(pThis)->onSendDTMFTone();
-
-      mDTMFTimer->cancel();
-      mDTMFTimer.reset();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioSenderChannelResource => webrtc::BitrateObserver
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::OnNetworkChanged(uint32_t targetBitrateBps, uint8_t fractionLoss, int64_t rttMs)
-    {
-      AutoRecursiveLock lock(*this);
-
-      mCurrentTargetBitrate = targetBitrateBps;
-
-      uint32_t allocatedBitrateBps = mBitrateAllocator->OnNetworkChanged(
-                                                                         targetBitrateBps,
-                                                                         fractionLoss,
-                                                                         rttMs
-                                                                         );
-
-      int padUpToBitrateBps = 0;
-      uint32_t pacerBitrateBps = std::max(targetBitrateBps, allocatedBitrateBps);
-
-      if (mCongestionController)
-        mCongestionController->UpdatePacerBitrate(
-                                                  targetBitrateBps / 1000,
-                                                  webrtc::PacedSender::kDefaultPaceMultiplier * pacerBitrateBps / 1000,
-                                                  padUpToBitrateBps / 1000
-                                                  );
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioSenderChannelResource => friend RTPMediaEngine
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::stepSetup()
-    {
-      AutoRecursiveLock lock(*this);
-
-      auto engine = mMediaEngine.lock();
-      if (!engine) {
-        notifyPromisesReject();
-        return;
-      }
-
-      auto voiceEngine = engine->getVoiceEngine();
-      if (!voiceEngine) {
-        notifyPromisesReject();
-        return;
-      }
-
-      auto audioState = engine->getAudioState();
-
-      mModuleProcessThread = webrtc::ProcessThread::Create("AudioSenderChannelResourceModuleProcessThread");
-      mPacerThread = webrtc::ProcessThread::Create("AudioSenderChannelResourcePacerThread");
-
-      mBitrateAllocator = rtc::scoped_ptr<webrtc::BitrateAllocator>(new webrtc::BitrateAllocator());
-      mCallStats = rtc::scoped_ptr<webrtc::CallStats>(new webrtc::CallStats(mClock));
-      mCongestionController =
-        rtc::scoped_ptr<webrtc::CongestionController>(new webrtc::CongestionController(
-                                                                                       mClock,
-                                                                                       this,
-                                                                                       &mRemb
-                                                                                       ));
-
-      mCallStats->RegisterStatsObserver(mCongestionController.get());
-
-      mChannel = webrtc::VoEBase::GetInterface(voiceEngine)->CreateChannel();
-
-      bool audioCodecSet = false;
-      webrtc::CodecInst codec;
-      for (auto codecIter = mParameters->mCodecs.begin(); codecIter != mParameters->mCodecs.end(); codecIter++) {
-        auto supportedCodec = IRTPTypes::toSupportedCodec(codecIter->mName);
-        if (IRTPTypes::getCodecKind(supportedCodec) == IRTPTypes::CodecKind_Audio && audioCodecSet)
-          continue;
-        codec = getAudioCodec(voiceEngine, codecIter->mName);
-        codec.pltype = codecIter->mPayloadType;
-        if (codecIter->mPTime != Milliseconds::zero())
-          codec.pacsize = (codec.plfreq / 1000) * codecIter->mPTime.count();
-        if (codecIter->mNumChannels.hasValue())
-          codec.channels = codecIter->mNumChannels;
-        switch (supportedCodec) {
-          case IRTPTypes::SupportedCodec_Opus:
-          {
-            codec.rate = 32000 * codec.channels;
-            webrtc::VoECodec::GetInterface(voiceEngine)->SetSendCodec(mChannel, codec);
-            auto parameters = IRTPTypes::OpusCodecParameters::convert(codecIter->mParameters);
-            if (parameters->mUseInbandFEC.hasValue())
-              webrtc::VoECodec::GetInterface(voiceEngine)->SetFECStatus(mChannel, parameters->mUseInbandFEC);
-            if (parameters->mUseDTX.hasValue())
-              webrtc::VoECodec::GetInterface(voiceEngine)->SetOpusDtx(mChannel, parameters->mUseDTX);
-            webrtc::VoECodec::GetInterface(voiceEngine)->SetOpusMaxPlaybackRate(mChannel, 48000);
-            goto set_rtcp_feedback;
-          }
-          case IRTPTypes::SupportedCodec_Isac:
-          case IRTPTypes::SupportedCodec_G722:
-          case IRTPTypes::SupportedCodec_ILBC:
-          case IRTPTypes::SupportedCodec_PCMU:
-          case IRTPTypes::SupportedCodec_PCMA:
-            webrtc::VoECodec::GetInterface(voiceEngine)->SetSendCodec(mChannel, codec);
-            goto set_rtcp_feedback;
-          case IRTPTypes::SupportedCodec_RED:
-            webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetREDStatus(mChannel, true, codecIter->mPayloadType);
-            break;
-          case IRTPTypes::SupportedCodec_TelephoneEvent:
-            mDTMFPayloadType = codecIter->mPayloadType;
-            break;
-        }
-        continue;
-
-      set_rtcp_feedback:
-        for (auto rtcpFeedbackIter = codecIter->mRTCPFeedback.begin(); rtcpFeedbackIter != codecIter->mRTCPFeedback.end(); rtcpFeedbackIter++) {
-          IRTPTypes::KnownFeedbackTypes feedbackType = IRTPTypes::toKnownFeedbackType(rtcpFeedbackIter->mType);
-          IRTPTypes::KnownFeedbackParameters feedbackParameter = IRTPTypes::toKnownFeedbackParameter(rtcpFeedbackIter->mParameter);
-          if (IRTPTypes::KnownFeedbackType_NACK == feedbackType && IRTPTypes::KnownFeedbackParameter_Unknown == feedbackParameter) {
-            webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetNACKStatus(mChannel, true, 250);
-          }
-        }
-        audioCodecSet = true;
-      }
-
-      mCodecPayloadName = codec.plname;
-      mCodecPayloadType = codec.pltype;
-
-      webrtc::AudioSendStream::Config config(mTransport.get());
-      config.voe_channel_id = mChannel;
-      
-      for (auto encodingParamIter = mParameters->mEncodings.begin(); encodingParamIter != mParameters->mEncodings.end(); encodingParamIter++) {
-
-        IRTPTypes::PayloadType codecPayloadType {};
-        if (encodingParamIter->mCodecPayloadType.hasValue())
-          codecPayloadType = encodingParamIter->mCodecPayloadType;
-        else
-          codecPayloadType = codec.pltype;
-
-        if (codecPayloadType == codec.pltype) {
-          uint32_t ssrc = 0;
-          if (encodingParamIter->mSSRC.hasValue()) {
-            ssrc = encodingParamIter->mSSRC;
-          }
-          if (encodingParamIter->mFEC.hasValue()) {
-            IRTPTypes::FECParameters fec = encodingParamIter->mFEC;
-            if (fec.mSSRC.hasValue()) {
-              ssrc = fec.mSSRC;
-            }
-          }
-          webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetLocalSSRC(mChannel, ssrc);
-          config.rtp.ssrc = ssrc;
-        }
-      }
-      if (config.rtp.ssrc == 0) {
-        uint32_t ssrc = SafeInt<uint32_t>(ortc::services::IHelper::random(1, 0xFFFFFFFF));
-        webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetLocalSSRC(mChannel, ssrc);
-        config.rtp.ssrc = ssrc;
-      }
-
-      for (auto headerExtensionIter = mParameters->mHeaderExtensions.begin(); headerExtensionIter != mParameters->mHeaderExtensions.end(); headerExtensionIter++) {
-        IRTPTypes::HeaderExtensionURIs headerExtensionURI = IRTPTypes::toHeaderExtensionURI(headerExtensionIter->mURI);
-        switch (headerExtensionURI) {
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_ClienttoMixerAudioLevelIndication:
-            webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetSendAudioLevelIndicationStatus(mChannel, true, headerExtensionIter->mID);
-            config.rtp.extensions.push_back(webrtc::RtpExtension(headerExtensionIter->mURI, headerExtensionIter->mID));
-            break;
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_AbsoluteSendTime:
-            webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetSendAbsoluteSenderTimeStatus(mChannel, true, headerExtensionIter->mID);
-            config.rtp.extensions.push_back(webrtc::RtpExtension(headerExtensionIter->mURI, headerExtensionIter->mID));
-            break;
-          default:
-            break;
-        }
-      }
-
-      webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetRTCPStatus(mChannel, true);
-      webrtc::VoERTP_RTCP::GetInterface(voiceEngine)->SetRTCP_CNAME(mChannel, mParameters->mRTCP.mCName);
-
-      mCongestionController->SetBweBitrates(10000, 40000, 100000);
-
-      mModuleProcessThread->Start();
-      mModuleProcessThread->RegisterModule(mCallStats.get());
-      mModuleProcessThread->RegisterModule(mCongestionController.get());
-      mPacerThread->RegisterModule(mCongestionController->pacer());
-      mPacerThread->RegisterModule(mCongestionController->GetRemoteBitrateEstimator(true));
-      mPacerThread->Start();
-
-      mSendStream = rtc::scoped_ptr<webrtc::AudioSendStream>(
-        new webrtc::internal::AudioSendStream(
-                                              config,
-                                              audioState,
-                                              mCongestionController.get()
-                                              ));
-
-      webrtc::VoENetwork::GetInterface(voiceEngine)->RegisterExternalTransport(mChannel, *mTransport);
-
-      if (mTransportState == ISecureTransport::State_Connected)
-        webrtc::VoEBase::GetInterface(voiceEngine)->StartSend(mChannel);
-
-      notifyPromisesResolve();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::stepShutdown()
-    {
-      mDenyNonLockedAccess = true;
-
-      // rare race condition that can happen so
-      while (mAccessFromNonLockedMethods > 0)
-      {
-        // NOTE: very temporary lock so should clear itself out fast
-        std::this_thread::yield();
-      }
-
-      AutoRecursiveLock lock(*this);
-
-      auto engine = mMediaEngine.lock();
-      if (engine) {
-        auto voiceEngine = engine->getVoiceEngine();
-        if (voiceEngine) {
-          if (mTransportState == ISecureTransport::State_Connected)
-            webrtc::VoEBase::GetInterface(voiceEngine)->StopSend(mChannel);
-          webrtc::VoENetwork::GetInterface(voiceEngine)->DeRegisterExternalTransport(mChannel);
-        }
-      }
-
-      mPacerThread->Stop();
-      mPacerThread->DeRegisterModule(mCongestionController->pacer());
-      mPacerThread->DeRegisterModule(mCongestionController->GetRemoteBitrateEstimator(true));
-      mModuleProcessThread->DeRegisterModule(mCongestionController.get());
-      mModuleProcessThread->DeRegisterModule(mCallStats.get());
-      mModuleProcessThread->Stop();
-
-      mCallStats->DeregisterStatsObserver(mCongestionController.get());
-
-      mSendStream.reset();
-      mCongestionController.reset();
-      mCallStats.reset();
-      mBitrateAllocator.reset();
-      mModuleProcessThread.reset();
-      mPacerThread.reset();
-
-      notifyPromisesShutdown();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::AudioSenderChannelResource => (internal)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    webrtc::CodecInst RTPMediaEngine::AudioSenderChannelResource::getAudioCodec(
-                                                                                webrtc::VoiceEngine *voiceEngine,
-                                                                                String payloadName
-                                                                                )
-    {
-      webrtc::CodecInst codec;
-      int numOfCodecs = webrtc::VoECodec::GetInterface(voiceEngine)->NumOfCodecs();
-      for (int i = 0; i < numOfCodecs; ++i) {
-        webrtc::CodecInst currentCodec;
-        webrtc::VoECodec::GetInterface(voiceEngine)->GetCodec(i, currentCodec);
-        if (0 == String(currentCodec.plname).compareNoCase(payloadName)) {
-          codec = currentCodec;
-          break;
-        }
-      }
-      return codec;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::AudioSenderChannelResource::notifyToneEvent(const char *tone)
-    {
-      if (!mDTMFSenderDelegate) return;
-
-      try {
-        mDTMFSenderDelegate->onDTMFSenderToneChanged(IDTMFSenderPtr(), tone);
-      } catch (const IDTMFSenderDelegateProxy::Exceptions::DelegateGone &) {
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoReceiverChannelResource::ReceiverVideoRenderer
-    #pragma mark
-
-    //---------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::ReceiverVideoRenderer::setMediaStreamTrack(UseMediaStreamTrackPtr videoTrack)
-    {
-      mVideoTrack = videoTrack;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::ReceiverVideoRenderer::RenderFrame(const webrtc::VideoFrame &videoFrame, int timeToRenderMs)
-    {
-      auto frameCopy = make_shared<webrtc::VideoFrame>();
-      frameCopy->ShallowCopy(videoFrame);
-
-      mVideoTrack.lock()->renderVideoFrame(frameCopy);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::VideoReceiverChannelResource::ReceiverVideoRenderer::IsTextureSupported() const
-    {
-      return false;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoReceiverChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::VideoReceiverChannelResource::VideoReceiverChannelResource(
-                                                                               const make_private &priv,
-                                                                               IRTPMediaEngineRegistrationPtr registration,
-                                                                               TransportPtr transport,
-                                                                               UseMediaStreamTrackPtr track,
-                                                                               ParametersPtr parameters,
-                                                                               RTPPacketPtr packet
-                                                                               ) :
-      ChannelResource(priv, registration),
-      mTransport(transport),
-      mTrack(track),
-      mParameters(parameters),
-      mInitPacket(packet)
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::VideoReceiverChannelResource::~VideoReceiverChannelResource()
-    {
-      mThisWeak.reset();  // shared pointer to self is no longer valid
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::VideoReceiverChannelResourcePtr RTPMediaEngine::VideoReceiverChannelResource::create(
-                                                                                                         IRTPMediaEngineRegistrationPtr registration,
-                                                                                                         TransportPtr transport,
-                                                                                                         UseMediaStreamTrackPtr track,
-                                                                                                         ParametersPtr parameters,
-                                                                                                         RTPPacketPtr packet
-                                                                                                         )
-    {
-      auto pThis = make_shared<VideoReceiverChannelResource>(
-                                                             make_private{},
-                                                             registration,
-                                                             transport,
-                                                             track,
-                                                             parameters,
-                                                             packet
-                                                             );
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::init()
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoReceiverChannelResource => IRTPMediaEngineChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoReceiverChannelResource => IRTPMediaEngineChannelResourceAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::onSecureTransportState(ISecureTransport::States state)
-    {
-      AutoRecursiveLock lock(*this);
-
-      if (state == mTransportState) return;
-
-      ISecureTransport::States previousState = mTransportState;
-      mTransportState = state;
-
-      if (!mReceiveStream) return;
-
-      if (mParameters && (mParameters->mEncodings.size() == 0 ||
-        (mParameters->mEncodings.size() > 0 && mParameters->mEncodings.begin()->mActive))) {
-        if (state == ISecureTransport::State_Connected)
-          mReceiveStream->Start();
-        else if (previousState == ISecureTransport::State_Connected)
-          mReceiveStream->Stop();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::onUpdate(ParametersPtr params)
-    {
-      AutoRecursiveLock lock(*this);
-
-      auto engine = mMediaEngine.lock();
-      if (!engine) return;
-
-      auto voiceEngine = engine->getVoiceEngine();
-      if (!voiceEngine) return;
-
-      ParametersPtr previousParams = mParameters;
-      mParameters = params;
-
-      if (!mReceiveStream) return;
-
-      bool previousActive = false;
-      bool currentActive = false;
-      if (previousParams->mEncodings.size() == 0 ||
-        (previousParams->mEncodings.size() > 0 && previousParams->mEncodings.begin()->mActive)) {
-        previousActive = true;
-      }
-      if (params->mEncodings.size() == 0 ||
-        (params->mEncodings.size() > 0 && params->mEncodings.begin()->mActive)) {
-        currentActive = true;
-      }
-      if (mTransportState == ISecureTransport::State_Connected) {
-        if (!previousActive && currentActive)
-          mReceiveStream->Start();
-        else if (previousActive && !currentActive)
-          mReceiveStream->Stop();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats)
-    {
-      AutoRecursiveLock lock(*this);
-
-      UseStatsReport::StatMap reportStats;
-
-      webrtc::VideoReceiveStream::Stats receiveStreamStats = mReceiveStream->GetStats();
-
-      auto track = mTrack.lock();
-      if (!track) {
-        notifyPromisesReject();
-        return;
-      }
-
-      if (stats.hasStatType(IStatsReportTypes::StatsTypes::StatsType_InboundRTP)) {
-
-        auto report = make_shared<IStatsReport::InboundRTPStreamStats>();
-
-        report->mID = string(receiveStreamStats.ssrc) + "_recv";
-
-        report->mSSRC = receiveStreamStats.ssrc;
-        report->mIsRemote = true;
-        report->mMediaType = "video";
-        report->mMediaTrackID = track->id();
-        report->mCodecID = mCodecPayloadName;
-        report->mFIRCount = receiveStreamStats.rtcp_packet_type_counts.fir_packets;
-        report->mPLICount = receiveStreamStats.rtcp_packet_type_counts.pli_packets;
-        report->mNACKCount = receiveStreamStats.rtcp_packet_type_counts.nack_packets;
-        report->mPacketsReceived = receiveStreamStats.rtp_stats.transmitted.packets;
-        report->mBytesReceived = receiveStreamStats.rtp_stats.transmitted.header_bytes +
-          receiveStreamStats.rtp_stats.transmitted.payload_bytes +
-          receiveStreamStats.rtp_stats.transmitted.padding_bytes;
-        report->mPacketsLost = receiveStreamStats.rtp_stats.retransmitted.packets;
-        report->mJitter = receiveStreamStats.rtcp_stats.jitter;
-        report->mFractionLost = receiveStreamStats.rtcp_stats.fraction_lost;
-#ifdef WINRT
-        report->mEndToEndDelay = Milliseconds(receiveStreamStats.current_endtoend_delay_ms);
-#endif
-        reportStats[report->mID] = report;
-      }
-
-      if (stats.hasStatType(IStatsReportTypes::StatsTypes::StatsType_Codec)) {
-
-        auto report = make_shared<IStatsReport::Codec>();
-
-        report->mID = string(receiveStreamStats.ssrc) + "_recv_codec";
-
-        report->mPayloadType = mCodecPayloadType;
-        report->mCodec = mCodecPayloadName;
-        report->mClockRate = 0;
-        report->mChannels = 0;
-
-        reportStats[report->mID] = report;
-      }
-
-      promise->resolve(UseStatsReport::create(reportStats));
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoReceiverChannelResource => IRTPMediaEngineVideoReceiverChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::VideoReceiverChannelResource::handlePacket(const RTPPacket &packet)
-    {
-      IRTPMediaEngineHandlePacketAsyncDelegateProxy::createUsingQueue(mHandlePacketQueue, getThis<VideoReceiverChannelResource>())->onHandleRTPPacket(packet.timestamp(), packet.buffer());
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::VideoReceiverChannelResource::handlePacket(const RTCPPacket &packet)
-    {
-      IRTPMediaEngineHandlePacketAsyncDelegateProxy::createUsingQueue(mHandlePacketQueue, getThis<VideoReceiverChannelResource>())->onHandleRTCPPacket(packet.buffer());
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoReceiverChannelResource => IRTPMediaEngineHandlePacketAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::onHandleRTPPacket(DWORD timestamp, SecureByteBlockPtr buffer)
-    {
-      AutoIncrementLock incLock(mAccessFromNonLockedMethods);
-
-      if (mDenyNonLockedAccess) return;
-
-      auto stream = mReceiveStream.get();
-      if (NULL == stream) return;
-
-      webrtc::PacketTime time(timestamp, 0);
-      bool result = stream->DeliverRtp(buffer->BytePtr(), buffer->SizeInBytes(), time);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::onHandleRTCPPacket(SecureByteBlockPtr buffer)
-    {
-      AutoIncrementLock incLock(mAccessFromNonLockedMethods);
-
-      if (mDenyNonLockedAccess) return;
-
-      auto stream = mReceiveStream.get();
-      if (NULL == stream) return;
-
-      bool result = stream->DeliverRtcp(buffer->BytePtr(), buffer->SizeInBytes());
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoReceiverChannelResource => webrtc::BitrateObserver
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::OnNetworkChanged(uint32_t targetBitrateBps, uint8_t fractionLoss, int64_t rttMs)
-    {
-      AutoRecursiveLock lock(*this);
-
-      mCurrentTargetBitrate = targetBitrateBps;
-
-      uint32_t allocatedBitrateBps = mBitrateAllocator->OnNetworkChanged(
-                                                                         targetBitrateBps,
-                                                                         fractionLoss,
-                                                                         rttMs
-                                                                         );
-
-      int padUpToBitrateBps = 0;
-      uint32_t pacerBitrateBps = std::max(targetBitrateBps, allocatedBitrateBps);
-
-      if (mCongestionController)
-        mCongestionController->UpdatePacerBitrate(
-                                                  targetBitrateBps / 1000,
-                                                  webrtc::PacedSender::kDefaultPaceMultiplier * pacerBitrateBps / 1000,
-                                                  padUpToBitrateBps / 1000
-                                                  );
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoReceiverChannelResource => friend RTPMediaEngine
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::stepSetup()
-    {
-      AutoRecursiveLock lock(*this);
-
-      auto track = mTrack.lock();
-      if (!track) {
-        return;
-      }
-
-      mModuleProcessThread = webrtc::ProcessThread::Create("VideoReceiverChannelResourceModuleProcessThread");
-      mPacerThread = webrtc::ProcessThread::Create("VideoReceiverChannelResourcePacerThread");
-
-      mReceiverVideoRenderer.setMediaStreamTrack(track);
-
-      mBitrateAllocator = rtc::scoped_ptr<webrtc::BitrateAllocator>(new webrtc::BitrateAllocator());
-      mCallStats = rtc::scoped_ptr<webrtc::CallStats>(new webrtc::CallStats(mClock));
-      mCongestionController =
-        rtc::scoped_ptr<webrtc::CongestionController>(new webrtc::CongestionController(
-                                                                                       mClock,
-                                                                                       this,
-                                                                                       &mRemb
-                                                                                       ));
-
-      mCallStats->RegisterStatsObserver(mCongestionController.get());
-
-      int numCpuCores = webrtc::CpuInfo::DetectNumberOfCores();
-
-      webrtc::Transport* transport = mTransport.get();
-      webrtc::VideoReceiveStream::Config config(transport);
-      webrtc::VideoReceiveStream::Decoder decoder;
-      std::vector<IRTPTypes::PayloadType> rtxPayloadTypes;
-
-      bool videoCodecSet = false;
-      bool rtxCodecSet = false;
-      bool redCodecSet = false;
-      bool fecCodecSet = false;
-      for (auto codecIter = mParameters->mCodecs.begin(); codecIter != mParameters->mCodecs.end(); ++codecIter) {
-        auto supportedCodec = IRTPTypes::toSupportedCodec(codecIter->mName);
-        switch (supportedCodec) {
-          case IRTPTypes::SupportedCodec_VP8:
-          {
-            if (videoCodecSet)
-              continue;
-            webrtc::VideoDecoder* videoDecoder = webrtc::VideoDecoder::Create(webrtc::VideoDecoder::kVp8);
-            decoder.decoder = videoDecoder;
-            decoder.payload_name = IRTPTypes::toString(supportedCodec);
-            decoder.payload_type = codecIter->mPayloadType;
-            goto set_rtcp_feedback;
-          }
-          case IRTPTypes::SupportedCodec_VP9:
-          {
-            if (videoCodecSet)
-              continue;
-            webrtc::VideoDecoder* videoDecoder = webrtc::VideoDecoder::Create(webrtc::VideoDecoder::kVp9);
-            decoder.decoder = videoDecoder;
-            decoder.payload_name = IRTPTypes::toString(supportedCodec);
-            decoder.payload_type = codecIter->mPayloadType;
-            goto set_rtcp_feedback;
-          }
-          case IRTPTypes::SupportedCodec_H264:
-          {
-            if (videoCodecSet)
-              continue;
-#ifndef WINRT
-            webrtc::VideoDecoder* videoDecoder = webrtc::VideoDecoder::Create(webrtc::VideoDecoder::kH264);
-#else
-            std::unique_ptr<cricket::WebRtcVideoDecoderFactory> decoderFactory = std::make_unique<webrtc::H264WinRTDecoderFactory>();
-            webrtc::VideoDecoder* videoDecoder = decoderFactory->CreateVideoDecoder(webrtc::VideoCodecType::kVideoCodecH264);
-#endif
-            decoder.decoder = videoDecoder;
-            decoder.payload_name = IRTPTypes::toString(supportedCodec);
-            decoder.payload_type = codecIter->mPayloadType;
-            goto set_rtcp_feedback;
-          }
-          case IRTPTypes::SupportedCodec_RTX:
-          {
-            if (rtxCodecSet)
-              continue;
-            rtxPayloadTypes.push_back(codecIter->mPayloadType);
-            rtxCodecSet = true;
-            break;
-          }
-          case IRTPTypes::SupportedCodec_RED:
-          {
-            if (redCodecSet)
-              continue;
-            config.rtp.fec.red_payload_type = codecIter->mPayloadType;
-            redCodecSet = true;
-            break;
-          }
-          case IRTPTypes::SupportedCodec_ULPFEC:
-          {
-            if (fecCodecSet)
-              continue;
-            config.rtp.fec.ulpfec_payload_type = codecIter->mPayloadType;
-            fecCodecSet = true;
-            break;
-          }
-          case IRTPTypes::SupportedCodec_FlexFEC:
-          {
-            break;
-          }
-        }
-        continue;
-
-      set_rtcp_feedback:
-        for (auto rtcpFeedbackIter = codecIter->mRTCPFeedback.begin(); rtcpFeedbackIter != codecIter->mRTCPFeedback.end(); rtcpFeedbackIter++) {
-          IRTPTypes::KnownFeedbackTypes feedbackType = IRTPTypes::toKnownFeedbackType(rtcpFeedbackIter->mType);
-          IRTPTypes::KnownFeedbackParameters feedbackParameter = IRTPTypes::toKnownFeedbackParameter(rtcpFeedbackIter->mParameter);
-          if (IRTPTypes::KnownFeedbackType_NACK == feedbackType && IRTPTypes::KnownFeedbackParameter_Unknown == feedbackParameter) {
-            config.rtp.nack.rtp_history_ms = 1000;
-          } else if (IRTPTypes::KnownFeedbackType_REMB == feedbackType && IRTPTypes::KnownFeedbackParameter_Unknown == feedbackParameter) {
-            config.rtp.remb = true;
-          }
-        }
-        videoCodecSet = true;
-      }
-
-      mCodecPayloadName = decoder.payload_name;
-      mCodecPayloadType = decoder.payload_type;
-
-      for (auto encodingParamIter = mParameters->mEncodings.begin(); encodingParamIter != mParameters->mEncodings.end(); encodingParamIter++) {
-
-        IRTPTypes::PayloadType codecPayloadType {};
-        if (encodingParamIter->mCodecPayloadType.hasValue())
-          codecPayloadType = encodingParamIter->mCodecPayloadType;
-        else
-          codecPayloadType = decoder.payload_type;
-
-        if (codecPayloadType == decoder.payload_type) {
-          uint32_t ssrc = 0;
-          if (encodingParamIter->mSSRC.hasValue())
-            ssrc = encodingParamIter->mSSRC;
-          if (encodingParamIter->mFEC.hasValue()) {
-            IRTPTypes::FECParameters fec = encodingParamIter->mFEC;
-            if (fec.mSSRC.hasValue()) {
-              ssrc = encodingParamIter->mSSRC;
-            }
-          }
-          config.rtp.remote_ssrc = ssrc;
-          if (encodingParamIter->mRTX.hasValue()) {
-            IRTPTypes::RTXParameters rtxEncodingParam = encodingParamIter->mRTX;
-            webrtc::VideoReceiveStream::Config::Rtp::Rtx rtx;
-            rtx.payload_type = rtxPayloadTypes.front();
-            if (rtxEncodingParam.mSSRC.hasValue())
-              rtx.ssrc = rtxEncodingParam.mSSRC;
-            config.rtp.rtx[codecPayloadType] = rtx;
-          }
-        }
-      }
-      if (config.rtp.remote_ssrc == 0) {
-        config.rtp.remote_ssrc = mInitPacket->ssrc();
-        mInitPacket.reset();
-      }
-      uint32_t localSSRC = mParameters->mRTCP.mSSRC;
-      if (localSSRC == 0)
-        localSSRC = 1;
-      config.rtp.local_ssrc = localSSRC;
-
-      for (auto headerExtensionIter = mParameters->mHeaderExtensions.begin(); headerExtensionIter != mParameters->mHeaderExtensions.end(); headerExtensionIter++) {
-        IRTPTypes::HeaderExtensionURIs headerExtensionURI = IRTPTypes::toHeaderExtensionURI(headerExtensionIter->mURI);
-        switch (headerExtensionURI) {
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_TransmissionTimeOffsets:
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_AbsoluteSendTime:
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_3gpp_VideoOrientation:
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_TransportSequenceNumber:
-            config.rtp.extensions.push_back(webrtc::RtpExtension(headerExtensionIter->mURI, headerExtensionIter->mID));
-            break;
-          default:
-            break;
-        }
-      }
-
-      if (mParameters->mRTCP.mReducedSize)
-        config.rtp.rtcp_mode = webrtc::RtcpMode::kReducedSize;
-      config.decoders.push_back(decoder);
-      config.renderer = &mReceiverVideoRenderer;
-
-      mModuleProcessThread->Start();
-      mModuleProcessThread->RegisterModule(mCallStats.get());
-      mModuleProcessThread->RegisterModule(mCongestionController.get());
-      mPacerThread->RegisterModule(mCongestionController->pacer());
-      mPacerThread->RegisterModule(mCongestionController->GetRemoteBitrateEstimator(true));
-      mPacerThread->Start();
-
-      mReceiveStream = rtc::scoped_ptr<webrtc::VideoReceiveStream>(
-        new webrtc::internal::VideoReceiveStream(
-                                                 numCpuCores,
-                                                 mCongestionController.get(),
-                                                 config,
-                                                 NULL,
-                                                 mModuleProcessThread.get(),
-                                                 mCallStats.get(),
-                                                 &mRemb
-                                                 ));
-
-      if (mTransportState == ISecureTransport::State_Connected)
-        mReceiveStream->Start();
-
-      notifyPromisesResolve();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoReceiverChannelResource::stepShutdown()
-    {
-      mDenyNonLockedAccess = true;
-
-      // rare race condition that can happen so
-      while (mAccessFromNonLockedMethods > 0)
-      {
-        // NOTE: very temporary lock so should clear itself out fast
-        std::this_thread::yield();
-      }
-
-      AutoRecursiveLock lock(*this);
-
-      if (mReceiveStream && mTransportState == ISecureTransport::State_Connected)
-        mReceiveStream->Stop();
-
-      mPacerThread->Stop();
-      mPacerThread->DeRegisterModule(mCongestionController->pacer());
-      mPacerThread->DeRegisterModule(mCongestionController->GetRemoteBitrateEstimator(true));
-      mModuleProcessThread->DeRegisterModule(mCongestionController.get());
-      mModuleProcessThread->DeRegisterModule(mCallStats.get());
-      mModuleProcessThread->Stop();
-
-      mCallStats->DeregisterStatsObserver(mCongestionController.get());
-
-      mReceiveStream.reset();
-      mCongestionController.reset();
-      mCallStats.reset();
-      mBitrateAllocator.reset();
-      mModuleProcessThread.reset();
-      mPacerThread.reset();
-
-      notifyPromisesShutdown();
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoSenderChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::VideoSenderChannelResource::VideoSenderChannelResource(
-                                                                           const make_private &priv,
-                                                                           IRTPMediaEngineRegistrationPtr registration,
-                                                                           TransportPtr transport,
-                                                                           UseMediaStreamTrackPtr track,
-                                                                           ParametersPtr parameters
-                                                                           ) :
-      ChannelResource(priv, registration),
-      mTransport(transport),
-      mTrack(track),
-      mParameters(parameters)
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::VideoSenderChannelResource::~VideoSenderChannelResource()
-    {
-      mThisWeak.reset();  // shared pointer to self is no longer valid
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEngine::VideoSenderChannelResourcePtr RTPMediaEngine::VideoSenderChannelResource::create(
-                                                                                                     IRTPMediaEngineRegistrationPtr registration,
-                                                                                                     TransportPtr transport,
-                                                                                                     UseMediaStreamTrackPtr track,
-                                                                                                     ParametersPtr parameters
-                                                                                                     )
-    {
-      auto pThis = make_shared<VideoSenderChannelResource>(
-                                                           make_private{},
-                                                           registration,
-                                                           transport,
-                                                           track,
-                                                           parameters
-                                                           );
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoSenderChannelResource::init()
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoSenderChannelResource => IRTPMediaEngineChannelResource
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoSenderChannelResource => IRTPMediaEngineChannelResourceAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoSenderChannelResource::onSecureTransportState(ISecureTransport::States state)
-    {
-      AutoRecursiveLock lock(*this);
-
-      if (state == mTransportState) return;
-
-      ISecureTransport::States previousState = mTransportState;
-      mTransportState = state;
-      
-      if (!mSendStream) return;
-
-      if (mParameters && (mParameters->mEncodings.size() == 0 ||
-        (mParameters->mEncodings.size() > 0 && mParameters->mEncodings.begin()->mActive))) {
-        if (state == ISecureTransport::State_Connected)
-          mSendStream->Start();
-        else if (previousState == ISecureTransport::State_Connected)
-          mSendStream->Stop();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoSenderChannelResource::onUpdate(ParametersPtr params)
-    {
-      AutoRecursiveLock lock(*this);
-
-      auto engine = mMediaEngine.lock();
-      if (!engine) return;
-
-      auto voiceEngine = engine->getVoiceEngine();
-      if (!voiceEngine) return;
-
-      ParametersPtr previousParams = mParameters;
-      mParameters = params;
-
-      if (!mSendStream) return;
-
-      bool previousActive = false;
-      bool currentActive = false;
-      if (previousParams->mEncodings.size() == 0 ||
-        (previousParams->mEncodings.size() > 0 && previousParams->mEncodings.begin()->mActive)) {
-        previousActive = true;
-      }
-      if (params->mEncodings.size() == 0 ||
-        (params->mEncodings.size() > 0 && params->mEncodings.begin()->mActive)) {
-        currentActive = true;
-      }
-      if (mTransportState == ISecureTransport::State_Connected) {
-        if (!previousActive && currentActive)
-          mSendStream->Start();
-        else if (previousActive && !currentActive)
-          mSendStream->Stop();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoSenderChannelResource::onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats)
-    {
-      AutoRecursiveLock lock(*this);
-
-      UseStatsReport::StatMap reportStats;
-
-      webrtc::VideoSendStream::Stats sendStreamStats = mSendStream->GetStats();
-
-      auto track = mTrack.lock();
-      if (!track) {
-        return;
-      }
-
-      if (stats.hasStatType(IStatsReportTypes::StatsTypes::StatsType_OutboundRTP)) {
-
-        for (auto statsIter = sendStreamStats.substreams.begin(); statsIter != sendStreamStats.substreams.end(); statsIter++) {
-
-          auto report = make_shared<IStatsReport::OutboundRTPStreamStats>();
-
-          report->mID = string((*statsIter).first) + "_send";
-
-          report->mSSRC = (*statsIter).first;
-          report->mIsRemote = false;
-          report->mMediaType = "video";
-          report->mMediaTrackID = track->id();
-          report->mCodecID = mCodecPayloadName;
-          report->mFIRCount = (*statsIter).second.rtcp_packet_type_counts.fir_packets;
-          report->mPLICount = (*statsIter).second.rtcp_packet_type_counts.pli_packets;
-          report->mNACKCount = (*statsIter).second.rtcp_packet_type_counts.nack_packets;
-          report->mPacketsSent = (*statsIter).second.rtp_stats.transmitted.packets;
-          report->mBytesSent = (*statsIter).second.rtp_stats.transmitted.header_bytes +
-            (*statsIter).second.rtp_stats.transmitted.payload_bytes +
-            (*statsIter).second.rtp_stats.transmitted.padding_bytes;
-          report->mTargetBitrate = (DOUBLE)mCurrentTargetBitrate;
-          report->mRoundTripTime = (DOUBLE)mCallStats->rtcp_rtt_stats()->LastProcessedRtt();
-
-          reportStats[report->mID] = report;
-        }
-      }
-
-      if (stats.hasStatType(IStatsReportTypes::StatsTypes::StatsType_Codec)) {
-        auto report = make_shared<IStatsReport::Codec>();
-
-        report->mID = string((*sendStreamStats.substreams.begin()).first) + "_send_codec";
-
-        report->mPayloadType = mCodecPayloadType;
-        report->mCodec = mCodecPayloadName;
-        report->mClockRate = 0;
-        report->mChannels = 0;
-
-        reportStats[report->mID] = report;
-      }
-
-      promise->resolve(UseStatsReport::create(reportStats));
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoSenderChannelResource => IRTPMediaEngineHandlePacketAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPMediaEngine::VideoSenderChannelResource::handlePacket(const RTCPPacket &packet)
-    {
-      IRTPMediaEngineHandlePacketAsyncDelegateProxy::createUsingQueue(mHandlePacketQueue, getThis<VideoSenderChannelResource>())->onHandleRTCPPacket(packet.buffer());
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoSenderChannelResource::sendVideoFrame(VideoFramePtr videoFrame)
-    {
-      IRTPMediaEngineHandlePacketAsyncDelegateProxy::createUsingQueue(mHandlePacketQueue, getThis<VideoSenderChannelResource>())->onSendVideoFrame(videoFrame);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoSenderChannelResource => IRTPMediaEngineHandlePacketAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoSenderChannelResource::onHandleRTCPPacket(SecureByteBlockPtr buffer)
-    {
-      AutoIncrementLock incLock(mAccessFromNonLockedMethods);
-
-      if (mDenyNonLockedAccess) return;
-
-      auto stream = mSendStream.get();
-      if (NULL == stream) return;
-
-      bool result = stream->DeliverRtcp(buffer->BytePtr(), buffer->SizeInBytes());
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoSenderChannelResource::onSendVideoFrame(VideoFramePtr videoFrame)
-    {
-      AutoIncrementLock incLock(mAccessFromNonLockedMethods);
-
-      if (mDenyNonLockedAccess) return;
-
-      auto stream = mSendStream.get();
-      if (NULL == stream) return;
-
-      stream->Input()->IncomingCapturedFrame(*videoFrame);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoSenderChannelResource => webrtc::BitrateObserver
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoSenderChannelResource::OnNetworkChanged(uint32_t targetBitrateBps, uint8_t fractionLoss, int64_t rttMs)
-    {
-      AutoRecursiveLock lock(*this);
-
-      mCurrentTargetBitrate = targetBitrateBps;
-
-      uint32_t allocatedBitrateBps = mBitrateAllocator->OnNetworkChanged(
-                                                                         targetBitrateBps,
-                                                                         fractionLoss,
-                                                                         rttMs
-                                                                         );
-
-      int padUpToBitrateBps = 0;
-      if (mSendStream)
-        padUpToBitrateBps = static_cast<webrtc::internal::VideoSendStream *>(mSendStream.get())->GetPaddingNeededBps();
-      uint32_t pacerBitrateBps = std::max(targetBitrateBps, allocatedBitrateBps);
-
-      if (mCongestionController)
-        mCongestionController->UpdatePacerBitrate(
-                                                  targetBitrateBps / 1000,
-                                                  webrtc::PacedSender::kDefaultPaceMultiplier * pacerBitrateBps / 1000,
-                                                  padUpToBitrateBps / 1000
-                                                  );
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine::VideoSenderChannelResource => friend RTPMediaEngine
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoSenderChannelResource::stepSetup()
-    {
-      AutoRecursiveLock lock(*this);
-
-      auto track = mTrack.lock();
-      if (!track) {
-        return;
-      }
-
-      mModuleProcessThread = webrtc::ProcessThread::Create("VideoSenderChannelResourceModuleProcessThread");
-      mPacerThread = webrtc::ProcessThread::Create("VideoSenderChannelResourcePacerThread");
-
-      mBitrateAllocator = rtc::scoped_ptr<webrtc::BitrateAllocator>(new webrtc::BitrateAllocator());
-      mCallStats = rtc::scoped_ptr<webrtc::CallStats>(new webrtc::CallStats(mClock));
-      mCongestionController =
-        rtc::scoped_ptr<webrtc::CongestionController>(new webrtc::CongestionController(
-                                                                                       mClock,
-                                                                                       this,
-                                                                                       &mRemb
-                                                                                       ));
-
-      mCallStats->RegisterStatsObserver(mCongestionController.get());
-
-      int numCpuCores = webrtc::CpuInfo::DetectNumberOfCores();
-
-      size_t sourceWidth = 640;
-      size_t sourceHeight = 480;
-      int sourceMaxFramerate = 15;
-      IMediaStreamTrack::SettingsPtr trackSettings = track->getSettings();
-      if (trackSettings->mWidth.hasValue())
-        sourceWidth = trackSettings->mWidth.value();
-      if (trackSettings->mHeight.hasValue())
-        sourceHeight = trackSettings->mHeight.value();
-      if (trackSettings->mFrameRate.hasValue())
-        sourceMaxFramerate = trackSettings->mFrameRate.value();
-
-      webrtc::VideoSendStream::Config config(mTransport.get());
-      webrtc::VideoEncoderConfig encoderConfig;
-      std::map<uint32_t, webrtc::RtpState> suspendedSSRCs;
-
-      encoderConfig.min_transmit_bitrate_bps = 0;
-      encoderConfig.content_type = webrtc::VideoEncoderConfig::ContentType::kRealtimeVideo;
-
-      bool videoCodecSet = false;
-      bool rtxCodecSet = false;
-      bool redCodecSet = false;
-      bool fecCodecSet = false;
-      for (auto codecIter = mParameters->mCodecs.begin(); codecIter != mParameters->mCodecs.end(); codecIter++) {
-        auto supportedCodec = IRTPTypes::toSupportedCodec(codecIter->mName);
-        switch (supportedCodec) {
-          case IRTPTypes::SupportedCodec_VP8:
-          {
-            if (videoCodecSet)
-              continue;
-            webrtc::VideoEncoder* videoEncoder = webrtc::VideoEncoder::Create(webrtc::VideoEncoder::kVp8);
-            config.encoder_settings.encoder = videoEncoder;
-            config.encoder_settings.payload_name = IRTPTypes::toString(supportedCodec);
-            config.encoder_settings.payload_type = codecIter->mPayloadType;
-            mVideoEncoderSettings.mVp8 = webrtc::VideoEncoder::GetDefaultVp8Settings();
-            mVideoEncoderSettings.mVp8.automaticResizeOn = true;
-            mVideoEncoderSettings.mVp8.denoisingOn = true;
-            mVideoEncoderSettings.mVp8.frameDroppingOn = true;
-            encoderConfig.encoder_specific_settings = &mVideoEncoderSettings.mVp8;
-            goto set_rtcp_feedback;
-          }
-          case IRTPTypes::SupportedCodec_VP9:
-          {
-            if (videoCodecSet)
-              continue;
-            webrtc::VideoEncoder* videoEncoder = webrtc::VideoEncoder::Create(webrtc::VideoEncoder::kVp9);
-            config.encoder_settings.encoder = videoEncoder;
-            config.encoder_settings.payload_name = IRTPTypes::toString(supportedCodec);
-            config.encoder_settings.payload_type = codecIter->mPayloadType;
-            mVideoEncoderSettings.mVp9 = webrtc::VideoEncoder::GetDefaultVp9Settings();
-            mVideoEncoderSettings.mVp9.frameDroppingOn = true;
-            encoderConfig.encoder_specific_settings = &mVideoEncoderSettings.mVp9;
-            goto set_rtcp_feedback;
-          }
-          case IRTPTypes::SupportedCodec_H264:
-          {
-            if (videoCodecSet)
-              continue;
-#ifndef WINRT
-            webrtc::VideoEncoder* videoEncoder = webrtc::VideoEncoder::Create(webrtc::VideoEncoder::kH264);
-#else
-            std::unique_ptr<cricket::WebRtcVideoEncoderFactory> encoderFactory = std::make_unique<webrtc::H264WinRTEncoderFactory>();
-            webrtc::VideoEncoder* videoEncoder = encoderFactory->CreateVideoEncoder(webrtc::VideoCodecType::kVideoCodecH264);
-#endif
-            config.encoder_settings.encoder = videoEncoder;
-            config.encoder_settings.payload_name = IRTPTypes::toString(supportedCodec);
-            config.encoder_settings.payload_type = codecIter->mPayloadType;
-            mVideoEncoderSettings.mH264 = webrtc::VideoEncoder::GetDefaultH264Settings();
-            mVideoEncoderSettings.mH264.frameDroppingOn = true;
-            encoderConfig.encoder_specific_settings = &mVideoEncoderSettings.mH264;
-            goto set_rtcp_feedback;
-          }
-          case IRTPTypes::SupportedCodec_RTX:
-          {
-            if (rtxCodecSet)
-              continue;
-            config.rtp.rtx.payload_type = codecIter->mPayloadType;
-            rtxCodecSet = true;
-            break;
-          }
-          case IRTPTypes::SupportedCodec_RED:
-          {
-            if (redCodecSet)
-              continue;
-            config.rtp.fec.red_payload_type = codecIter->mPayloadType;
-            redCodecSet = true;
-            break;
-          }
-          case IRTPTypes::SupportedCodec_ULPFEC:
-          {
-            if (fecCodecSet)
-              continue;
-            config.rtp.fec.ulpfec_payload_type = codecIter->mPayloadType;
-            fecCodecSet = true;
-            break;
-          }
-          case IRTPTypes::SupportedCodec_FlexFEC:
-          {
-            break;
-          }
-        }
-        continue;
-
-      set_rtcp_feedback:
-        for (auto rtcpFeedbackIter = codecIter->mRTCPFeedback.begin(); rtcpFeedbackIter != codecIter->mRTCPFeedback.end(); rtcpFeedbackIter++) {
-          IRTPTypes::KnownFeedbackTypes feedbackType = IRTPTypes::toKnownFeedbackType(rtcpFeedbackIter->mType);
-          IRTPTypes::KnownFeedbackParameters feedbackParameter = IRTPTypes::toKnownFeedbackParameter(rtcpFeedbackIter->mParameter);
-          if (IRTPTypes::KnownFeedbackType_NACK == feedbackType && IRTPTypes::KnownFeedbackParameter_Unknown == feedbackParameter) {
-            config.rtp.nack.rtp_history_ms = 1000;
-          }
-        }
-        videoCodecSet = true;
-      }
-
-      mCodecPayloadName = config.encoder_settings.payload_name;
-      mCodecPayloadType = config.encoder_settings.payload_type;
-
-      int totalMinBitrate = 0;
-      int totalMaxBitrate = 0;
-      int totalTargetBitrate = 0;
-      for (auto encodingParamIter = mParameters->mEncodings.begin(); encodingParamIter != mParameters->mEncodings.end(); encodingParamIter++) {
-
-        IRTPTypes::PayloadType codecPayloadType {};
-        if (encodingParamIter->mCodecPayloadType.hasValue())
-          codecPayloadType = encodingParamIter->mCodecPayloadType;
-        else
-          codecPayloadType = config.encoder_settings.payload_type;
-
-        if (codecPayloadType == config.encoder_settings.payload_type) {
-          uint32_t ssrc = 0;
-          if (encodingParamIter->mSSRC.hasValue())
-            ssrc = encodingParamIter->mSSRC;
-          if (encodingParamIter->mFEC.hasValue()) {
-            IRTPTypes::FECParameters fec = encodingParamIter->mFEC;
-            if (fec.mSSRC.hasValue()) {
-              ssrc = encodingParamIter->mSSRC;
-            }
-          }
-          if (ssrc == 0)
-            ssrc = SafeInt<uint32_t>(ortc::services::IHelper::random(1, 0xFFFFFFFF));
-          config.rtp.ssrcs.push_back(ssrc);
-          if (encodingParamIter->mRTX.hasValue()) {
-            IRTPTypes::RTXParameters rtx = encodingParamIter->mRTX;
-            if (rtx.mSSRC.hasValue())
-              config.rtp.rtx.ssrcs.push_back(rtx.mSSRC);
-          }
-          webrtc::VideoStream stream;
-          stream.width = encodingParamIter->mResolutionScale.hasValue() ? sourceWidth / encodingParamIter->mResolutionScale : sourceWidth;
-          stream.height = encodingParamIter->mResolutionScale.hasValue() ? sourceHeight / encodingParamIter->mResolutionScale : sourceHeight;
-          stream.max_framerate = encodingParamIter->mFramerateScale.hasValue() ? sourceMaxFramerate / encodingParamIter->mResolutionScale : sourceMaxFramerate;
-          stream.min_bitrate_bps = 30000;
-          stream.max_bitrate_bps = encodingParamIter->mMaxBitrate.hasValue() ? encodingParamIter->mMaxBitrate : 2000000;
-          stream.target_bitrate_bps = stream.max_bitrate_bps / 2;
-          stream.max_qp = 56;
-          encoderConfig.streams.push_back(stream);
-          totalMinBitrate += stream.min_bitrate_bps;
-          totalMaxBitrate += stream.max_bitrate_bps;
-          totalTargetBitrate += stream.target_bitrate_bps;
-        }
-      }
-      if (encoderConfig.streams.size() == 0) {
-        config.rtp.ssrcs.push_back(SafeInt<uint32_t>(ortc::services::IHelper::random(1, 0xFFFFFFFF)));
-        webrtc::VideoStream stream;
-        stream.width = sourceWidth;
-        stream.height = sourceHeight;
-        stream.max_framerate = sourceMaxFramerate;
-        stream.min_bitrate_bps = 30000;
-        stream.max_bitrate_bps = 2000000;
-        stream.target_bitrate_bps = stream.max_bitrate_bps / 2;
-        stream.max_qp = 56;
-        encoderConfig.streams.push_back(stream);
-        totalMinBitrate = stream.min_bitrate_bps;
-        totalMaxBitrate = stream.max_bitrate_bps;
-        totalTargetBitrate = stream.target_bitrate_bps;
-      }
-      if (encoderConfig.streams.size() > 1)
-        mVideoEncoderSettings.mVp8.automaticResizeOn = false;
-
-      for (auto headerExtensionIter = mParameters->mHeaderExtensions.begin(); headerExtensionIter != mParameters->mHeaderExtensions.end(); headerExtensionIter++) {
-        IRTPTypes::HeaderExtensionURIs headerExtensionURI = IRTPTypes::toHeaderExtensionURI(headerExtensionIter->mURI);
-        switch (headerExtensionURI) {
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_TransmissionTimeOffsets:
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_AbsoluteSendTime:
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_3gpp_VideoOrientation:
-          case IRTPTypes::HeaderExtensionURIs::HeaderExtensionURI_TransportSequenceNumber:
-            config.rtp.extensions.push_back(webrtc::RtpExtension(headerExtensionIter->mURI, headerExtensionIter->mID));
-            break;
-          default:
-            break;
-        }
-      }
-
-      config.rtp.c_name = mParameters->mRTCP.mCName;
-
-      mCongestionController->SetBweBitrates(totalMinBitrate, totalTargetBitrate, totalMaxBitrate);
-
-      mModuleProcessThread->Start();
-      mModuleProcessThread->RegisterModule(mCallStats.get());
-      mModuleProcessThread->RegisterModule(mCongestionController.get());
-      mPacerThread->RegisterModule(mCongestionController->pacer());
-      mPacerThread->RegisterModule(mCongestionController->GetRemoteBitrateEstimator(true));
-      mPacerThread->Start();
-
-      mSendStream = rtc::scoped_ptr<webrtc::VideoSendStream>(
-        new webrtc::internal::VideoSendStream(
-                                              numCpuCores,
-                                              mModuleProcessThread.get(),
-                                              mCallStats.get(),
-                                              mCongestionController.get(),
-                                              &mRemb,
-                                              mBitrateAllocator.get(),
-                                              config,
-                                              encoderConfig,
-                                              suspendedSSRCs
-                                              ));
-
-      if (mTransportState == ISecureTransport::State_Connected)
-        mSendStream->Start();
-
-      notifyPromisesResolve();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPMediaEngine::VideoSenderChannelResource::stepShutdown()
-    {
-      mDenyNonLockedAccess = true;
-
-      // rare race condition that can happen so
-      while (mAccessFromNonLockedMethods > 0)
-      {
-        // NOTE: very temporary lock so should clear itself out fast
-        std::this_thread::yield();
-      }
-
-      AutoRecursiveLock lock(*this);
-
-      if (mSendStream && mTransportState == ISecureTransport::State_Connected)
-        mSendStream->Stop();
-
-      mPacerThread->Stop();
-      mPacerThread->DeRegisterModule(mCongestionController->pacer());
-      mPacerThread->DeRegisterModule(mCongestionController->GetRemoteBitrateEstimator(true));
-      mModuleProcessThread->DeRegisterModule(mCongestionController.get());
-      mModuleProcessThread->DeRegisterModule(mCallStats.get());
-      mModuleProcessThread->Stop();
-
-      mCallStats->DeregisterStatsObserver(mCongestionController.get());
-
-      mSendStream.reset();
-      mCongestionController.reset();
-      mCallStats.reset();
-      mBitrateAllocator.reset();
-      mModuleProcessThread.reset();
-      mPacerThread.reset();
-
-      notifyPromisesShutdown();
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineFactory
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    IRTPMediaEngineFactory &IRTPMediaEngineFactory::singleton()
-    {
-      return RTPMediaEngineFactory::singleton();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPMediaEnginePtr IRTPMediaEngineFactory::create(IRTPMediaEngineRegistrationPtr registration)
-    {
-      if (this) {}
-      return internal::RTPMediaEngine::create(registration);
-    }
-
-  } // internal namespace
-}
diff --git a/ortc/cpp/ortc_RTPPacket.cpp b/ortc/cpp/ortc_RTPPacket.cpp
index 3ccc5609..fe6c2433 100644
--- a/ortc/cpp/ortc_RTPPacket.cpp
+++ b/ortc/cpp/ortc_RTPPacket.cpp
@@ -29,7 +29,9 @@
  
  */
 
-#include <ortc/internal/ortc_RTPPacket.h>
+#include <ortc/RTPPacket.h>
+#include <ortc/internal/ortc.events.h>
+
 #include <ortc/internal/ortc_Helper.h>
 #include <ortc/internal/ortc_RTPUtils.h>
 #include <ortc/internal/platform.h>
@@ -46,6 +48,7 @@
 
 #include <sstream>
 
+
 #ifdef _DEBUG
 #define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
 #else
@@ -65,21 +68,23 @@
 #define RTP_GET_BITS(xByte, xBitPattern, xLowestBit) (((xByte) >> (xLowestBit)) & (xBitPattern))
 #define RTP_PACK_BITS(xByte, xBitPattern, xLowestBit) (((xByte) & (xBitPattern)) << (xLowestBit))
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtp_rtcp_packet) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_rtp_rtcp_packet) }
 
 namespace ortc
 {
-  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHelper, UseServicesHelper)
-//  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP)
-//
-//  typedef ortc::services::Hasher<CryptoPP::SHA1> SHA1Hasher;
+  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHelper, UseServicesHelper);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::internal::Helper, UseHelper);
+  ZS_DECLARE_TYPEDEF_PTR(ortc::internal::RTPUtils, UseRTPUtils);
 
-  namespace internal
-  {
-    ZS_DECLARE_TYPEDEF_PTR(ortc::internal::Helper, UseHelper)
+  using CryptoPP::Integer;
+
+  //  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP)
+  //
+  //  typedef ortc::services::Hasher<CryptoPP::SHA1> SHA1Hasher;
 
-    using CryptoPP::Integer;
 
+  namespace internal
+  {
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -131,1268 +136,1384 @@ namespace ortc
         outSizeInBytes += (sizeof(DWORD) - modulas);
       }
     }
+  } // namespace internal
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket::HeaderExtension
+  #pragma mark
+
+  //---------------------------------------------------------------------------
+  void RTPPacket::HeaderExtension::trace(
+                                         const char *func,
+                                         const char *message
+                                         ) const
+  {
+    ZS_EVENTING_6(x, i, Basic, RTPPacketHeaderExtension, ol, RtpPacket, Info, 
+      string, func, func,
+      string, message, message,
+      byte, id, mID,
+      binary, data, mData, 
+      size, dataSizeInBytes, mDataSizeInBytes, 
+      size_t, postPaddingSize, mPostPaddingSize
+    );
+  }
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket::ClientToMixerExtension
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPPacket::ClientToMixerExtension::ClientToMixerExtension(const HeaderExtension &header)
-    {
-      mID = header.mID;
-      mDataSizeInBytes = header.mDataSizeInBytes;
-      mPostPaddingSize = header.mPostPaddingSize;
-      if (NULL == header.mData) mDataSizeInBytes = 0;
-      if (0 == mDataSizeInBytes) mData = NULL;
-
-      if (sizeof(BYTE) == header.mDataSizeInBytes) {
-        memcpy(&mLevelBuffer, header.mData, sizeof(BYTE));
-        mData = &mLevelBuffer;
-      }
-    }
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket::ClientToMixerExtension
+  #pragma mark
 
-    //-------------------------------------------------------------------------
-    RTPPacket::ClientToMixerExtension::ClientToMixerExtension(
-                                                              BYTE id,
-                                                              bool voiceActivity,
-                                                              BYTE level
-                                                              )
-    {
-      mID = id;
+  //---------------------------------------------------------------------------
+  RTPPacket::ClientToMixerExtension::ClientToMixerExtension(const HeaderExtension &header)
+  {
+    mID = header.mID;
+    mDataSizeInBytes = header.mDataSizeInBytes;
+    mPostPaddingSize = header.mPostPaddingSize;
+    if (NULL == header.mData) mDataSizeInBytes = 0;
+    if (0 == mDataSizeInBytes) mData = NULL;
+
+    if (sizeof(BYTE) == header.mDataSizeInBytes) {
+      memcpy(&mLevelBuffer, header.mData, sizeof(BYTE));
       mData = &mLevelBuffer;
-      mDataSizeInBytes = sizeof(BYTE);
-
-      mLevelBuffer = static_cast<BYTE>(voiceActivity ? 0x80 : 0x00) | (level & 0x7F);
     }
+  }
 
-    //-------------------------------------------------------------------------
-    bool RTPPacket::ClientToMixerExtension::voiceActivity() const
-    {
-      return RTP_IS_FLAG_SET(mLevelBuffer, 7);
-    }
+  //---------------------------------------------------------------------------
+  RTPPacket::ClientToMixerExtension::ClientToMixerExtension(
+                                                            BYTE id,
+                                                            bool voiceActivity,
+                                                            BYTE level
+                                                            )
+  {
+    mID = id;
+    mData = &mLevelBuffer;
+    mDataSizeInBytes = sizeof(BYTE);
 
-    //-------------------------------------------------------------------------
-    BYTE RTPPacket::ClientToMixerExtension::level() const
-    {
-      return RTP_GET_BITS(mLevelBuffer, 0x7F, 0);
-    }
+    mLevelBuffer = static_cast<BYTE>(voiceActivity ? 0x80 : 0x00) | (level & 0x7F);
+  }
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket::MixerToClientExtension
-    #pragma mark
+  //---------------------------------------------------------------------------
+  bool RTPPacket::ClientToMixerExtension::voiceActivity() const
+  {
+    return RTP_IS_FLAG_SET(mLevelBuffer, 7);
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacket::MixerToClientExtension::MixerToClientExtension(const HeaderExtension &header)
-    {
-      mID = header.mID;
-      mDataSizeInBytes = header.mDataSizeInBytes;
-      mPostPaddingSize = header.mPostPaddingSize;
-      if (NULL == header.mData) mDataSizeInBytes = 0;
-      if (0 == mDataSizeInBytes) mData = NULL;
-
-      size_t copySize = header.mDataSizeInBytes;
-      if (copySize > sizeof(mLevelBuffer)) copySize = sizeof(mLevelBuffer);
-
-      if (0 != copySize) {
-        memcpy(&(mLevelBuffer[0]), header.mData, copySize);
-        mData = &(mLevelBuffer[0]);
-      }
-      mDataSizeInBytes = copySize;
-    }
+  //---------------------------------------------------------------------------
+  BYTE RTPPacket::ClientToMixerExtension::level() const
+  {
+    return RTP_GET_BITS(mLevelBuffer, 0x7F, 0);
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacket::MixerToClientExtension::MixerToClientExtension(
-                                                              BYTE id,
-                                                              BYTE *levels,
-                                                              size_t count
-                                                              )
-    {
-      mID = id;
-      mDataSizeInBytes = count * sizeof(BYTE);
+  //---------------------------------------------------------------------------
+  void RTPPacket::ClientToMixerExtension::trace(
+                                                const char *func,
+                                                const char *message
+                                                ) const
+  {
+    ZS_EVENTING_8(x, i, Basic, RTPPacketClientToMixerExtension, ol, RtpPacket, Info,
+      string, func, func,
+      string, message, message,
+      byte, id, mID,
+      binary, data, mData,
+      size, dataSizeInBytes, mDataSizeInBytes,
+      size_t, postPaddingSize, mPostPaddingSize,
+      bool, voiceActivity, voiceActivity(),
+      byte, level, level()
+    );
+  }
 
-      if (mDataSizeInBytes > sizeof(mLevelBuffer)) {
-        count = sizeof(mLevelBuffer)/sizeof(BYTE);
-      }
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket::MixerToClientExtension
+  #pragma mark
 
-      if (0 != mDataSizeInBytes) {
-        mData = &(mLevelBuffer[0]);
-        memcpy(&(mLevelBuffer[0]), levels, mDataSizeInBytes);
-      }
+  //---------------------------------------------------------------------------
+  RTPPacket::MixerToClientExtension::MixerToClientExtension(const HeaderExtension &header)
+  {
+    mID = header.mID;
+    mDataSizeInBytes = header.mDataSizeInBytes;
+    mPostPaddingSize = header.mPostPaddingSize;
+    if (NULL == header.mData) mDataSizeInBytes = 0;
+    if (0 == mDataSizeInBytes) mData = NULL;
+
+    size_t copySize = header.mDataSizeInBytes;
+    if (copySize > sizeof(mLevelBuffer)) copySize = sizeof(mLevelBuffer);
+
+    if (0 != copySize) {
+      memcpy(&(mLevelBuffer[0]), header.mData, copySize);
+      mData = &(mLevelBuffer[0]);
     }
+    mDataSizeInBytes = copySize;
+  }
 
-    //-------------------------------------------------------------------------
-    size_t RTPPacket::MixerToClientExtension::levelsCount() const
-    {
-      return mDataSizeInBytes / sizeof(BYTE);
-    }
+  //---------------------------------------------------------------------------
+  RTPPacket::MixerToClientExtension::MixerToClientExtension(
+                                                            BYTE id,
+                                                            BYTE *levels,
+                                                            size_t count
+                                                            )
+  {
+    mID = id;
+    mDataSizeInBytes = count * sizeof(BYTE);
 
-    //-------------------------------------------------------------------------
-    BYTE RTPPacket::MixerToClientExtension::unusedBit(size_t index) const
-    {
-      ASSERT(index < levelsCount())
-      return RTP_GET_BITS(mLevelBuffer[index], 0x80, 7);
+    if (mDataSizeInBytes > sizeof(mLevelBuffer)) {
+      count = sizeof(mLevelBuffer)/sizeof(BYTE);
     }
 
-    //-------------------------------------------------------------------------
-    BYTE RTPPacket::MixerToClientExtension::level(size_t index) const
-    {
-      ASSERT(index < levelsCount())
-      return RTP_GET_BITS(mLevelBuffer[index], 0x7F, 0);
+    if (0 != mDataSizeInBytes) {
+      mData = &(mLevelBuffer[0]);
+      memcpy(&(mLevelBuffer[0]), levels, mDataSizeInBytes);
     }
+  }
 
+  //---------------------------------------------------------------------------
+  size_t RTPPacket::MixerToClientExtension::levelsCount() const
+  {
+    return mDataSizeInBytes / sizeof(BYTE);
+  }
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket::StringHeaderExtension
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPPacket::StringHeaderExtension::StringHeaderExtension(const HeaderExtension &header)
-    {
-      ASSERT(sizeof(char) == sizeof(BYTE))
+  //---------------------------------------------------------------------------
+  BYTE RTPPacket::MixerToClientExtension::unusedBit(size_t index) const
+  {
+    ASSERT(index < levelsCount())
+    return RTP_GET_BITS(mLevelBuffer[index], 0x80, 7);
+  }
 
-      mID = header.mID;
-      mDataSizeInBytes = header.mDataSizeInBytes;
-      mPostPaddingSize = header.mPostPaddingSize;
-      if (NULL == header.mData) mDataSizeInBytes = 0;
-      if (0 == mDataSizeInBytes) mData = NULL;
+  //---------------------------------------------------------------------------
+  BYTE RTPPacket::MixerToClientExtension::level(size_t index) const
+  {
+    ASSERT(index < levelsCount())
+    return RTP_GET_BITS(mLevelBuffer[index], 0x7F, 0);
+  }
 
-      size_t copySize = header.mDataSizeInBytes;
-      if (copySize > (sizeof(BYTE)*kMaxStringLength)) copySize = (sizeof(BYTE)*kMaxStringLength);
+  //---------------------------------------------------------------------------
+  void RTPPacket::MixerToClientExtension::trace(
+                                                const char *func,
+                                                const char *message
+                                                ) const
+  {
+    ZS_EVENTING_7(x, i, Basic, RTPPacketMixerToClientExtension, ol, RtpPacket, Info,
+      string, func, func,
+      string, message, message,
+      byte, id, mID,
+      binary, data, mData,
+      size, dataSizeInBytes, mDataSizeInBytes,
+      size_t, postPaddingSize, mPostPaddingSize,
+      size_t, levelsCount, levelsCount()
+    );
+  }
 
-      if (0 != copySize) {
-        memcpy(&(mStringBuffer[0]), header.mData, copySize);
-        mData = &(mStringBuffer[0]);
-      }
-      mDataSizeInBytes = copySize;
-    }
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket::StringHeaderExtension
+  #pragma mark
 
-    //-------------------------------------------------------------------------
-    RTPPacket::StringHeaderExtension::StringHeaderExtension(
-                                                  BYTE id,
-                                                  const char *mid
-                                                  )
-    {
-      mID = id;
-      mData = &(mStringBuffer[0]);
-      mDataSizeInBytes = sizeof(char)*(NULL != mid ? strlen(mid) : 0);
+  //---------------------------------------------------------------------------
+  RTPPacket::StringHeaderExtension::StringHeaderExtension(const HeaderExtension &header)
+  {
+    ASSERT(sizeof(char) == sizeof(BYTE))
 
-      if (mDataSizeInBytes > (sizeof(BYTE)*kMaxStringLength)) mDataSizeInBytes = (sizeof(BYTE)*kMaxStringLength);
+    mID = header.mID;
+    mDataSizeInBytes = header.mDataSizeInBytes;
+    mPostPaddingSize = header.mPostPaddingSize;
+    if (NULL == header.mData) mDataSizeInBytes = 0;
+    if (0 == mDataSizeInBytes) mData = NULL;
 
-      if (0 != mDataSizeInBytes) {
-        memcpy(&(mStringBuffer[0]), mid, mDataSizeInBytes);
-      }
-    }
+    size_t copySize = header.mDataSizeInBytes;
+    if (copySize > (sizeof(BYTE)*kMaxStringLength)) copySize = (sizeof(BYTE)*kMaxStringLength);
 
-    //-------------------------------------------------------------------------
-    const char *RTPPacket::StringHeaderExtension::str() const
-    {
-      return reinterpret_cast<const char *>(&mStringBuffer[0]);
+    if (0 != copySize) {
+      memcpy(&(mStringBuffer[0]), header.mData, copySize);
+      mData = &(mStringBuffer[0]);
     }
+    mDataSizeInBytes = copySize;
+  }
 
-    //-------------------------------------------------------------------------
-    ElementPtr RTPPacket::StringHeaderExtension::toDebug() const
-    {
-      ElementPtr result = Element::create("ortc::RTPPacket::StringHeaderExtension");
+  //---------------------------------------------------------------------------
+  RTPPacket::StringHeaderExtension::StringHeaderExtension(
+                                                          BYTE id,
+                                                          const char *mid
+                                                          )
+  {
+    mID = id;
+    mData = &(mStringBuffer[0]);
+    mDataSizeInBytes = sizeof(char)*(NULL != mid ? strlen(mid) : 0);
 
-      UseServicesHelper::debugAppend(result, "str", str());
+    if (mDataSizeInBytes > (sizeof(BYTE)*kMaxStringLength)) mDataSizeInBytes = (sizeof(BYTE)*kMaxStringLength);
 
-      return result;
+    if (0 != mDataSizeInBytes) {
+      memcpy(&(mStringBuffer[0]), mid, mDataSizeInBytes);
     }
+  }
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket::StringHeaderExtension
-    #pragma mark
+  //---------------------------------------------------------------------------
+  const char *RTPPacket::StringHeaderExtension::str() const
+  {
+    return reinterpret_cast<const char *>(&mStringBuffer[0]);
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacket::NumberHeaderExtension::NumberHeaderExtension(const HeaderExtension &header)
-    {
-      ASSERT(sizeof(char) == sizeof(BYTE))
+  //---------------------------------------------------------------------------
+  void RTPPacket::StringHeaderExtension::trace(
+                                               const char *func,
+                                               const char *message
+                                               ) const
+  {
+    ZS_EVENTING_7(x, i, Basic, RTPPacketStringHeaderExtension, ol, RtpPacket, Info,
+      string, func, func,
+      string, message, message,
+      byte, id, mID,
+      binary, data, mData,
+      size, dataSizeInBytes, mDataSizeInBytes,
+      size_t, postPaddingSize, mPostPaddingSize,
+      string, str, str()
+    );
+  }
 
-      mID = header.mID;
-      mDataSizeInBytes = header.mDataSizeInBytes;
-      mPostPaddingSize = header.mPostPaddingSize;
-      if (NULL == header.mData) mDataSizeInBytes = 0;
-      if (0 == mDataSizeInBytes) mData = NULL;
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket::NumberHeaderExtension
+  #pragma mark
 
-      size_t copySize = header.mDataSizeInBytes;
-      if (copySize > (sizeof(BYTE)*kMaxNumberByteLength)) copySize = (sizeof(BYTE)*kMaxNumberByteLength);
+  //---------------------------------------------------------------------------
+  RTPPacket::NumberHeaderExtension::NumberHeaderExtension(const HeaderExtension &header)
+  {
+    ASSERT(sizeof(char) == sizeof(BYTE))
 
-      if (0 != copySize) {
-        memcpy(&(mNumberBuffer[0]), header.mData, copySize);
-        mData = &(mNumberBuffer[0]);
-      }
-      mDataSizeInBytes = copySize;
-    }
+    mID = header.mID;
+    mDataSizeInBytes = header.mDataSizeInBytes;
+    mPostPaddingSize = header.mPostPaddingSize;
+    if (NULL == header.mData) mDataSizeInBytes = 0;
+    if (0 == mDataSizeInBytes) mData = NULL;
 
-    //-------------------------------------------------------------------------
-    RTPPacket::NumberHeaderExtension::NumberHeaderExtension(
-                                                            BYTE id,
-                                                            const BYTE *number,
-                                                            size_t lengthInBytes
-                                                            )
-    {
-      mID = id;
+    size_t copySize = header.mDataSizeInBytes;
+    if (copySize > (sizeof(BYTE)*kMaxNumberByteLength)) copySize = (sizeof(BYTE)*kMaxNumberByteLength);
+
+    if (0 != copySize) {
+      memcpy(&(mNumberBuffer[0]), header.mData, copySize);
       mData = &(mNumberBuffer[0]);
-      mDataSizeInBytes = sizeof(char)*(NULL != number ? lengthInBytes : 0);
+    }
+    mDataSizeInBytes = copySize;
+  }
 
-      if (mDataSizeInBytes > (sizeof(BYTE)*kMaxNumberByteLength)) mDataSizeInBytes = (sizeof(BYTE)*kMaxNumberByteLength);
+  //---------------------------------------------------------------------------
+  RTPPacket::NumberHeaderExtension::NumberHeaderExtension(
+                                                          BYTE id,
+                                                          const BYTE *number,
+                                                          size_t lengthInBytes
+                                                          )
+  {
+    mID = id;
+    mData = &(mNumberBuffer[0]);
+    mDataSizeInBytes = sizeof(char)*(NULL != number ? lengthInBytes : 0);
 
-      if (0 != mDataSizeInBytes) {
-        memcpy(&(mNumberBuffer[0]), number, mDataSizeInBytes);
-      }
+    if (mDataSizeInBytes > (sizeof(BYTE)*kMaxNumberByteLength)) mDataSizeInBytes = (sizeof(BYTE)*kMaxNumberByteLength);
+
+    if (0 != mDataSizeInBytes) {
+      memcpy(&(mNumberBuffer[0]), number, mDataSizeInBytes);
     }
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacket::NumberHeaderExtension::NumberHeaderExtension(
-                                                            BYTE id,
-                                                            const char *valueInBase10
-                                                            )
-    {
-      mID = id;
-      mData = &(mNumberBuffer[0]);
-      mDataSizeInBytes = 1;
+  //---------------------------------------------------------------------------
+  RTPPacket::NumberHeaderExtension::NumberHeaderExtension(
+                                                          BYTE id,
+                                                          const char *valueInBase10
+                                                          )
+  {
+    mID = id;
+    mData = &(mNumberBuffer[0]);
+    mDataSizeInBytes = 1;
 
-      String str(valueInBase10);
+    String str(valueInBase10);
 
-      try {
-        Integer value(str); // convert from base 10 into big number class
+    try {
+      Integer value(str); // convert from base 10 into big number class
 
-        size_t minSizeNeeded = value.MinEncodedSize();
-        ORTC_THROW_INVALID_PARAMETERS_IF(minSizeNeeded > kMaxNumberByteLength)
+      size_t minSizeNeeded = value.MinEncodedSize();
+      ORTC_THROW_INVALID_PARAMETERS_IF(minSizeNeeded > kMaxNumberByteLength)
 
-        // this will encode in big endian and pad with most significant "0"
-        // values as needed
-        value.Encode(&(mNumberBuffer[0]), minSizeNeeded);
+      // this will encode in big endian and pad with most significant "0"
+      // values as needed
+      value.Encode(&(mNumberBuffer[0]), minSizeNeeded);
 
-        mDataSizeInBytes = minSizeNeeded;
+      mDataSizeInBytes = minSizeNeeded;
 
-      } catch(...) {
-        ORTC_THROW_INVALID_PARAMETERS("unable to convert integer: " + str)
-      }
+    } catch(...) {
+      ORTC_THROW_INVALID_PARAMETERS("unable to convert integer: " + str)
     }
+  }
 
-    //-------------------------------------------------------------------------
-    const BYTE *RTPPacket::NumberHeaderExtension::number() const
-    {
-      return &(mNumberBuffer[0]);
-    }
+  //---------------------------------------------------------------------------
+  const BYTE *RTPPacket::NumberHeaderExtension::number() const
+  {
+    return &(mNumberBuffer[0]);
+  }
 
-    //-------------------------------------------------------------------------
-    size_t RTPPacket::NumberHeaderExtension::length() const
-    {
-      return mDataSizeInBytes;
-    }
+  //---------------------------------------------------------------------------
+  size_t RTPPacket::NumberHeaderExtension::length() const
+  {
+    return mDataSizeInBytes;
+  }
 
-    //-------------------------------------------------------------------------
-    String RTPPacket::NumberHeaderExtension::str() const
-    {
-      if (mDataSizeInBytes < 1) return String();
+  //---------------------------------------------------------------------------
+  String RTPPacket::NumberHeaderExtension::str() const
+  {
+    if (mDataSizeInBytes < 1) return String();
 
-      Integer value(&(mNumberBuffer[0]), mDataSizeInBytes);
+    Integer value(&(mNumberBuffer[0]), mDataSizeInBytes);
 
-      std::stringstream output;
+    std::stringstream output;
 
-      output << value;
+    output << value;
 
-      return output.str();
-    }
+    return output.str();
+  }
 
-    //-------------------------------------------------------------------------
-    ElementPtr RTPPacket::NumberHeaderExtension::toDebug() const
-    {
-      ElementPtr result = Element::create("ortc::RTPPacket::NumberHeaderExtension");
+  //---------------------------------------------------------------------------
+  void RTPPacket::NumberHeaderExtension::trace(
+                                               const char *func,
+                                               const char *message
+                                               ) const
+  {
+    ZS_EVENTING_7(x, i, Basic, RTPPacketNumberHeaderExtension, ol, RtpPacket, Info,
+      string, func, func,
+      string, message, message,
+      byte, id, mID,
+      binary, data, mData,
+      size, dataSizeInBytes, mDataSizeInBytes,
+      size_t, postPaddingSize, mPostPaddingSize,
+      string, number, str()
+    );
+  }
 
-      Integer value(number(), length());
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket::MidHeaderExtension
+  #pragma mark
+
+  //---------------------------------------------------------------------------
+  void RTPPacket::MidHeaderExtension::trace(
+                                            const char *func,
+                                            const char *message
+                                            ) const
+  {
+    ZS_EVENTING_7(x, i, Basic, RTPPacketMidHeaderExtension, ol, RtpPacket, Info,
+      string, func, func,
+      string, message, message,
+      byte, id, mID,
+      bool, data, mData ? true : false,
+      size_t, dataSizeInBytes, mDataSizeInBytes,
+      size_t, postPaddingSize, mPostPaddingSize,
+      string, mid, mid()
+    );
+  }
 
-      UseServicesHelper::debugAppend(result, "number", str());
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket::RidHeaderExtension
+  #pragma mark
+
+  //---------------------------------------------------------------------------
+  void RTPPacket::RidHeaderExtension::trace(
+                                            const char *func,
+                                            const char *message
+                                            ) const
+  {
+    ZS_EVENTING_7(x, i, Insane, RTPPacketRidHeaderExtension, ol, RtpPacket, Info,
+      string, func, func,
+      string, message, message,
+      byte, id, mID,
+      binary, data, mData,
+      size, dataSizeInBytes, mDataSizeInBytes,
+      size_t, postPaddingSize, mPostPaddingSize,
+      string, rid, rid()
+    );
+  }
 
-      return result;
-    }
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket::VideoOrientationHeaderExtension
+  #pragma mark
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket::MidHeaderExtension
-    #pragma mark
+  //---------------------------------------------------------------------------
+  RTPPacket::VideoOrientationHeaderExtension::VideoOrientationHeaderExtension(const HeaderExtension &header)
+  {
+    mID = header.mID;
+    mDataSizeInBytes = header.mDataSizeInBytes;
+    mPostPaddingSize = header.mPostPaddingSize;
+    if (NULL == header.mData) mDataSizeInBytes = 0;
 
-    //-------------------------------------------------------------------------
-    ElementPtr RTPPacket::MidHeaderExtension::toDebug() const
-    {
-      ElementPtr result = Element::create("ortc::RTPPacket::MidHeaderExtension");
+    if (mDataSizeInBytes < sizeof(mEncoded)) return; // cannot decrypt this packet
+  }
 
-      UseServicesHelper::debugAppend(result, "mid", mid());
+  //---------------------------------------------------------------------------
+  RTPPacket::VideoOrientationHeaderExtension::VideoOrientationHeaderExtension(const VideoOrientation6HeaderExtension &)
+  {
+    mData = &(mEncoded[0]);
+    mDataSizeInBytes = sizeof(mEncoded);
+  }
 
-      return result;
-    }
+  //---------------------------------------------------------------------------
+  RTPPacket::VideoOrientationHeaderExtension::VideoOrientationHeaderExtension(
+                                                                              const Clockwise &,
+                                                                              bool frontFacingCamera,
+                                                                              bool flip,
+                                                                              UINT orientation
+                                                                              )
+  {
+    mData = &(mEncoded[0]);
+    mDataSizeInBytes = sizeof(mEncoded);
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket::RidHeaderExtension
-    #pragma mark
+    orientation %= 360;
 
-    //-------------------------------------------------------------------------
-    ElementPtr RTPPacket::RidHeaderExtension::toDebug() const
-    {
-      ElementPtr result = Element::create("ortc::RTPPacket::RidHeaderExtension");
+    // find closest approximation to the video orientation for the 2 bit allowance
+    orientation += 45;  // range is now 45 -> 404
+    orientation /= 90;
+    orientation %= 4;   // range is now 0..3
 
-      UseServicesHelper::debugAppend(result, "rid", rid());
+    // Bit#       7   6   5   4   3   2    1     0 (LSB)
+    // Definition 0   0   0   0   C   F   R1    R0
 
-      return result;
-    }
+    mEncoded[0] = RTP_PACK_BITS(frontFacingCamera ? 1 : 0, 0x1, 3) |
+                  RTP_PACK_BITS(flip ? 1 : 0, 0x1, 2) |
+                  RTP_PACK_BITS(static_cast<BYTE>(orientation), 0x3, 0);
+  }
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket::VideoOrientationHeaderExtension
-    #pragma mark
+  //---------------------------------------------------------------------------
+  RTPPacket::VideoOrientationHeaderExtension::VideoOrientationHeaderExtension(
+                                                                              const CounterClockwise &,
+                                                                              bool frontFacingCamera, // true = front facing, false = backfacing
+                                                                              bool flip, // horizontal left-right flip (mirro)
+                                                                              UINT orientation
+                                                                              ) :
+    VideoOrientationHeaderExtension(Clockwise {}, frontFacingCamera, flip, 360-(orientation%360))
+  {
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacket::VideoOrientationHeaderExtension::VideoOrientationHeaderExtension(const HeaderExtension &header)
-    {
-      mID = header.mID;
-      mDataSizeInBytes = header.mDataSizeInBytes;
-      mPostPaddingSize = header.mPostPaddingSize;
-      if (NULL == header.mData) mDataSizeInBytes = 0;
+  //---------------------------------------------------------------------------
+  bool RTPPacket::VideoOrientationHeaderExtension::frontFacing() const
+  {
+    if (NULL == mData) return false;
+    return (0 != RTP_GET_BITS(mData[0], 0x1, 3));
+  }
 
-      if (mDataSizeInBytes < sizeof(mEncoded)) return; // cannot decrypt this packet
-    }
+  //---------------------------------------------------------------------------
+  bool RTPPacket::VideoOrientationHeaderExtension::backFacing() const
+  {
+    if (NULL == mData) return false;
+    return (0 == RTP_GET_BITS(mData[0], 0x1, 3));
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacket::VideoOrientationHeaderExtension::VideoOrientationHeaderExtension(const VideoOrientation6HeaderExtension &)
-    {
-      mData = &(mEncoded[0]);
-      mDataSizeInBytes = sizeof(mEncoded);
-    }
+  //---------------------------------------------------------------------------
+  bool RTPPacket::VideoOrientationHeaderExtension::flip() const
+  {
+    if (NULL == mData) return false;
+    return (0 == RTP_GET_BITS(mData[0], 0x1, 2));
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacket::VideoOrientationHeaderExtension::VideoOrientationHeaderExtension(
-                                                                                const Clockwise &,
-                                                                                bool frontFacingCamera,
-                                                                                bool flip,
-                                                                                UINT orientation
-                                                                                )
-    {
-      mData = &(mEncoded[0]);
-      mDataSizeInBytes = sizeof(mEncoded);
+  //---------------------------------------------------------------------------
+  UINT RTPPacket::VideoOrientationHeaderExtension::degreesClockwise() const
+  {
+    if (NULL == mData) return 0;
+    UINT degrees = static_cast<UINT>(RTP_GET_BITS(mData[0], 0x3, 0));
 
-      orientation %= 360;
+    degrees *= 90;
 
-      // find closest approximation to the video orientation for the 2 bit allowance
-      orientation += 45;  // range is now 45 -> 404
-      orientation /= 90;
-      orientation %= 4;   // range is now 0..3
+    return degrees;
+  }
 
-      // Bit#       7   6   5   4   3   2    1     0 (LSB)
-      // Definition 0   0   0   0   C   F   R1    R0
+  //---------------------------------------------------------------------------
+  UINT RTPPacket::VideoOrientationHeaderExtension::degreesCounterClockwise() const
+  {
+    return (360-degreesClockwise())%360;
+  }
 
-      mEncoded[0] = RTP_PACK_BITS(frontFacingCamera ? 1 : 0, 0x1, 3) |
-                    RTP_PACK_BITS(flip ? 1 : 0, 0x1, 2) |
-                    RTP_PACK_BITS(static_cast<BYTE>(orientation), 0x3, 0);
-    }
+  //---------------------------------------------------------------------------
+  void RTPPacket::VideoOrientationHeaderExtension::trace(
+                                                         const char *func,
+                                                         const char *message
+                                                         ) const
+  {
+    ZS_EVENTING_9(x, i, Basic, RTPPacketVideoOrientationHeaderExtension, ol, RtpPacket, Info,
+      string, func, func,
+      string, message, message,
+      byte, id, mID,
+      binary, data, mData,
+      size, dataSizeInBytes, mDataSizeInBytes,
+      size_t, postPaddingSize, mPostPaddingSize,
+      bool, frontFacing, frontFacing(),
+      bool, flip, flip(),
+      uint64, degrees, degreesClockwise()
+    );
+  }
+    
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket::VideoOrientation6HeaderExtension
+  #pragma mark
+
+  //---------------------------------------------------------------------------
+  RTPPacket::VideoOrientation6HeaderExtension::VideoOrientation6HeaderExtension(const HeaderExtension &header) :
+    VideoOrientationHeaderExtension(header)
+  {
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacket::VideoOrientationHeaderExtension::VideoOrientationHeaderExtension(
-                                                                                const CounterClockwise &,
-                                                                                bool frontFacingCamera, // true = front facing, false = backfacing
-                                                                                bool flip, // horizontal left-right flip (mirro)
+  //---------------------------------------------------------------------------
+  RTPPacket::VideoOrientation6HeaderExtension::VideoOrientation6HeaderExtension(
+                                                                                const Clockwise &,
+                                                                                bool frontFacingCamera,
+                                                                                bool flip,
                                                                                 UINT orientation
                                                                                 ) :
-      VideoOrientationHeaderExtension(Clockwise {}, frontFacingCamera, flip, 360-(orientation%360))
-    {
-    }
+    VideoOrientationHeaderExtension(*this)
+  {
+    // find closest approximation to the video orientation for the 6 bit allowance
+    orientation %= 360;
+
+    // r = x * 360
+    //     -------
+    //        64
+    //
+    // r * 64 = x * 360
+    //
+    // x = r * 64
+    //     ------
+    //      360
+
+    orientation *= 64;
+    orientation /= 360;
+    orientation %= 64;
+
+    //  Bit#         7   6     5     4     3     2     1     0 (LSB)
+    //  Definition  R5  R4    R3    R2     C     F    R1    R0
+
+    // R1	R0	R5	R4	R3	R2
+    // 0  0   0   0   0   0   = 0
+    // 0  0   0   0   0   1   = 1
+    // 1  1   1   1   1   1   = 63
+
+    BYTE ordered = static_cast<BYTE>(orientation) & 0x3F;
+
+    mEncoded[0] = RTP_PACK_BITS(frontFacingCamera ? 1 : 0, 0x1, 3) |
+                  RTP_PACK_BITS(flip ? 1 : 0, 0x1, 2) |
+                  RTP_PACK_BITS(RTP_GET_BITS(ordered, 0x3, 4), 0x3, 0) |
+                  RTP_PACK_BITS(RTP_GET_BITS(ordered, 0xF, 0), 0xF, 4);
+  }
 
-    //-------------------------------------------------------------------------
-    bool RTPPacket::VideoOrientationHeaderExtension::frontFacing() const
-    {
-      if (NULL == mData) return false;
-      return (0 != RTP_GET_BITS(mData[0], 0x1, 3));
-    }
+  //---------------------------------------------------------------------------
+  RTPPacket::VideoOrientation6HeaderExtension::VideoOrientation6HeaderExtension(
+                                                                                const CounterClockwise &,
+                                                                                bool frontFacingCamera,
+                                                                                bool flip,
+                                                                                UINT orientation
+                                                                                ) :
+    VideoOrientation6HeaderExtension(Clockwise{}, frontFacingCamera, flip, 360-(orientation % 360))
+  {
+  }
 
-    //-------------------------------------------------------------------------
-    bool RTPPacket::VideoOrientationHeaderExtension::backFacing() const
-    {
-      if (NULL == mData) return false;
-      return (0 == RTP_GET_BITS(mData[0], 0x1, 3));
-    }
+  //---------------------------------------------------------------------------
+  UINT RTPPacket::VideoOrientation6HeaderExtension::degreesClockwise() const
+  {
+    if (NULL == mData) return 0;
 
-    //-------------------------------------------------------------------------
-    bool RTPPacket::VideoOrientationHeaderExtension::flip() const
-    {
-      if (NULL == mData) return false;
-      return (0 == RTP_GET_BITS(mData[0], 0x1, 2));
-    }
+    BYTE ordered = RTP_PACK_BITS(RTP_GET_BITS(mData[0], 0x3, 0), 0x3, 4) |
+                   RTP_PACK_BITS(RTP_GET_BITS(mData[0], 0xF, 4), 0xF, 0);
 
-    //-------------------------------------------------------------------------
-    UINT RTPPacket::VideoOrientationHeaderExtension::degreesClockwise() const
-    {
-      if (NULL == mData) return 0;
-      UINT degrees = static_cast<UINT>(RTP_GET_BITS(mData[0], 0x3, 0));
+    UINT degrees = (static_cast<UINT>(ordered)*360)/64;
+    return degrees % 360;
+  }
 
-      degrees *= 90;
+  //---------------------------------------------------------------------------
+  UINT RTPPacket::VideoOrientation6HeaderExtension::degreesCounterClockwise() const
+  {
+    return (360-degreesClockwise())%360;
+  }
+    
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket (public)
+  #pragma mark
+
+  //---------------------------------------------------------------------------
+  RTPPacket::RTPPacket(
+                       const make_private &,
+                       MediaChannelID mediaChannelID
+                       ) :
+    mMediaChannelID(mediaChannelID)
+  {
+  }
 
-      return degrees;
+  //---------------------------------------------------------------------------
+  RTPPacket::~RTPPacket()
+  {
+    if (mHeaderExtensions) {
+      delete [] mHeaderExtensions;
+      mHeaderExtensions = NULL;
     }
+  }
 
-    //-------------------------------------------------------------------------
-    UINT RTPPacket::VideoOrientationHeaderExtension::degreesCounterClockwise() const
-    {
-      return (360-degreesClockwise())%360;
-    }
-
-    //-------------------------------------------------------------------------
-    ElementPtr RTPPacket::VideoOrientationHeaderExtension::toDebug() const
-    {
-      ElementPtr result = Element::create("ortc::RTPPacket::VideoOrientationHeaderExtension");
-
-      UseServicesHelper::debugAppend(result, "front facing", frontFacing());
-      UseServicesHelper::debugAppend(result, "flip", flip());
-      UseServicesHelper::debugAppend(result, "degrees", degreesClockwise());
-
-      return result;
-    }
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket::VideoOrientation6HeaderExtension
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPPacket::VideoOrientation6HeaderExtension::VideoOrientation6HeaderExtension(const HeaderExtension &header) :
-      VideoOrientationHeaderExtension(header)
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPPacket::VideoOrientation6HeaderExtension::VideoOrientation6HeaderExtension(
-                                                                                  const Clockwise &,
-                                                                                  bool frontFacingCamera,
-                                                                                  bool flip,
-                                                                                  UINT orientation
-                                                                                  ) :
-      VideoOrientationHeaderExtension(*this)
-    {
-      // find closest approximation to the video orientation for the 6 bit allowance
-      orientation %= 360;
-
-      // r = x * 360
-      //     -------
-      //        64
-      //
-      // r * 64 = x * 360
-      //
-      // x = r * 64
-      //     ------
-      //      360
-
-      orientation *= 64;
-      orientation /= 360;
-      orientation %= 64;
-
-      //  Bit#         7   6     5     4     3     2     1     0 (LSB)
-      //  Definition  R5  R4    R3    R2     C     F    R1    R0
-
-      // R1	R0	R5	R4	R3	R2
-      // 0  0   0   0   0   0   = 0
-      // 0  0   0   0   0   1   = 1
-      // 1  1   1   1   1   1   = 63
-
-      BYTE ordered = static_cast<BYTE>(orientation) & 0x3F;
-
-      mEncoded[0] = RTP_PACK_BITS(frontFacingCamera ? 1 : 0, 0x1, 3) |
-                    RTP_PACK_BITS(flip ? 1 : 0, 0x1, 2) |
-                    RTP_PACK_BITS(RTP_GET_BITS(ordered, 0x3, 4), 0x3, 0) |
-                    RTP_PACK_BITS(RTP_GET_BITS(ordered, 0xF, 0), 0xF, 4);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPPacket::VideoOrientation6HeaderExtension::VideoOrientation6HeaderExtension(
-                                                                                  const CounterClockwise &,
-                                                                                  bool frontFacingCamera,
-                                                                                  bool flip,
-                                                                                  UINT orientation
-                                                                                  ) :
-      VideoOrientation6HeaderExtension(Clockwise{}, frontFacingCamera, flip, 360-(orientation % 360))
-    {
-    }
+  //---------------------------------------------------------------------------
+  RTPPacketPtr RTPPacket::create(
+                                 const RTPPacket &packet,
+                                 MediaChannelID mediaChannelID
+                                 )
+  {
+    RTPPacketPtr pThis(make_shared<RTPPacket>(make_private{}, mediaChannelID));
+    pThis->generate(packet);
+    return pThis;
+  }
 
-    //-------------------------------------------------------------------------
-    UINT RTPPacket::VideoOrientation6HeaderExtension::degreesClockwise() const
-    {
-      if (NULL == mData) return 0;
+  //---------------------------------------------------------------------------
+  RTPPacketPtr RTPPacket::create(const CreationParams &params)
+  {
+    RTPPacketPtr pThis(make_shared<RTPPacket>(make_private{}, params.mMediaChannelID));
+    pThis->generate(params);
+    return pThis;
+  }
 
-      BYTE ordered = RTP_PACK_BITS(RTP_GET_BITS(mData[0], 0x3, 0), 0x3, 4) |
-                     RTP_PACK_BITS(RTP_GET_BITS(mData[0], 0xF, 4), 0xF, 0);
+  //---------------------------------------------------------------------------
+  RTPPacketPtr RTPPacket::create(
+                                 const BYTE *buffer,
+                                 size_t bufferLengthInBytes,
+                                 MediaChannelID mediaChannelID
+                                 )
+  {
+    ORTC_THROW_INVALID_PARAMETERS_IF(!buffer)
+    ORTC_THROW_INVALID_PARAMETERS_IF(0 == bufferLengthInBytes)
+    return RTPPacket::create(UseServicesHelper::convertToBuffer(buffer, bufferLengthInBytes), mediaChannelID);
+  }
 
-      UINT degrees = (static_cast<UINT>(ordered)*360)/64;
-      return degrees % 360;
-    }
+  //---------------------------------------------------------------------------
+  RTPPacketPtr RTPPacket::create(
+                                 const SecureByteBlock &buffer,
+                                 MediaChannelID mediaChannelID
+                                 )
+  {
+    return RTPPacket::create(buffer.BytePtr(), buffer.SizeInBytes());
+  }
 
-    //-------------------------------------------------------------------------
-    UINT RTPPacket::VideoOrientation6HeaderExtension::degreesCounterClockwise() const
-    {
-      return (360-degreesClockwise())%360;
+  //---------------------------------------------------------------------------
+  RTPPacketPtr RTPPacket::create(
+                                 SecureByteBlockPtr buffer,
+                                 MediaChannelID mediaChannelID
+                                 )
+  {
+    RTPPacketPtr pThis(make_shared<RTPPacket>(make_private{}, mediaChannelID));
+    pThis->mBuffer = buffer;
+    if (!pThis->parse()) {
+      ZS_EVENTING_2(x, w, Debug, RTPPacketCreate, ol, RtpPacket, Start, puid, mediaChannelId, pThis->mMediaChannelID, string, message, "packet could not be parsed");
+      return RTPPacketPtr();
     }
+    return pThis;
+  }
 
-    //-------------------------------------------------------------------------
-    ElementPtr RTPPacket::VideoOrientation6HeaderExtension::toDebug() const
-    {
-      ElementPtr result = Element::create("ortc::RTPPacket::VideoOrientation6HeaderExtension");
+  //---------------------------------------------------------------------------
+  const BYTE *RTPPacket::ptr() const
+  {
+    return mBuffer->BytePtr();
+  }
 
-      UseServicesHelper::debugAppend(result, "front facing", frontFacing());
-      UseServicesHelper::debugAppend(result, "flip", flip());
-      UseServicesHelper::debugAppend(result, "degrees", degreesClockwise());
+  //---------------------------------------------------------------------------
+  size_t RTPPacket::size() const
+  {
+    return mBuffer->SizeInBytes();
+  }
 
-      return result;
-    }
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket (public)
-    #pragma mark
+  //---------------------------------------------------------------------------
+  SecureByteBlockPtr RTPPacket::buffer() const
+  {
+    return mBuffer;
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacket::RTPPacket(const make_private &)
-    {
-    }
+  //---------------------------------------------------------------------------
+  DWORD RTPPacket::getCSRC(size_t index) const
+  {
+    ASSERT(index < cc())
+    return UseRTPUtils::getBE32(&((ptr())[internal::kMinRtpPacketLen + (sizeof(DWORD)*index)]));
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacket::~RTPPacket()
-    {
-      if (mHeaderExtensions) {
-        delete [] mHeaderExtensions;
-        mHeaderExtensions = NULL;
-      }
-    }
+  //---------------------------------------------------------------------------
+  const BYTE *RTPPacket::payload() const
+  {
+    if (0 == mPayloadSize) return NULL;
+    const BYTE *buffer = ptr();
+    return &(buffer[mHeaderSize + mHeaderExtensionSize]);
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacketPtr RTPPacket::create(const RTPPacket &packet)
-    {
-      RTPPacketPtr pThis(make_shared<RTPPacket>(make_private{}));
-      pThis->generate(packet);
-      return pThis;
-    }
+  //---------------------------------------------------------------------------
+  RTPPacket::HeaderExtension *RTPPacket::getHeaderExtensionAtIndex(size_t index) const
+  {
+    if (index >= mTotalHeaderExtensions) return NULL;
+    return &(mHeaderExtensions[index]);
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacketPtr RTPPacket::create(const CreationParams &params)
-    {
-      RTPPacketPtr pThis(make_shared<RTPPacket>(make_private{}));
-      pThis->generate(params);
-      return pThis;
+  //---------------------------------------------------------------------------
+  void RTPPacket::trace(
+                        const char *func,
+                        const char *message
+                        ) const
+  {
+    ZS_EVENTING_21(x, i, Basic, RTPPacketTrace, ol, RtpPacket, Info,
+      string, func, func,
+      string, message, message,
+      puid, mediaChannelID, mMediaChannelID,
+      binary, buffer, mBuffer ? mBuffer->BytePtr() : NULL,
+      size, size, mBuffer ? mBuffer->SizeInBytes() : 0,
+      byte, version, mVersion,
+      size_t, padding, mPadding,
+      byte, cc, mCC,
+      bool, m, mM,
+      byte, pt, mPT,
+      word, sequenceNumber, mSequenceNumber,
+      dword, timestamp, mTimestamp,
+      dword, ssrc, mSSRC,
+      size_t, headerSize, mHeaderSize,
+      size_t, headerExtensionSize, mHeaderExtensionSize,
+      size_t, payloadSize, mPayloadSize,
+      size_t, totalHeaderExtensions, mTotalHeaderExtensions,
+      byte, headerExtensionAppBits, mHeaderExtensionAppBits,
+      size_t, headerExtensionPrepaddedSize, mHeaderExtensionPrepaddedSize,
+      binary, headerExtensionParseStoppedPos, mHeaderExtensionParseStoppedPos,
+      size, headerExtensionParseStoppedSize, mHeaderExtensionParseStoppedSize
+    );
+
+    for (auto current = mHeaderExtensions; NULL != current; current = current->mNext) {
+      current->trace(func, message);
     }
+  }
 
-    //-------------------------------------------------------------------------
-    RTPPacketPtr RTPPacket::create(const BYTE *buffer, size_t bufferLengthInBytes)
-    {
-      ORTC_THROW_INVALID_PARAMETERS_IF(!buffer)
-      ORTC_THROW_INVALID_PARAMETERS_IF(0 == bufferLengthInBytes)
-      return RTPPacket::create(UseServicesHelper::convertToBuffer(buffer, bufferLengthInBytes));
-    }
+  //---------------------------------------------------------------------------
+  static bool requiresTwoByteHeader(
+                                    RTPPacket::HeaderExtension *firstExtension,
+                                    BYTE headerExtensionAppBits
+                                    )
+  {
+    typedef RTPPacket::HeaderExtension HeaderExtension;
 
-    //-------------------------------------------------------------------------
-    RTPPacketPtr RTPPacket::create(const SecureByteBlock &buffer)
-    {
-      return RTPPacket::create(buffer.BytePtr(), buffer.SizeInBytes());
-    }
+    bool twoByteHeader = (0 != headerExtensionAppBits);
+    if (!twoByteHeader) {
+      for (HeaderExtension *current = firstExtension; NULL != current; current = current->mNext) {
+        ASSERT(0 != current->mID) // not legal
 
-    //-------------------------------------------------------------------------
-    RTPPacketPtr RTPPacket::create(SecureByteBlockPtr buffer)
-    {
-      RTPPacketPtr pThis(make_shared<RTPPacket>(make_private{}));
-      pThis->mBuffer = buffer;
-      if (!pThis->parse()) {
-        ZS_LOG_WARNING(Debug, pThis->log("packet could not be parsed"))
-        return RTPPacketPtr();
+        if (current->mID > 14) {
+          twoByteHeader = true;
+          break;
+        }
+        if (0 == current->mDataSizeInBytes) {
+          twoByteHeader = true;
+          break;
+        }
+        if (current->mDataSizeInBytes > 16) {
+          ASSERT(current->mDataSizeInBytes < 255)
+          twoByteHeader = true;
+          break;
+        }
       }
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    const BYTE *RTPPacket::ptr() const
-    {
-      return mBuffer->BytePtr();
-    }
-
-    //-------------------------------------------------------------------------
-    size_t RTPPacket::size() const
-    {
-      return mBuffer->SizeInBytes();
-    }
-
-    //-------------------------------------------------------------------------
-    SecureByteBlockPtr RTPPacket::buffer() const
-    {
-      return mBuffer;
-    }
-
-    //-------------------------------------------------------------------------
-    DWORD RTPPacket::getCSRC(size_t index) const
-    {
-      ASSERT(index < cc())
-      return RTPUtils::getBE32(&((ptr())[kMinRtpPacketLen + (sizeof(DWORD)*index)]));
     }
+    return twoByteHeader;
+  }
 
-    //-------------------------------------------------------------------------
-    const BYTE *RTPPacket::payload() const
-    {
-      if (0 == mPayloadSize) return NULL;
-      const BYTE *buffer = ptr();
-      return &(buffer[mHeaderSize + mHeaderExtensionSize]);
-    }
+  //---------------------------------------------------------------------------
+  void RTPPacket::changeHeaderExtensions(HeaderExtension *firstExtension)
+  {
+    bool twoByteHeader = requiresTwoByteHeader(firstExtension, mHeaderExtensionAppBits);
 
-    //-------------------------------------------------------------------------
-    RTPPacket::HeaderExtension *RTPPacket::getHeaderExtensionAtIndex(size_t index) const
-    {
-      if (index >= mTotalHeaderExtensions) return NULL;
-      return &(mHeaderExtensions[index]);
+    if (twoByteHeader) {
+      ORTC_THROW_INVALID_STATE_IF(NULL != mHeaderExtensionParseStoppedPos)  // requires a 1 byte header to append this data
     }
 
-    //-------------------------------------------------------------------------
-    ElementPtr RTPPacket::toDebug() const
-    {
-      ElementPtr objectEl = Element::create("ortc::RTPPacket");
-
-      UseServicesHelper::debugAppend(objectEl, "buffer", mBuffer ? mBuffer->SizeInBytes() : 0);
-
-      UseServicesHelper::debugAppend(objectEl, "version", mVersion);
-      UseServicesHelper::debugAppend(objectEl, "padding", mPadding);
-      UseServicesHelper::debugAppend(objectEl, "cc", mCC);
-      UseServicesHelper::debugAppend(objectEl, "m", mM);
-      UseServicesHelper::debugAppend(objectEl, "pt", mPT);
-      UseServicesHelper::debugAppend(objectEl, "sequence number", mSequenceNumber);
-      UseServicesHelper::debugAppend(objectEl, "timestamp", mTimestamp);
-      UseServicesHelper::debugAppend(objectEl, "ssrc", mSSRC);
-
-      UseServicesHelper::debugAppend(objectEl, "header size", mHeaderSize);
-      UseServicesHelper::debugAppend(objectEl, "extension header size", mHeaderExtensionSize);
-      UseServicesHelper::debugAppend(objectEl, "payload size", mPayloadSize);
-
-      UseServicesHelper::debugAppend(objectEl, "total header extensions", mTotalHeaderExtensions);
-
-      for (auto current = mHeaderExtensions; NULL != current; current = current->mNext)
-      {
-        ElementPtr extensionEl = Element::create("extension");
-        UseServicesHelper::debugAppend(extensionEl, "id", current->mID);
-        UseServicesHelper::debugAppend(extensionEl, "size", current->mDataSizeInBytes);
-        UseServicesHelper::debugAppend(extensionEl, "data", (NULL != current->mData) ? UseServicesHelper::convertToHex(current->mData, current->mDataSizeInBytes) : String());
-        UseServicesHelper::debugAppend(extensionEl, "padding", current->mPostPaddingSize);
-        UseServicesHelper::debugAppend(objectEl, extensionEl);
-      }
-
-      UseServicesHelper::debugAppend(objectEl, "header extension appbits", mHeaderExtensionAppBits);
+    bool requiresExtension = internal::requiredExtension(firstExtension, mHeaderExtensionAppBits, mHeaderExtensionPrepaddedSize, mHeaderExtensionParseStoppedPos);
 
-      UseServicesHelper::debugAppend(objectEl, "header extension prepadding size", mHeaderExtensionPrepaddedSize);
-      UseServicesHelper::debugAppend(objectEl, "header extension parse stopped pos", (NULL != mHeaderExtensionParseStoppedPos) ? ((PTRNUMBER)(mHeaderExtensionParseStoppedPos - ptr())) : 0);
-      UseServicesHelper::debugAppend(objectEl, "header extension parse stopped size", mHeaderExtensionParseStoppedSize);
+    const BYTE *buffer = ptr();
 
-      return objectEl;
-    }
+    ASSERT(NULL != buffer)
 
-    //-------------------------------------------------------------------------
-    static bool requiresTwoByteHeader(
-                                      RTPPacket::HeaderExtension *firstExtension,
-                                      BYTE headerExtensionAppBits
-                                      )
-    {
-      typedef RTPPacket::HeaderExtension HeaderExtension;
+    size_t existingHeaderExtensionSize = mHeaderExtensionSize;
+    size_t postHeaderExtensionSize = mPayloadSize + mPadding;
 
-      bool twoByteHeader = (0 != headerExtensionAppBits);
-      if (!twoByteHeader) {
-        for (HeaderExtension *current = firstExtension; NULL != current; current = current->mNext) {
-          ASSERT(0 != current->mID) // not legal
-
-          if (current->mID > 14) {
-            twoByteHeader = true;
-            break;
-          }
-          if (0 == current->mDataSizeInBytes) {
-            twoByteHeader = true;
-            break;
-          }
-          if (current->mDataSizeInBytes > 16) {
-            ASSERT(current->mDataSizeInBytes < 255)
-            twoByteHeader = true;
-            break;
-          }
-        }
-      }
-      return twoByteHeader;
-    }
+    ASSERT(size() == (mHeaderSize + existingHeaderExtensionSize + postHeaderExtensionSize))
 
-    //-------------------------------------------------------------------------
-    void RTPPacket::changeHeaderExtensions(HeaderExtension *firstExtension)
-    {
-      bool twoByteHeader = requiresTwoByteHeader(firstExtension, mHeaderExtensionAppBits);
+    if (!requiresExtension) {
+      // going to strip the extension header out entirely
 
-      if (twoByteHeader) {
-        ORTC_THROW_INVALID_STATE_IF(NULL != mHeaderExtensionParseStoppedPos)  // requires a 1 byte header to append this data
+      if (!RTP_HEADER_EXTENSION(buffer)) {
+        ZS_EVENTING_TRACE_OBJECT(Insane, *this, "no extension present (thus no need to strip extension from RTP packet)");
+        return;
       }
 
-      bool requiresExtension = requiredExtension(firstExtension, mHeaderExtensionAppBits, mHeaderExtensionPrepaddedSize, mHeaderExtensionParseStoppedPos);
-
-      const BYTE *buffer = ptr();
-
-      ASSERT(NULL != buffer)
-
-      size_t existingHeaderExtensionSize = mHeaderExtensionSize;
-      size_t postHeaderExtensionSize = mPayloadSize + mPadding;
-
       ASSERT(size() == (mHeaderSize + existingHeaderExtensionSize + postHeaderExtensionSize))
 
-      if (!requiresExtension) {
-        // going to strip the extension header out entirely
+      size_t newSize = mHeaderSize + postHeaderExtensionSize;
 
-        if (RTP_HEADER_EXTENSION(buffer)) {
-          ZS_LOG_INSANE(log("no extension present (thus no need to strip extension from RTP packet)"))
-          return;
-        }
-
-        ASSERT(size() == (mHeaderSize + existingHeaderExtensionSize + postHeaderExtensionSize))
+      SecureByteBlockPtr tempBuffer(make_shared<SecureByteBlock>(newSize));
 
-        size_t newSize = mHeaderSize + postHeaderExtensionSize;
+      BYTE *newBuffer = tempBuffer->BytePtr();
 
-        SecureByteBlockPtr tempBuffer(make_shared<SecureByteBlock>(newSize));
+      // copy the bytes before the extension header to the new buffer
+      memcpy(newBuffer, buffer, mHeaderSize);
 
-        BYTE *newBuffer = tempBuffer->BytePtr();
+      // copy the bytes from after the extension header in the older buffer to the new buffer
+      memcpy(&(newBuffer[mHeaderSize]), &(buffer[mHeaderSize + existingHeaderExtensionSize]), postHeaderExtensionSize);
 
-        // copy the bytes before the extension header to the new buffer
-        memcpy(newBuffer, buffer, mHeaderSize);
+      // strip the extension bit
+      newBuffer[0] = newBuffer[0] & (0xFF ^ RTP_HEADER_EXTENSION_BIT);
 
-        // copy the bytes from after the extension header in the older buffer to the new buffer
-        memcpy(&(newBuffer[mHeaderSize]), &(buffer[mHeaderSize + existingHeaderExtensionSize]), postHeaderExtensionSize);
+      mBuffer = tempBuffer;
 
-        // strip the extension bit
-        newBuffer[0] = newBuffer[0] & (0xFF ^ RTP_HEADER_EXTENSION_BIT);
+      mHeaderExtensionSize = 0;
 
-        mBuffer = tempBuffer;
+      mTotalHeaderExtensions = 0;
+      if (mHeaderExtensions) {
+        delete [] mHeaderExtensions;
+        mHeaderExtensions = NULL;
+      }
+      mHeaderExtensionAppBits = 0;
+      mHeaderExtensionPrepaddedSize = 0;
+      mHeaderExtensionParseStoppedPos = NULL;
+      mHeaderExtensionParseStoppedSize = 0;
 
-        mHeaderExtensionSize = 0;
+      ZS_EVENTING_TRACE_OBJECT(Insane, *this, "stripped existing extension header");
+      return;
+    }
 
-        mTotalHeaderExtensions = 0;
-        if (mHeaderExtensions) {
-          delete [] mHeaderExtensions;
-          mHeaderExtensions = NULL;
-        }
-        mHeaderExtensionAppBits = 0;
-        mHeaderExtensionPrepaddedSize = 0;
-        mHeaderExtensionParseStoppedPos = NULL;
-        mHeaderExtensionParseStoppedSize = 0;
+    mHeaderExtensionSize = 0;
+    mTotalHeaderExtensions = 0;
+    internal::getHeaderExtensionSize(firstExtension, twoByteHeader, mHeaderExtensionPrepaddedSize, mHeaderExtensionParseStoppedSize, mHeaderExtensionSize, mTotalHeaderExtensions);
 
-        ZS_LOG_INSANE(debug("stripped existing extension header"))
-        return;
-      }
+    size_t newSize = mHeaderSize + mHeaderExtensionSize + postHeaderExtensionSize;
 
-      mHeaderExtensionSize = 0;
-      mTotalHeaderExtensions = 0;
-      getHeaderExtensionSize(firstExtension, twoByteHeader, mHeaderExtensionPrepaddedSize, mHeaderExtensionParseStoppedSize, mHeaderExtensionSize, mTotalHeaderExtensions);
+    SecureByteBlockPtr oldBuffer = mBuffer; // temporary to keep previous allocation alive during swap
 
-      size_t newSize = mHeaderSize + mHeaderExtensionSize + postHeaderExtensionSize;
+    mBuffer = make_shared<SecureByteBlock>(newSize);
 
-      SecureByteBlockPtr oldBuffer = mBuffer; // temporary to keep previous allocation alive during swap
+    BYTE *newBuffer = mBuffer->BytePtr();
 
-      mBuffer = make_shared<SecureByteBlock>(newSize);
+    // copy the bytes before the extension header to the new buffer
+    memcpy(newBuffer, buffer, mHeaderSize);
 
-      BYTE *newBuffer = mBuffer->BytePtr();
+    // copy the bytes from after the extension header in the older buffer to the new buffer
+    memcpy(&(newBuffer[mHeaderSize + mHeaderExtensionSize]), &(buffer[mHeaderSize + existingHeaderExtensionSize]), postHeaderExtensionSize);
 
-      // copy the bytes before the extension header to the new buffer
-      memcpy(newBuffer, buffer, mHeaderSize);
+    writeHeaderExtensions(firstExtension, twoByteHeader);
 
-      // copy the bytes from after the extension header in the older buffer to the new buffer
-      memcpy(&(newBuffer[mHeaderSize + mHeaderExtensionSize]), &(buffer[mHeaderSize + existingHeaderExtensionSize]), postHeaderExtensionSize);
+    ZS_EVENTING_TRACE_OBJECT(Insane, *this, "header extension changed");
+  }
 
-      writeHeaderExtensions(firstExtension, twoByteHeader);
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  #pragma mark
+  #pragma mark RTPPacket (internal)
+  #pragma mark
 
-      ZS_LOG_INSANE(debug("header extension changed"))
+  //---------------------------------------------------------------------------
+  bool RTPPacket::parse()
+  {
+    const BYTE *buffer = mBuffer->BytePtr();
+    size_t size = mBuffer->SizeInBytes();
+
+    if (size < internal::kMinRtpPacketLen) {
+      ZS_EVENTING_3(x, w, Trace, RTPPacketParseWarningPacketLengthTooShort, ol, RtpPacket, Parse,
+        string, message, "packet length is too short",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, length, size
+      );
+      return false;
     }
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket (internal)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPPacket::slog(const char *message)
-    {
-      ElementPtr objectEl = Element::create("ortc::RTPPacket");
-      return Log::Params(message, objectEl);
+    mVersion = RTP_HEADER_VERSION(buffer);
+    if (mVersion != internal::kRtpVersion) {
+      ZS_EVENTING_2(x, w, Trace, RTPPacketParseWarning, ol, RtpPacket, Parse,
+        string, message, "not an RTP packet",
+        puid, mediaChannelID, mMediaChannelID
+      );
+      return false;
     }
 
-    //-------------------------------------------------------------------------
-    Log::Params RTPPacket::log(const char *message) const
-    {
-      ElementPtr objectEl = Element::create("ortc::RTPPacket");
-      return Log::Params(message, objectEl);
+    if (UseRTPUtils::isRTCPPacketType(buffer, size)) {
+      ZS_EVENTING_3(x, w, Trace, RTPPacketParseWarningPacketisRTCP, ol, RtpPacket, Parse,
+        string, message, "packet is RTCP not RTP",
+        puid, mediaChannelID, mMediaChannelID,
+        size_t, length, size
+      );
+      return false;
     }
 
-    //-------------------------------------------------------------------------
-    Log::Params RTPPacket::debug(const char *message) const
-    {
-      return Log::Params(message, toDebug());
+    bool hasPadding = RTP_HEADER_PADDING(buffer);
+    mCC = RTP_HEADER_CC(buffer);
+    mM = RTP_HEADER_M(buffer);
+    mPT = RTP_HEADER_PT(buffer);
+    mSequenceNumber = UseRTPUtils::getBE16(&(buffer[2]));
+    mTimestamp = UseRTPUtils::getBE32(&(buffer[4]));
+    mSSRC = UseRTPUtils::getBE32(&(buffer[8]));
+
+    mHeaderSize = internal::kMinRtpPacketLen + (static_cast<size_t>(mCC) * sizeof(DWORD));
+
+    if (size < mHeaderSize) {
+      ZS_EVENTING_2(x, w, Trace, RTPPacketParseWarning, ol, RtpPacket, Parse,
+        string, message, "illegal RTP packet (packet is not large enough to hold header)",
+        puid, mediaChannelID, mMediaChannelID
+      );
+      return false;
     }
 
-    //-------------------------------------------------------------------------
-    bool RTPPacket::parse()
-    {
-      const BYTE *buffer = mBuffer->BytePtr();
-      size_t size = mBuffer->SizeInBytes();
-
-      if (size < kMinRtpPacketLen) {
-        ZS_LOG_WARNING(Trace, log("packet length is too short") + ZS_PARAM("length", size))
+    if (RTP_HEADER_EXTENSION(buffer)) {
+      if (size < (mHeaderSize + sizeof(DWORD))) {
+        ZS_EVENTING_2(x, w, Trace, RTPPacketParseWarning, ol, RtpPacket, Parse,
+          string, message, "illegal RTP packet (packet not large enough to hold data)",
+          puid, mediaChannelID, mMediaChannelID
+        );
         return false;
       }
 
-      mVersion = RTP_HEADER_VERSION(buffer);
-      if (mVersion != kRtpVersion) {
-        ZS_LOG_WARNING(Trace, log("not an RTP packet"))
+      mHeaderExtensionSize = (static_cast<size_t>(UseRTPUtils::getBE16(&(buffer[mHeaderSize + 2]))) * sizeof(DWORD)) + sizeof(DWORD);
+      if (size < (mHeaderSize + mHeaderExtensionSize)) {
+        ZS_EVENTING_2(x, w, Trace, RTPPacketParseWarning, ol, RtpPacket, Parse,
+          string, message, "illegal RTP packet (packet not large enough to hold extensions)",
+          puid, mediaChannelID, mMediaChannelID
+        );
         return false;
       }
+    }
 
-      if (RTPUtils::isRTCPPacketType(buffer, size)) {
-        ZS_LOG_WARNING(Trace, log("packet is RTCP not RTP") + ZS_PARAM("length", size))
+    if (hasPadding) {
+      mPadding = static_cast<size_t>(buffer[size-1]);
+      if (0 == mPadding) {
+        ZS_EVENTING_2(x, w, Trace, RTPPacketParseWarning, ol, RtpPacket, Parse,
+          string, message, "illegal RTP packet (no padding size)",
+          puid, mediaChannelID, mMediaChannelID
+        );
         return false;
       }
 
-      bool hasPadding = RTP_HEADER_PADDING(buffer);
-      mCC = RTP_HEADER_CC(buffer);
-      mM = RTP_HEADER_M(buffer);
-      mPT = RTP_HEADER_PT(buffer);
-      mSequenceNumber = RTPUtils::getBE16(&(buffer[2]));
-      mTimestamp = RTPUtils::getBE32(&(buffer[4]));
-      mSSRC = RTPUtils::getBE32(&(buffer[8]));
-
-      mHeaderSize = kMinRtpPacketLen + (static_cast<size_t>(mCC) * sizeof(DWORD));
-
-      if (size < mHeaderSize) {
-        ZS_LOG_WARNING(Trace, debug("illegal RTP packet"))
+      if (size < (mHeaderSize + mHeaderExtensionSize + mPadding)) {
+        ZS_EVENTING_2(x, w, Trace, RTPPacketParseWarning, ol, RtpPacket, Parse,
+          string, message, "illegal RTP packet (packet not large enough to hold padding)",
+          puid, mediaChannelID, mMediaChannelID
+        );
         return false;
       }
+    }
 
-      if (RTP_HEADER_EXTENSION(buffer)) {
-        if (size < (mHeaderSize + sizeof(DWORD))) {
-          ZS_LOG_WARNING(Trace, debug("illegal RTP packet"))
-          return false;
-        }
-
-        mHeaderExtensionSize = (static_cast<size_t>(RTPUtils::getBE16(&(buffer[mHeaderSize + 2]))) * sizeof(DWORD)) + sizeof(DWORD);
-        if (size < (mHeaderSize + mHeaderExtensionSize)) {
-          ZS_LOG_WARNING(Trace, debug("illegal RTP packet"))
-          return false;
-        }
-      }
-
-      if (hasPadding) {
-        mPadding = static_cast<size_t>(buffer[size-1]);
-        if (0 == mPadding) {
-          ZS_LOG_WARNING(Trace, debug("illegal RTP packet (no padding size)"))
-          return false;
-        }
-
-        if (size < (mHeaderSize + mHeaderExtensionSize + mPadding)) {
-          ZS_LOG_WARNING(Trace, debug("illegal RTP packet"))
-          return false;
-        }
-      }
-
-      mPayloadSize = size - (mHeaderSize + mHeaderExtensionSize + mPadding);
+    mPayloadSize = size - (mHeaderSize + mHeaderExtensionSize + mPadding);
 
-      if (0 == mHeaderExtensionSize) {
-        // no extensions present
-        ZS_LOG_INSANE(debug("parsed"))
-        return true;
-      }
+    if (0 == mHeaderExtensionSize) {
+      // no extensions present
+      ZS_EVENTING_TRACE_OBJECT(Insane, *this, "parsed");
+      return true;
+    }
 
-      const BYTE *profilePos = &(buffer[mHeaderSize]);
+    const BYTE *profilePos = &(buffer[mHeaderSize]);
 
-      bool oneByte = false;
+    bool oneByte = false;
 
-      if ((0xBE == profilePos[0]) &&
-          (0xDE == profilePos[1])) {
-        oneByte = true;
-      } else {
-        WORD twoByteHeader = RTPUtils::getBE16(profilePos);
-        mHeaderExtensionAppBits = (twoByteHeader & 0xF);
+    if ((0xBE == profilePos[0]) &&
+        (0xDE == profilePos[1])) {
+      oneByte = true;
+    } else {
+      WORD twoByteHeader = UseRTPUtils::getBE16(profilePos);
+      mHeaderExtensionAppBits = (twoByteHeader & 0xF);
 
-        if (0x100 != ((twoByteHeader & 0xFFF0) >> 4)) {
-          ZS_LOG_WARNING(Trace, log("header extension profile is not understood") + ZS_PARAM("profile", twoByteHeader))
-          return false;
-        }
-      }
-
-      size_t remaining = mHeaderExtensionSize - sizeof(DWORD);
-      if (0 == remaining) {
-        ZS_LOG_INSANE(debug("parsed"))
-        return true;
+      if (0x100 != ((twoByteHeader & 0xFFF0) >> 4)) {
+        ZS_EVENTING_3(x, w, Trace, RTPPacketParseWarningHeaderProfileNotUnderstood, ol, RtpPacket, Parse,
+          string, message, "illegal RTP packet (packet not large enough to hold padding)",
+          puid, mediaChannelID, mMediaChannelID,
+          word, profile, twoByteHeader
+        );
+        return false;
       }
+    }
 
-      const BYTE *pos = &(profilePos[4]);
+    size_t remaining = mHeaderExtensionSize - sizeof(DWORD);
+    if (0 == remaining) {
+      ZS_EVENTING_TRACE_OBJECT(Insane, *this, "parsed");
+      return true;
+    }
 
-      size_t totalPossibleHeaderExtensions = (remaining / sizeof(WORD)) + ((0 != (remaining % sizeof(WORD))) ? 1 : 0);
+    const BYTE *pos = &(profilePos[4]);
 
-      mHeaderExtensions = new HeaderExtension[totalPossibleHeaderExtensions] {};
+    size_t totalPossibleHeaderExtensions = (remaining / sizeof(WORD)) + ((0 != (remaining % sizeof(WORD))) ? 1 : 0);
 
-      size_t totalFound = 0;
+    mHeaderExtensions = new HeaderExtension[totalPossibleHeaderExtensions] {};
 
-      while ((remaining > 0) &&
-             (totalFound < totalPossibleHeaderExtensions)) {
+    size_t totalFound = 0;
 
-        HeaderExtension *current = &(mHeaderExtensions[totalFound]);
+    while ((remaining > 0) &&
+            (totalFound < totalPossibleHeaderExtensions)) {
 
-        if (0 == pos[0]) {
-          // see https://tools.ietf.org/html/rfc5285 4.1
+      HeaderExtension *current = &(mHeaderExtensions[totalFound]);
 
-          // A sequence of extension elements, possibly with padding, forms the
-          // header extension defined in the RTP specification.  There are as many
-          // extension elements as fit into the length as indicated in the RTP
-          // header extension length.  Since this length is signaled in full 32-
-          // bit words, padding bytes are used to pad to a 32-bit boundary.  The
-          // entire extension is parsed byte-by-byte to find each extension
-          // element (no alignment is required), and parsing stops at the earlier
-          // of the end of the entire header extension, or, in one-byte headers,
-          // on encountering an identifier with the reserved value of 15.
+      if (0 == pos[0]) {
+        // see https://tools.ietf.org/html/rfc5285 4.1
 
-          // In both forms, padding bytes have the value of 0 (zero).  They may be
-          // placed between extension elements, if desired for alignment, or after
-          // the last extension element, if needed for padding.  A padding byte
-          // does not supply the ID of an element, nor the length field.  When a
-          // padding byte is found, it is ignored and the parser moves on to
-          // interpreting the next byte.
+        // A sequence of extension elements, possibly with padding, forms the
+        // header extension defined in the RTP specification.  There are as many
+        // extension elements as fit into the length as indicated in the RTP
+        // header extension length.  Since this length is signaled in full 32-
+        // bit words, padding bytes are used to pad to a 32-bit boundary.  The
+        // entire extension is parsed byte-by-byte to find each extension
+        // element (no alignment is required), and parsing stops at the earlier
+        // of the end of the entire header extension, or, in one-byte headers,
+        // on encountering an identifier with the reserved value of 15.
 
-          // skip padding byte
-          ++pos;
-          --remaining;
-          if (0 == totalFound) {
-            ++mHeaderExtensionPrepaddedSize;
-          } else {
-            ++(mHeaderExtensions[totalFound-1].mPostPaddingSize);
-          }
-          continue;
-        }
+        // In both forms, padding bytes have the value of 0 (zero).  They may be
+        // placed between extension elements, if desired for alignment, or after
+        // the last extension element, if needed for padding.  A padding byte
+        // does not supply the ID of an element, nor the length field.  When a
+        // padding byte is found, it is ignored and the parser moves on to
+        // interpreting the next byte.
 
-        if (oneByte) {
-          BYTE id = ((pos[0] & 0xF0) >> 4);
-          if (id == 0xF) {
-            // see https://tools.ietf.org/html/rfc5285 4.2
-
-            // The local identifier value 15 is reserved for future extension and
-            // MUST NOT be used as an identifier.  If the ID value 15 is
-            // encountered, its length field should be ignored, processing of the
-            // entire extension should terminate at that point, and only the
-            // extension elements present prior to the element with ID 15
-            // considered.
-            mHeaderExtensionParseStoppedPos = pos;
-            mHeaderExtensionParseStoppedSize = remaining;
-            break;
-          }
-
-          // The 4-bit length is the number minus one of data bytes of this header
-          // extension element following the one-byte header.  Therefore, the
-          // value zero in this field indicates that one byte of data follows, and
-          // a value of 15 (the maximum) indicates element data of 16 bytes.
-          // (This permits carriage of 16-byte values, which is a common length of
-          // labels and identifiers, while losing the possibility of zero-length
-          // values -- which would often be padded anyway.)
-
-          size_t length = static_cast<size_t>((pos[0] & 0x0F) + 1);
-
-          if (remaining < (1 + length)) {
-            ZS_LOG_WARNING(Trace, log("extension header is not valid") + ZS_PARAM("id", id) + ZS_PARAM("remaining", remaining) + ZS_PARAM("length", length))
-            return false;
-          }
-
-          current->mID = id;
-          current->mDataSizeInBytes = length;
-          current->mData = &(pos[1]);
-          if (0 != totalFound) {
-            mHeaderExtensions[totalFound-1].mNext = current;
-          }
-
-          remaining -= (1 + length);
-          pos += (1 + length);
-          ++totalFound;
-          continue;
+        // skip padding byte
+        ++pos;
+        --remaining;
+        if (0 == totalFound) {
+          ++mHeaderExtensionPrepaddedSize;
+        } else {
+          ++(mHeaderExtensions[totalFound-1].mPostPaddingSize);
         }
+        continue;
+      }
 
-        // must be a two byte header format
-
-        if (remaining < sizeof(WORD)) {
-          ZS_LOG_WARNING(Trace, log("extension header is not valid") + ZS_PARAM("remaining", remaining))
-          return false;
+      if (oneByte) {
+        BYTE id = ((pos[0] & 0xF0) >> 4);
+        if (id == 0xF) {
+          // see https://tools.ietf.org/html/rfc5285 4.2
+
+          // The local identifier value 15 is reserved for future extension and
+          // MUST NOT be used as an identifier.  If the ID value 15 is
+          // encountered, its length field should be ignored, processing of the
+          // entire extension should terminate at that point, and only the
+          // extension elements present prior to the element with ID 15
+          // considered.
+          mHeaderExtensionParseStoppedPos = pos;
+          mHeaderExtensionParseStoppedSize = remaining;
+          break;
         }
 
-        BYTE id = (pos[0]);
-        size_t length = (pos[1]);
-
-        if (remaining < (sizeof(WORD) + length)) {
-          ZS_LOG_WARNING(Trace, log("extension header is not valid") + ZS_PARAM("id", id) + ZS_PARAM("remaining", remaining) + ZS_PARAM("length", length))
+        // The 4-bit length is the number minus one of data bytes of this header
+        // extension element following the one-byte header.  Therefore, the
+        // value zero in this field indicates that one byte of data follows, and
+        // a value of 15 (the maximum) indicates element data of 16 bytes.
+        // (This permits carriage of 16-byte values, which is a common length of
+        // labels and identifiers, while losing the possibility of zero-length
+        // values -- which would often be padded anyway.)
+
+        size_t length = static_cast<size_t>((pos[0] & 0x0F) + 1);
+
+        if (remaining < (1 + length)) {
+          ZS_EVENTING_4(x, w, Trace, RTPPacketParseWarningExtensionHeaderNotValid, ol, RtpPacket, Parse,
+            string, message, "extension header is not valid",
+            puid, mediaChannelID, mMediaChannelID,
+            size_t, remaining, remaining,
+            size_t, length, length
+          );
           return false;
         }
 
         current->mID = id;
         current->mDataSizeInBytes = length;
-        if (0 != length) {
-          current->mData = &(pos[2]);
-        }
+        current->mData = &(pos[1]);
         if (0 != totalFound) {
           mHeaderExtensions[totalFound-1].mNext = current;
         }
 
-        remaining -= (2 + length);
-        pos += (2 + length);
+        remaining -= (1 + length);
+        pos += (1 + length);
         ++totalFound;
         continue;
       }
 
-      mTotalHeaderExtensions = totalFound;
-      
-      ZS_LOG_INSANE(debug("parsed"))
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    void RTPPacket::writeHeaderExtensions(
-                                          HeaderExtension *firstExtension,
-                                          bool twoByteHeader
-                                          )
-    {
-      ASSERT((bool)mBuffer)
-      ASSERT(0 != mBuffer->SizeInBytes())
-      ASSERT(0 != mHeaderSize)
-      //ASSERT(mHeaderExtensionAppBits)           // needs to be set (but no way to verify here)
-      //ASSERT(mTotalHeaderExtensions)            // needs to be set (but no way to verify here)
-      //ASSERT(mHeaderExtensionPrepaddedSize)     // needs to be set (but no way to verify here)
-      //ASSSRT(mHeaderExtensionParseStoppedSize)  // needs to be set (but no way to verify here)
-      //ASSERT(mHeaderExtensionParseStoppedPos)   // needs to be set (but no way to verify here)
-      ASSERT(0 != mHeaderExtensionSize)
+      // must be a two byte header format
 
+      if (remaining < sizeof(WORD)) {
+        ZS_EVENTING_4(x, w, Trace, RTPPacketParseWarningExtensionHeaderNotValid, ol, RtpPacket, Parse,
+          string, message, "extension header is not valid (must have room for two byte header)",
+          puid, mediaChannelID, mMediaChannelID,
+          size_t, remaining, remaining,
+          size_t, length, 0
+        );
+        return false;
+      }
 
-      BYTE *newBuffer = mBuffer->BytePtr();
-
-      // set the extension bit
-      newBuffer[0] = newBuffer[0] | RTP_HEADER_EXTENSION_BIT;
+      BYTE id = (pos[0]);
+      size_t length = (pos[1]);
 
-      BYTE *newProfilePos = &(newBuffer[mHeaderSize]);
+      if (remaining < (sizeof(WORD) + length)) {
+        ZS_EVENTING_4(x, w, Trace, RTPPacketParseWarningExtensionHeaderNotValid, ol, RtpPacket, Parse,
+          string, message, "extension header is not valid (must have room for two byte header and length)",
+          puid, mediaChannelID, mMediaChannelID,
+          size_t, remaining, remaining,
+          size_t, length, length
+        );
+        return false;
+      }
 
-      if (twoByteHeader) {
-        WORD profileType = (0x100 << 4) | (mHeaderExtensionAppBits & 0xF);
-        newProfilePos[0] = static_cast<BYTE>((profileType & 0xFF00) >> 8);
-        newProfilePos[1] = static_cast<BYTE>(profileType & 0xFF);
-      } else {
-        newProfilePos[0] = 0xBE;
-        newProfilePos[1] = 0xDE;
+      current->mID = id;
+      current->mDataSizeInBytes = length;
+      if (0 != length) {
+        current->mData = &(pos[2]);
+      }
+      if (0 != totalFound) {
+        mHeaderExtensions[totalFound-1].mNext = current;
       }
 
-      WORD totalDWORDsLength = static_cast<WORD>(((mHeaderExtensionSize - sizeof(DWORD)) / sizeof(DWORD)));
-      newProfilePos[2] = static_cast<BYTE>((totalDWORDsLength & 0xFF00) >> 8);
-      newProfilePos[3] = static_cast<BYTE>(totalDWORDsLength & 0xFF);
+      remaining -= (2 + length);
+      pos += (2 + length);
+      ++totalFound;
+      continue;
+    }
 
-      BYTE *pos = &(newProfilePos[sizeof(DWORD)]) + mHeaderExtensionPrepaddedSize;
+    mTotalHeaderExtensions = totalFound;
 
-      HeaderExtension *newExtensions = NULL;
-      if (0 != mTotalHeaderExtensions) {
-        newExtensions = new HeaderExtension[mTotalHeaderExtensions] {};
-      }
+    ZS_EVENTING_TRACE_OBJECT(Insane, *this, "parsed");
+    return true;
+  }
+    
+  //---------------------------------------------------------------------------
+  void RTPPacket::writeHeaderExtensions(
+                                        HeaderExtension *firstExtension,
+                                        bool twoByteHeader
+                                        )
+  {
+    ASSERT((bool)mBuffer)
+    ASSERT(0 != mBuffer->SizeInBytes())
+    ASSERT(0 != mHeaderSize)
+    //ASSERT(mHeaderExtensionAppBits)           // needs to be set (but no way to verify here)
+    //ASSERT(mTotalHeaderExtensions)            // needs to be set (but no way to verify here)
+    //ASSERT(mHeaderExtensionPrepaddedSize)     // needs to be set (but no way to verify here)
+    //ASSSRT(mHeaderExtensionParseStoppedSize)  // needs to be set (but no way to verify here)
+    //ASSERT(mHeaderExtensionParseStoppedPos)   // needs to be set (but no way to verify here)
+    ASSERT(0 != mHeaderExtensionSize)
+
+
+    BYTE *newBuffer = mBuffer->BytePtr();
+
+    // set the extension bit
+    newBuffer[0] = newBuffer[0] | RTP_HEADER_EXTENSION_BIT;
+
+    BYTE *newProfilePos = &(newBuffer[mHeaderSize]);
+
+    if (twoByteHeader) {
+      WORD profileType = (0x100 << 4) | (mHeaderExtensionAppBits & 0xF);
+      newProfilePos[0] = static_cast<BYTE>((profileType & 0xFF00) >> 8);
+      newProfilePos[1] = static_cast<BYTE>(profileType & 0xFF);
+    } else {
+      newProfilePos[0] = 0xBE;
+      newProfilePos[1] = 0xDE;
+    }
 
-      size_t index = 0;
-      for (HeaderExtension *current = firstExtension; NULL != current; current = current->mNext, ++index) {
-        HeaderExtension *newCurrent = &(newExtensions[index]);
-        if (0 != index) {
-          newExtensions[index-1].mNext = newCurrent;
-        }
+    WORD totalDWORDsLength = static_cast<WORD>(((mHeaderExtensionSize - sizeof(DWORD)) / sizeof(DWORD)));
+    newProfilePos[2] = static_cast<BYTE>((totalDWORDsLength & 0xFF00) >> 8);
+    newProfilePos[3] = static_cast<BYTE>(totalDWORDsLength & 0xFF);
 
-        if (twoByteHeader) {
-          pos[0] = current->mID;
-          pos[1] = static_cast<BYTE>(current->mDataSizeInBytes);
-          pos += 2;
-        } else {
-          pos[0] = ((current->mID) << 4) | ((current->mDataSizeInBytes - 1) & 0xF);
-          ++pos;
-        }
+    BYTE *pos = &(newProfilePos[sizeof(DWORD)]) + mHeaderExtensionPrepaddedSize;
 
-        newCurrent->mID = current->mID;
-        newCurrent->mData = pos;
-        newCurrent->mDataSizeInBytes = current->mDataSizeInBytes;
-        newCurrent->mPostPaddingSize = current->mPostPaddingSize;
+    HeaderExtension *newExtensions = NULL;
+    if (0 != mTotalHeaderExtensions) {
+      newExtensions = new HeaderExtension[mTotalHeaderExtensions] {};
+    }
 
-        if (0 != current->mDataSizeInBytes) {
-          memcpy(pos, current->mData, current->mDataSizeInBytes);
-          pos += current->mDataSizeInBytes;
-        }
-        pos += current->mPostPaddingSize;
+    size_t index = 0;
+    for (HeaderExtension *current = firstExtension; NULL != current; current = current->mNext, ++index) {
+      HeaderExtension *newCurrent = &(newExtensions[index]);
+      if (0 != index) {
+        newExtensions[index-1].mNext = newCurrent;
       }
 
-      if (0 != mHeaderExtensionParseStoppedSize) {
-        ASSERT(NULL != mHeaderExtensionParseStoppedPos)
-
-        memcpy(pos, mHeaderExtensionParseStoppedPos, mHeaderExtensionParseStoppedSize);
-        mHeaderExtensionParseStoppedPos = pos;
+      if (twoByteHeader) {
+        pos[0] = current->mID;
+        pos[1] = static_cast<BYTE>(current->mDataSizeInBytes);
+        pos += 2;
       } else {
-        mHeaderExtensionParseStoppedPos = NULL;
+        pos[0] = ((current->mID) << 4) | ((current->mDataSizeInBytes - 1) & 0xF);
+        ++pos;
       }
 
-      ASSERT(index == mTotalHeaderExtensions)
+      newCurrent->mID = current->mID;
+      newCurrent->mData = pos;
+      newCurrent->mDataSizeInBytes = current->mDataSizeInBytes;
+      newCurrent->mPostPaddingSize = current->mPostPaddingSize;
 
-      mTotalHeaderExtensions = index;
-      if (NULL != mHeaderExtensions) {
-        delete [] mHeaderExtensions;
-        mHeaderExtensions = NULL;
+      if (0 != current->mDataSizeInBytes) {
+        memcpy(pos, current->mData, current->mDataSizeInBytes);
+        pos += current->mDataSizeInBytes;
       }
-      mHeaderExtensions = newExtensions;
+      pos += current->mPostPaddingSize;
     }
 
-    //-------------------------------------------------------------------------
-    void RTPPacket::generate(const RTPPacket &packet)
-    {
-      CreationParams params;
-
-      params.mVersion = packet.version();
-      params.mPadding = packet.padding();
-      params.mM = packet.m();
-      params.mPT = packet.pt();
-      params.mSequenceNumber = packet.sequenceNumber();
-      params.mTimestamp = packet.timestamp();
-      params.mSSRC = packet.ssrc();
-
-      params.mCC = packet.cc();
-      params.mCC = (static_cast<BYTE>(packet.cc()) & 0xF);
-
-      DWORD tmpCCList[0xF];
-      if (params.mCC > 0) {
-        for (decltype(params.mCC) index = 0; index < params.mCC; ++index) {
-          tmpCCList[index] = packet.getCSRC(index);
-        }
-        params.mCSRCList = &(tmpCCList[0]);
-      }
-
-      params.mPayload = packet.payload();
-      params.mPayloadSize = packet.payloadSize();
-      params.mFirstHeaderExtension = packet.firstHeaderExtension();
-      params.mHeaderExtensionAppBits = packet.headerExtensionAppBits();
+    if (0 != mHeaderExtensionParseStoppedSize) {
+      ASSERT(NULL != mHeaderExtensionParseStoppedPos)
 
-      params.mHeaderExtensionPrepaddedSize = packet.headerExtensionPrepaddedSize();
-      params.mHeaderExtensionStopParsePos = packet.headerExtensionParseStopped();
-      params.mHeaderExtensionStopParseSize = packet.headerExtensionParseStoppedSize();
-
-      generate(params);
+      memcpy(pos, mHeaderExtensionParseStoppedPos, mHeaderExtensionParseStoppedSize);
+      mHeaderExtensionParseStoppedPos = pos;
+    } else {
+      mHeaderExtensionParseStoppedPos = NULL;
     }
 
-    //-------------------------------------------------------------------------
-    void RTPPacket::generate(const CreationParams &params)
-    {
-      ASSERT(params.mVersion <= 0x3)
-      ASSERT(params.mPadding <= 0xFF)
-      ASSERT(params.mCC <= 0xF)
-      ASSERT(params.mPT <= 0x7F)
-
-      ASSERT(0 == params.mCC ? (NULL == params.mCSRCList) : (NULL != params.mCSRCList))
-      ASSERT(0 == params.mPayloadSize ? (NULL == params.mPayload) : (NULL != params.mPayload))
+    ASSERT(index == mTotalHeaderExtensions)
 
-      mVersion = params.mVersion & 0x3;
-      mPadding = params.mPadding;
-      mCC = (static_cast<BYTE>(params.mCC) & 0xF);
-      mM = params.mM;
-      mPT = (params.mPT & 0x7F);
-      mSequenceNumber = params.mSequenceNumber;
-      mTimestamp = params.mTimestamp;
-      mSSRC = params.mSSRC;
-
-      mHeaderSize = kMinRtpPacketLen + (static_cast<size_t>(mCC) * sizeof(DWORD));
-      //mHeaderExtensionSize = 0; // filled in later
-      mPayloadSize = params.mPayloadSize;
+    mTotalHeaderExtensions = index;
+    if (NULL != mHeaderExtensions) {
+      delete [] mHeaderExtensions;
+      mHeaderExtensions = NULL;
+    }
+    mHeaderExtensions = newExtensions;
+  }
 
-      //mTotalHeaderExtensions (later)
-      //mHeaderExtensions (later)
-      mHeaderExtensionAppBits = params.mHeaderExtensionAppBits;
+  //---------------------------------------------------------------------------
+  void RTPPacket::generate(const RTPPacket &packet)
+  {
+    CreationParams params;
+
+    params.mMediaChannelID = packet.mMediaChannelID;
+    params.mVersion = packet.version();
+    params.mPadding = packet.padding();
+    params.mM = packet.m();
+    params.mPT = packet.pt();
+    params.mSequenceNumber = packet.sequenceNumber();
+    params.mTimestamp = packet.timestamp();
+    params.mSSRC = packet.ssrc();
+
+    params.mCC = packet.cc();
+    params.mCC = (static_cast<BYTE>(packet.cc()) & 0xF);
+
+    DWORD tmpCCList[0xF];
+    if (params.mCC > 0) {
+      for (decltype(params.mCC) index = 0; index < params.mCC; ++index) {
+        tmpCCList[index] = packet.getCSRC(index);
+      }
+      params.mCSRCList = &(tmpCCList[0]);
+    }
 
-      mHeaderExtensionPrepaddedSize = params.mHeaderExtensionPrepaddedSize;
-      mHeaderExtensionParseStoppedPos = params.mHeaderExtensionStopParsePos;
-      mHeaderExtensionParseStoppedSize = params.mHeaderExtensionStopParseSize;
+    params.mPayload = packet.payload();
+    params.mPayloadSize = packet.payloadSize();
+    params.mFirstHeaderExtension = packet.firstHeaderExtension();
+    params.mHeaderExtensionAppBits = packet.headerExtensionAppBits();
 
-      bool twoByteHeader = requiresTwoByteHeader(params.mFirstHeaderExtension, mHeaderExtensionAppBits);
+    params.mHeaderExtensionPrepaddedSize = packet.headerExtensionPrepaddedSize();
+    params.mHeaderExtensionStopParsePos = packet.headerExtensionParseStopped();
+    params.mHeaderExtensionStopParseSize = packet.headerExtensionParseStoppedSize();
 
-      if (twoByteHeader) {
-        ORTC_THROW_INVALID_STATE_IF(NULL != mHeaderExtensionParseStoppedPos)  // requires a 1 byte header to append this data
-      }
+    generate(params);
+  }
 
-      bool requiresExtension = requiredExtension(params.mFirstHeaderExtension, mHeaderExtensionAppBits, mHeaderExtensionPrepaddedSize, mHeaderExtensionParseStoppedPos);
+  //---------------------------------------------------------------------------
+  void RTPPacket::generate(const CreationParams &params)
+  {
+    ASSERT(params.mVersion <= 0x3)
+    ASSERT(params.mPadding <= 0xFF)
+    ASSERT(params.mCC <= 0xF)
+    ASSERT(params.mPT <= 0x7F)
+
+    ASSERT(0 == params.mCC ? (NULL == params.mCSRCList) : (NULL != params.mCSRCList))
+    ASSERT(0 == params.mPayloadSize ? (NULL == params.mPayload) : (NULL != params.mPayload))
+
+    mVersion = params.mVersion & 0x3;
+    mPadding = params.mPadding;
+    mCC = (static_cast<BYTE>(params.mCC) & 0xF);
+    mM = params.mM;
+    mPT = (params.mPT & 0x7F);
+    mSequenceNumber = params.mSequenceNumber;
+    mTimestamp = params.mTimestamp;
+    mSSRC = params.mSSRC;
+
+    mHeaderSize = internal::kMinRtpPacketLen + (static_cast<size_t>(mCC) * sizeof(DWORD));
+    //mHeaderExtensionSize = 0; // filled in later
+    mPayloadSize = params.mPayloadSize;
+
+    //mTotalHeaderExtensions (later)
+    //mHeaderExtensions (later)
+    mHeaderExtensionAppBits = params.mHeaderExtensionAppBits;
+
+    mHeaderExtensionPrepaddedSize = params.mHeaderExtensionPrepaddedSize;
+    mHeaderExtensionParseStoppedPos = params.mHeaderExtensionStopParsePos;
+    mHeaderExtensionParseStoppedSize = params.mHeaderExtensionStopParseSize;
+
+    bool twoByteHeader = requiresTwoByteHeader(params.mFirstHeaderExtension, mHeaderExtensionAppBits);
+
+    if (twoByteHeader) {
+      ORTC_THROW_INVALID_STATE_IF(NULL != mHeaderExtensionParseStoppedPos)  // requires a 1 byte header to append this data
+    }
 
-      if (requiresExtension) {
-        mHeaderExtensionSize = 0;
-        mTotalHeaderExtensions = 0;
-        getHeaderExtensionSize(params.mFirstHeaderExtension, twoByteHeader, mHeaderExtensionPrepaddedSize, mHeaderExtensionParseStoppedSize, mHeaderExtensionSize, mTotalHeaderExtensions);
-      }
+    bool requiresExtension = internal::requiredExtension(params.mFirstHeaderExtension, mHeaderExtensionAppBits, mHeaderExtensionPrepaddedSize, mHeaderExtensionParseStoppedPos);
 
-      size_t postHeaderExtensionSize = mPayloadSize + mPadding;
+    if (requiresExtension) {
+      mHeaderExtensionSize = 0;
+      mTotalHeaderExtensions = 0;
+      internal::getHeaderExtensionSize(params.mFirstHeaderExtension, twoByteHeader, mHeaderExtensionPrepaddedSize, mHeaderExtensionParseStoppedSize, mHeaderExtensionSize, mTotalHeaderExtensions);
+    }
 
-      size_t newSize = mHeaderSize + mHeaderExtensionSize + postHeaderExtensionSize;
+    size_t postHeaderExtensionSize = mPayloadSize + mPadding;
 
-      mBuffer = make_shared<SecureByteBlock>(newSize);
+    size_t newSize = mHeaderSize + mHeaderExtensionSize + postHeaderExtensionSize;
 
-      BYTE *newBuffer = mBuffer->BytePtr();
+    mBuffer = make_shared<SecureByteBlock>(newSize);
 
-      // fill standard header
+    BYTE *newBuffer = mBuffer->BytePtr();
 
-      BYTE *pos = newBuffer;
-      pos[0] = RTP_PACK_BITS(mVersion, 0x3, 6) |
-               RTP_PACK_BITS(0 != mPadding ? 1 : 0, 0x1, 5) |
-               RTP_PACK_BITS(requiresExtension ? 1 : 0, 0x1, 4) |
-               RTP_PACK_BITS(mCC, 0xF, 0);
-      pos[1] = RTP_PACK_BITS(mM ? 1 : 0, 0x1, 7) |
-               RTP_PACK_BITS(mPT, 0x7F, 0);
+    // fill standard header
 
-      RTPUtils::setBE16(&(pos[2]), mSequenceNumber);
-      RTPUtils::setBE32(&(pos[4]), mTimestamp);
-      RTPUtils::setBE32(&(pos[8]), mSSRC);
+    BYTE *pos = newBuffer;
+    pos[0] = RTP_PACK_BITS(mVersion, 0x3, 6) |
+             RTP_PACK_BITS(0 != mPadding ? 1 : 0, 0x1, 5) |
+             RTP_PACK_BITS(requiresExtension ? 1 : 0, 0x1, 4) |
+             RTP_PACK_BITS(mCC, 0xF, 0);
+    pos[1] = RTP_PACK_BITS(mM ? 1 : 0, 0x1, 7) |
+             RTP_PACK_BITS(mPT, 0x7F, 0);
 
-      // write CSRC list (if any)
-      for (size_t index = 0; index < static_cast<size_t>(mCC); ++index) {
-        RTPUtils::setBE32(&(pos[12+(sizeof(DWORD)*index)]), params.mCSRCList[index]);
-      }
+    UseRTPUtils::setBE16(&(pos[2]), mSequenceNumber);
+    UseRTPUtils::setBE32(&(pos[4]), mTimestamp);
+    UseRTPUtils::setBE32(&(pos[8]), mSSRC);
 
-      if (requiresExtension) {
-        writeHeaderExtensions(params.mFirstHeaderExtension, twoByteHeader);
-      }
+    // write CSRC list (if any)
+    for (size_t index = 0; index < static_cast<size_t>(mCC); ++index) {
+      UseRTPUtils::setBE32(&(pos[12+(sizeof(DWORD)*index)]), params.mCSRCList[index]);
+    }
 
-      if (0 != mPayloadSize) {
-        memcpy(&(pos[mHeaderSize+mHeaderExtensionSize]), params.mPayload, mPayloadSize);
-      }
+    if (requiresExtension) {
+      writeHeaderExtensions(params.mFirstHeaderExtension, twoByteHeader);
+    }
 
-      if (0 != mPadding) {
-        newBuffer[newSize-1] = static_cast<BYTE>(mPadding);
-      }
+    if (0 != mPayloadSize) {
+      memcpy(&(pos[mHeaderSize+mHeaderExtensionSize]), params.mPayload, mPayloadSize);
+    }
 
-      ZS_LOG_INSANE(debug("generated RTP packet"))
+    if (0 != mPadding) {
+      newBuffer[newSize-1] = static_cast<BYTE>(mPadding);
     }
+
+    ZS_EVENTING_TRACE_OBJECT(Insane, *this, "generated");
   }
 
-}
+} // namespace ortc
diff --git a/ortc/cpp/ortc_RTPReceiver.cpp b/ortc/cpp/ortc_RTPReceiver.cpp
index 94dad051..aa099ab4 100644
--- a/ortc/cpp/ortc_RTPReceiver.cpp
+++ b/ortc/cpp/ortc_RTPReceiver.cpp
@@ -29,14 +29,14 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_RTPReceiver.h>
 #include <ortc/internal/ortc_RTPReceiverChannel.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
 #include <ortc/internal/ortc_RTPListener.h>
 #include <ortc/internal/ortc_MediaStreamTrack.h>
 #include <ortc/internal/ortc_RTPUtils.h>
-#include <ortc/internal/ortc_RTPPacket.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
 #include <ortc/internal/ortc_RTPTypes.h>
 #include <ortc/internal/ortc_SRTPSDESTransport.h>
 #include <ortc/internal/ortc_ORTC.h>
@@ -45,6 +45,8 @@
 #include <ortc/internal/platform.h>
 
 #include <ortc/IHelper.h>
+#include <ortc/RTPPacket.h>
+#include <ortc/RTCPPacket.h>
 
 #include <ortc/services/IHTTP.h>
 
@@ -66,7 +68,7 @@
 #endif //_DEBUG
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpreceiver) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_rtp_receiver) }
 
 namespace ortc
 {
@@ -102,6 +104,10 @@ namespace ortc
         case IRTPTypes::HeaderExtensionURI_RID:                               return false;
         case IRTPTypes::HeaderExtensionURI_3gpp_VideoOrientation:             return true;
         case IRTPTypes::HeaderExtensionURI_3gpp_VideoOrientation6:            return true;
+
+        case IRTPTypes::HeaderExtensionURI_TransmissionTimeOffsets:           return true;
+        case IRTPTypes::HeaderExtensionURI_AbsoluteSendTime:                  return true;
+        case IRTPTypes::HeaderExtensionURI_TransportSequenceNumber:           return true;
       }
       return true;
     }
@@ -519,14 +525,15 @@ namespace ortc
                              ) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create()),
       mKind(kind),
       mChannels(make_shared<ChannelWeakMap>()),
+      mSSRCTableExpires(Seconds(ISettings::getUInt(ORTC_SETTING_RTP_RECEIVER_SSRC_TIMEOUT_IN_SECONDS))),
       mMaxBufferedRTPPackets(SafeInt<decltype(mMaxBufferedRTPPackets)>(ISettings::getUInt(ORTC_SETTING_RTP_RECEIVER_MAX_RTP_PACKETS_IN_BUFFER))),
       mMaxRTPPacketAge(ISettings::getUInt(ORTC_SETTING_RTP_RECEIVER_MAX_AGE_RTP_PACKETS_IN_SECONDS)),
+      mContributingSourcesExpiry(Seconds(ISettings::getUInt(ORTC_SETTING_RTP_RECEIVER_CSRC_EXPIRY_TIME_IN_SECONDS))),
       mLockAfterSwitchTime(ISettings::getUInt(ORTC_SETTING_RTP_RECEIVER_LOCK_TO_RECEIVER_CHANNEL_AFTER_SWITCH_EXCLUSIVELY_FOR_IN_MILLISECONDS)),
-      mAmbiguousPayloadMappingMinDifference(ISettings::getUInt(ORTC_SETTING_RTP_RECEIVER_ONLY_RESOLVE_AMBIGUOUS_PAYLOAD_MAPPING_IF_ACTIVITY_DIFFERS_IN_MILLISECONDS)),
-      mSSRCTableExpires(Seconds(ISettings::getUInt(ORTC_SETTING_RTP_RECEIVER_SSRC_TIMEOUT_IN_SECONDS))),
-      mContributingSourcesExpiry(Seconds(ISettings::getUInt(ORTC_SETTING_RTP_RECEIVER_CSRC_EXPIRY_TIME_IN_SECONDS)))
+      mAmbiguousPayloadMappingMinDifference(ISettings::getUInt(ORTC_SETTING_RTP_RECEIVER_ONLY_RESOLVE_AMBIGUOUS_PAYLOAD_MAPPING_IF_ACTIVITY_DIFFERS_IN_MILLISECONDS))
     {
       ZS_LOG_DETAIL(debug("created"))
 
@@ -538,7 +545,9 @@ namespace ortc
 
       ZS_LOG_DEBUG(log("creating media stream track") + ZS_PARAM("kind", IMediaStreamTrack::toString(mKind)))
       
+#if 0
       mTrack = UseMediaStreamTrack::create(mKind);
+#endif //0
 
       ZS_LOG_DEBUG(log("created media stream track") + ZS_PARAM("kind", IMediaStreamTrack::toString(mKind)) + ZS_PARAM("track", mTrack ? mTrack->getID() : 0));
       
@@ -642,7 +651,6 @@ namespace ortc
         channels = mChannels; // obtain pointer to COW list while inside a lock
       }
 
-      bool result = false;
       for (auto iter = channels->begin(); iter != channels->end(); ++iter)
       {
         auto channel = (*iter).second.lock();
@@ -710,7 +718,7 @@ namespace ortc
     }
 
     //-------------------------------------------------------------------------
-    IMediaStreamTrackPtr RTPReceiver::track() const
+    ortc::IMediaStreamTrackPtr RTPReceiver::track() const
     {
       return IMediaStreamTrackPtr(MediaStreamTrack::convert(mTrack));
     }
@@ -1402,9 +1410,9 @@ namespace ortc
 
           if (CodecType_RTX != info.mCodecType) continue;
 
-          for (auto iter = parameters->mCodecs.begin(); iter != parameters->mCodecs.end(); ++iter)
+          for (auto iterCodecs = parameters->mCodecs.begin(); iterCodecs != parameters->mCodecs.end(); ++iterCodecs)
           {
-            auto &codec = (*iter);
+            auto &codec = (*iterCodecs);
             if (codec.mPayloadType != info.mPayloadType) continue;
 
             RTXCodecParametersPtr rtxParam = RTXCodecParameters::convert(codec.mParameters);
@@ -1431,11 +1439,16 @@ namespace ortc
         {
           case SupportedCodec_VP8:
           case SupportedCodec_VP9:
+#if 0
             mTrack->setH264Rendering(false);
+#endif //0
             goto end_codec_loop;
           case SupportedCodec_H264:
+#if 0
             mTrack->setH264Rendering(true);
+#endif //0
             goto end_codec_loop;
+          default: break;
         }
         continue;
 
@@ -1617,7 +1630,8 @@ namespace ortc
                     );
 
 
-      ZS_LOG_TRACE(log("received packet") + ZS_PARAM("via", IICETypes::toString(viaTransport)) + packet->toDebug())
+      ZS_LOG_TRACE(log("received packet") + ZS_PARAM("via", IICETypes::toString(viaTransport)));
+      ZS_EVENTING_TRACE_OBJECT(Insane, *packet, "rtp receiver received packet");
 
       ChannelHolderPtr channelHolder;
 
@@ -1687,7 +1701,8 @@ namespace ortc
                     size, size, packet->buffer()->SizeInBytes()
                     );
 
-      ZS_LOG_TRACE(log("received packet") + ZS_PARAM("via", IICETypes::toString(viaTransport)) + packet->toDebug());
+      ZS_LOG_TRACE(log("received packet") + ZS_PARAM("via", IICETypes::toString(viaTransport)));
+      ZS_EVENTING_TRACE_OBJECT(Insane, *packet, "rtp receiver received packet");
 
       ChannelWeakMapPtr channels;
 
@@ -4025,7 +4040,9 @@ namespace ortc
                     puid, trackId, mTrack->getID(),
                     puid, channelObjectId, channelHolder->getID()
                     );
+#if 0
       mTrack->notifyActiveReceiverChannel(RTPReceiverChannel::convert(channelHolder->mChannel));
+#endif //0
     }
 
     //-------------------------------------------------------------------------
@@ -4042,8 +4059,9 @@ namespace ortc
                     puid, trackId, mTrack->getID(),
                     puid, channelObjectId, 0
                     );
-
+#if 0
       mTrack->notifyActiveReceiverChannel(RTPReceiverChannelPtr());
+#endif //0
     }
 
     //-------------------------------------------------------------------------
diff --git a/ortc/cpp/ortc_RTPReceiverChannel.cpp b/ortc/cpp/ortc_RTPReceiverChannel.cpp
index e13fa108..5125be53 100644
--- a/ortc/cpp/ortc_RTPReceiverChannel.cpp
+++ b/ortc/cpp/ortc_RTPReceiverChannel.cpp
@@ -30,21 +30,19 @@
  */
 
 #include <ortc/internal/ortc_RTPReceiverChannel.h>
-#include <ortc/internal/ortc_RTPReceiverChannelMediaBase.h>
-#include <ortc/internal/ortc_RTPReceiverChannelAudio.h>
-#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
 #include <ortc/internal/ortc_RTPReceiver.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
 #include <ortc/internal/ortc_RTPListener.h>
 #include <ortc/internal/ortc_MediaStreamTrack.h>
-#include <ortc/internal/ortc_RTPPacket.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
 #include <ortc/internal/ortc_RTPTypes.h>
 #include <ortc/internal/ortc_ORTC.h>
 #include <ortc/internal/ortc.events.h>
 #include <ortc/internal/platform.h>
 
 #include <ortc/IHelper.h>
+#include <ortc/RTPPacket.h>
+#include <ortc/RTCPPacket.h>
+
 #include <ortc/services/IHTTP.h>
 
 #include <zsLib/ISettings.h>
@@ -63,8 +61,7 @@
 #define ASSERT(x)
 #endif //_DEBUG
 
-
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpreceiver) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_rtp_receiver) }
 
 namespace ortc
 {
@@ -204,8 +201,8 @@ namespace ortc
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
       mReceiver(receiver),
-      mTrack(track),
-      mParameters(make_shared<Parameters>(params))
+      mParameters(make_shared<Parameters>(params)),
+      mTrack(track)
     {
       ZS_EVENTING_3(
                     x, i, Detail, RtpReceiverChannelCreate, ol, RtpReceiverChannel, Start,
@@ -232,15 +229,11 @@ namespace ortc
         switch (kind.value()) {
           case IMediaStreamTrackTypes::Kind_Audio:
           {
-            mAudio = UseAudio::create(mThisWeak.lock(), MediaStreamTrack::convert(mTrack), *mParameters);
-            mMediaBase = mAudio;
             found = true;
             break;
           }
           case IMediaStreamTrackTypes::Kind_Video:
           {
-            mVideo = UseVideo::create(mThisWeak.lock(), MediaStreamTrack::convert(mTrack), *mParameters);
-            mMediaBase = mVideo;
             found = true;
             break;
           }
@@ -249,10 +242,9 @@ namespace ortc
       
       ORTC_THROW_INVALID_PARAMETERS_IF(!found);
 
-      ZS_EVENTING_3(
+      ZS_EVENTING_2(
                     x, i, Detail, RtpReceiverChannelCreateMediaChannel, ol, RtpReceiverChannel, Info,
                     puid, id, mID,
-                    puid, mediaBaseId, mMediaBase->getID(),
                     string, kind, IMediaStreamTrack::toString(kind.value())
                     );
 
@@ -366,36 +358,33 @@ namespace ortc
     //-------------------------------------------------------------------------
     bool RTPReceiverChannel::handlePacket(RTPPacketPtr packet)
     {
-      ZS_EVENTING_5(
+      ZS_EVENTING_4(
                     x, i, Trace, RtpReceiverChannelDeliverIncomingPacketToMediaChannel, ol, RtpReceiverChannel, Deliver,
                     puid, id, mID,
-                    puid, mediaBaseId, mMediaBase->getID(),
                     enum, packetType, zsLib::to_underlying(IICETypes::Component_RTP),
                     buffer, packet, packet->buffer()->BytePtr(),
                     size, size, packet->buffer()->SizeInBytes()
                     );
 
-      return mMediaBase->handlePacket(packet);
+      return false;
     }
 
     //-------------------------------------------------------------------------
     bool RTPReceiverChannel::handlePacket(RTCPPacketPtr packet)
     {
-      ZS_EVENTING_5(
+      ZS_EVENTING_4(
                     x, i, Trace, RtpReceiverChannelDeliverIncomingPacketToMediaChannel, ol, RtpReceiverChannel, Deliver,
                     puid, id, mID,
-                    puid, mediaBaseId, mMediaBase->getID(),
                     enum, packetType, zsLib::to_underlying(IICETypes::Component_RTCP),
                     buffer, packet, packet->buffer()->BytePtr(),
                     size, size, packet->buffer()->SizeInBytes()
                     );
-      return mMediaBase->handlePacket(packet);
+      return false;
     }
 
     //-------------------------------------------------------------------------
     void RTPReceiverChannel::requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats)
     {
-      return mMediaBase->requestStats(promise, stats);
     }
 
 
@@ -471,9 +460,7 @@ namespace ortc
 
 #define TODO_VERIFY_RETURN_RESULT 1
 #define TODO_VERIFY_RETURN_RESULT 2
-      if (!mAudio) return 0;
-      
-      return mAudio->getAudioSamples(numberOfSamples, numberOfChannels, audioSamples, numberOfSamplesOut);
+      return 0;
     }
 
     //-------------------------------------------------------------------------
@@ -533,8 +520,6 @@ namespace ortc
           cancel();
         }
       }
-
-      mMediaBase->notifyTransportState(state);
     }
 
     //-------------------------------------------------------------------------
@@ -564,13 +549,10 @@ namespace ortc
     {
       ZS_LOG_TRACE(log("on update") + params->toDebug())
       
-      UseMediaBasePtr mediaBase;
-
       {
         AutoRecursiveLock lock(*this);
         
         mParameters = params;
-        mediaBase = mMediaBase;
 
         Optional<IMediaStreamTrackTypes::Kinds> kind = RTPTypesHelper::getCodecsKind(*mParameters);
         
@@ -581,12 +563,12 @@ namespace ortc
           switch (kind.value()) {
             case IMediaStreamTrackTypes::Kind_Audio:
             {
-              found = (bool)mAudio;
+              found = true;
               break;
             }
             case IMediaStreamTrackTypes::Kind_Video:
             {
-              found = (bool)mVideo;
+              found = true;
               break;
             }
           }
@@ -594,8 +576,6 @@ namespace ortc
         
         ORTC_THROW_INVALID_PARAMETERS_IF(!found)
       }
-
-      mediaBase->notifyUpdate(params);
     }
 
     //-------------------------------------------------------------------------
diff --git a/ortc/cpp/ortc_RTPReceiverChannelAudio.cpp b/ortc/cpp/ortc_RTPReceiverChannelAudio.cpp
deleted file mode 100644
index e2cd3c22..00000000
--- a/ortc/cpp/ortc_RTPReceiverChannelAudio.cpp
+++ /dev/null
@@ -1,845 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#include <ortc/internal/ortc_RTPReceiverChannelAudio.h>
-#include <ortc/internal/ortc_RTPReceiverChannel.h>
-#include <ortc/internal/ortc_MediaStreamTrack.h>
-#include <ortc/internal/ortc_RTPPacket.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
-#include <ortc/internal/ortc_Helper.h>
-#include <ortc/internal/ortc_ORTC.h>
-#include <ortc/internal/platform.h>
-
-#include <ortc/IHelper.h>
-
-#include <ortc/services/IHTTP.h>
-
-#include <zsLib/ISettings.h>
-#include <zsLib/Stringize.h>
-#include <zsLib/Log.h>
-#include <zsLib/XML.h>
-
-#include <cryptopp/sha.h>
-
-#include <webrtc/voice_engine/include/voe_network.h>
-
-#ifdef _DEBUG
-#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
-#else
-#define ASSERT(x)
-#endif //_DEBUG
-
-
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpreceiver) }
-
-namespace ortc
-{
-  ZS_DECLARE_USING_PTR(zsLib, ISettings);
-  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
-
-  namespace internal
-  {
-    ZS_DECLARE_CLASS_PTR(RTPReceiverChannelAudioSettingsDefaults);
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark (helpers)
-    #pragma mark
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudioSettingsDefaults
-    #pragma mark
-
-    class RTPReceiverChannelAudioSettingsDefaults : public ISettingsApplyDefaultsDelegate
-    {
-    public:
-      //-----------------------------------------------------------------------
-      ~RTPReceiverChannelAudioSettingsDefaults()
-      {
-        ISettings::removeDefaults(*this);
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPReceiverChannelAudioSettingsDefaultsPtr singleton()
-      {
-        static SingletonLazySharedPtr<RTPReceiverChannelAudioSettingsDefaults> singleton(create());
-        return singleton.singleton();
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPReceiverChannelAudioSettingsDefaultsPtr create()
-      {
-        auto pThis(make_shared<RTPReceiverChannelAudioSettingsDefaults>());
-        ISettings::installDefaults(pThis);
-        return pThis;
-      }
-
-      //-----------------------------------------------------------------------
-      virtual void notifySettingsApplyDefaults() override
-      {
-        //      UseSettings::setUInt(ORTC_SETTING_RTP_RECEIVER_CHANNEL_AUDIO_, 0);
-      }
-      
-    };
-
-    //-------------------------------------------------------------------------
-    void installRTPReceiverChannelAudioSettingsDefaults()
-    {
-      RTPReceiverChannelAudioSettingsDefaults::singleton();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelAudioForRTPReceiverChannel
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    ElementPtr IRTPReceiverChannelAudioForRTPReceiverChannel::toDebug(ForRTPReceiverChannelPtr object)
-    {
-      if (!object) return ElementPtr();
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelAudio, object)->toDebug();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudioPtr IRTPReceiverChannelAudioForRTPReceiverChannel::create(
-                                                                                     RTPReceiverChannelPtr receiverChannel,
-                                                                                     MediaStreamTrackPtr track,
-                                                                                     const Parameters &params
-                                                                                     )
-    {
-      return internal::IRTPReceiverChannelAudioFactory::singleton().create(receiverChannel, track, params);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelAudioForMediaStreamTrack
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    ElementPtr IRTPReceiverChannelAudioForMediaStreamTrack::toDebug(ForMediaStreamTrackPtr object)
-    {
-      if (!object) return ElementPtr();
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelAudio, object)->toDebug();
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio
-    #pragma mark
-    
-    //---------------------------------------------------------------------------
-    const char *RTPReceiverChannelAudio::toString(States state)
-    {
-      switch (state) {
-        case State_Pending:       return "pending";
-        case State_Ready:         return "ready";
-        case State_ShuttingDown:  return "shutting down";
-        case State_Shutdown:      return "shutdown";
-      }
-      return "UNDEFINED";
-    }
-    
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudio::RTPReceiverChannelAudio(
-                                                     const make_private &,
-                                                     IMessageQueuePtr queue,
-                                                     UseChannelPtr receiverChannel,
-                                                     UseMediaStreamTrackPtr track,
-                                                     const Parameters &params
-                                                     ) :
-      MessageQueueAssociator(queue),
-      SharedRecursiveLock(SharedRecursiveLock::create()),
-      mReceiverChannel(receiverChannel),
-      mTrack(track),
-      mParameters(make_shared<Parameters>(params))
-    {
-      ZS_LOG_DETAIL(debug("created"))
-
-      ORTC_THROW_INVALID_PARAMETERS_IF(!receiverChannel)
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::init()
-    {
-      AutoRecursiveLock lock(*this);
-
-      mTransport = Transport::create(mThisWeak.lock());
-
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudio::~RTPReceiverChannelAudio()
-    {
-      if (isNoop()) return;
-
-      ZS_LOG_DETAIL(log("destroyed"))
-      mThisWeak.reset();
-
-      cancel();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudioPtr RTPReceiverChannelAudio::convert(ForReceiverChannelFromMediaBasePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelAudio, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudioPtr RTPReceiverChannelAudio::convert(ForRTPReceiverChannelPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelAudio, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudioPtr RTPReceiverChannelAudio::convert(ForMediaStreamTrackFromMediaBasePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelAudio, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudioPtr RTPReceiverChannelAudio::convert(ForMediaStreamTrackPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelAudio, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudioPtr RTPReceiverChannelAudio::convert(ForRTPMediaEnginePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelAudio, object);
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio => IRTPReceiverChannelMediaBaseForRTPReceiverChannel
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::notifyTransportState(ISecureTransportTypes::States state)
-    {
-      IRTPReceiverChannelAudioAsyncDelegateProxy::create(mThisWeak.lock())->onSecureTransportState(state);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::notifyUpdate(ParametersPtr params)
-    {
-      IRTPReceiverChannelAudioAsyncDelegateProxy::create(mThisWeak.lock())->onUpdate(params);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelAudio::handlePacket(RTPPacketPtr packet)
-    {
-      UseChannelResourcePtr channelResource;
-
-      {
-        AutoRecursiveLock lock(*this);
-        if (isShuttingDown() || isShutdown())
-          return false;
-        channelResource = mChannelResource;
-        bool shouldQueue = false;
-        if (!channelResource)
-          shouldQueue = true;
-        if (mQueuedRTP.size() > 0)
-          shouldQueue = true;
-        if (shouldQueue) {
-          mQueuedRTP.push(packet);
-          if (1 == mQueuedRTP.size())
-            IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-          return true;
-        }
-      }
-
-      if (!channelResource) return true;
-      return channelResource->handlePacket(*packet);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelAudio::handlePacket(RTCPPacketPtr packet)
-    {
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        if (mQueuedRTP.size() > 0) {
-          mQueuedRTCP.push(packet);
-          return true;
-        }
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource) return false;
-      return channelResource->handlePacket(*packet);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats)
-    {
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource) {
-        promise->reject();
-        return;
-      }
-      return channelResource->requestStats(promise, stats);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio => IRTPReceiverChannelAudioForRTPReceiverChannel
-    #pragma mark
-    
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudioPtr RTPReceiverChannelAudio::create(
-                                                               RTPReceiverChannelPtr receiverChannel,
-                                                               MediaStreamTrackPtr track,
-                                                               const Parameters &params
-                                                               )
-    {
-      RTPReceiverChannelAudioPtr pThis(make_shared<RTPReceiverChannelAudio>(make_private {}, IORTCForInternal::queueORTC(), receiverChannel, track, params));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    int32_t RTPReceiverChannelAudio::getAudioSamples(
-                                                     const size_t numberOfSamples,
-                                                     const uint8_t numberOfChannels,
-                                                     void *audioSamples,
-                                                     size_t& numberOfSamplesOut
-                                                     )
-    {
-#define TODO_IMPLEMENT_THIS 1
-#define TODO_IMPLEMENT_THIS 2
-      return 0;
-    }
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio => IRTPReceiverChannelAudioForMediaStreamTrack
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio => IRTPReceiverChannelMediaBaseForRTPMediaEngine
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio => IWakeDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::onWake()
-    {
-      ZS_LOG_DEBUG(log("wake"))
-
-      AutoRecursiveLock lock(*this);
-      step();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio => ITimerDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::onTimer(ITimerPtr timer)
-    {
-      ZS_LOG_DEBUG(log("timer") + ZS_PARAM("timer id", timer->getID()))
-
-      AutoRecursiveLock lock(*this);
-#define TODO 1
-#define TODO 2
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio => IPromiseSettledDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::onPromiseSettled(PromisePtr promise)
-    {
-      ZS_LOG_DEBUG(log("promise settled") + ZS_PARAM("promise", promise->getID()))
-
-      AutoRecursiveLock lock(*this);
-      step();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio => IRTPReceiverChannelAudioAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::onReceiverChannelAudioDeliverPackets()
-    {
-      RTPPacketQueue rtpPackets;
-      RTCPPacketQueue rtcpPackets;
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        rtpPackets = mQueuedRTP;
-        rtcpPackets = mQueuedRTCP;
-        mQueuedRTP = RTPPacketQueue();
-        mQueuedRTCP = RTCPPacketQueue();
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource)
-        return;
-
-      while (rtpPackets.size() > 0) {
-        auto packet = rtpPackets.front();
-        channelResource->handlePacket(*packet);
-        rtpPackets.pop();
-      }
-
-      while (rtcpPackets.size() > 0) {
-        auto packet = rtcpPackets.front();
-        channelResource->handlePacket(*packet);
-        rtcpPackets.pop();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::onSecureTransportState(ISecureTransport::States state)
-    {
-      ZS_LOG_TRACE(log("notified secure transport state") + ZS_PARAM("state", ISecureTransport::toString(state)))
-
-      AutoRecursiveLock lock(*this);
-
-      mTransportState = state;
-
-      if (mChannelResource)
-        mChannelResource->notifyTransportState(state);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::onUpdate(ParametersPtr params)
-    {
-      ZS_LOG_TRACE(log("on update") + params->toDebug())
-
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        mParameters = make_shared<Parameters>(*params);
-        channelResource = mChannelResource;
-      }
-
-      if (channelResource)
-        channelResource->notifyUpdate(params);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio => friend Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelAudio::SendRtcp(const uint8_t* packet, size_t length)
-    {
-      auto channel = mReceiverChannel.lock();
-      if (!channel) return false;
-      return channel->sendPacket(RTCPPacket::create(packet, length));
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio::Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudio::Transport::Transport(
-                                                  const make_private &,
-                                                  RTPReceiverChannelAudioPtr outer
-                                                  ) :
-      mOuter(outer)
-    {
-    }
-        
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudio::Transport::~Transport()
-    {
-      mThisWeak.reset();
-    }
-    
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::Transport::init()
-    {
-    }
-    
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudio::TransportPtr RTPReceiverChannelAudio::Transport::create(RTPReceiverChannelAudioPtr outer)
-    {
-      TransportPtr pThis(make_shared<Transport>(make_private{}, outer));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio::Transport => webrtc::Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelAudio::Transport::SendRtp(
-                                                     const uint8_t* packet,
-                                                     size_t length,
-                                                     const webrtc::PacketOptions& options
-                                                     )
-    {
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelAudio::Transport::SendRtcp(const uint8_t* packet, size_t length)
-    {
-      auto outer = mOuter.lock();
-      if (!outer) return false;
-      return outer->SendRtcp(packet, length);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio => (internal)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPReceiverChannelAudio::log(const char *message) const
-    {
-      ElementPtr objectEl = Element::create("ortc::RTPReceiverChannelAudio");
-      IHelper::debugAppend(objectEl, "id", mID);
-      return Log::Params(message, objectEl);
-    }
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPReceiverChannelAudio::debug(const char *message) const
-    {
-      return Log::Params(message, toDebug());
-    }
-
-    //-------------------------------------------------------------------------
-    ElementPtr RTPReceiverChannelAudio::toDebug() const
-    {
-      AutoRecursiveLock lock(*this);
-
-      ElementPtr resultEl = Element::create("ortc::RTPReceiverChannelAudio");
-
-      IHelper::debugAppend(resultEl, "id", mID);
-
-      IHelper::debugAppend(resultEl, "graceful shutdown", (bool)mGracefulShutdownReference);
-
-      IHelper::debugAppend(resultEl, "state", toString(mCurrentState));
-
-      IHelper::debugAppend(resultEl, "error", mLastError);
-      IHelper::debugAppend(resultEl, "error reason", mLastErrorReason);
-
-      auto receiverChannel = mReceiverChannel.lock();
-      IHelper::debugAppend(resultEl, "receiver channel", receiverChannel ? receiverChannel->getID() : 0);
-
-      return resultEl;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelAudio::isShuttingDown() const
-    {
-      return State_ShuttingDown == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelAudio::isShutdown() const
-    {
-      return State_Shutdown == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::step()
-    {
-      ZS_LOG_DEBUG(debug("step"))
-
-      if ((isShuttingDown()) ||
-          (isShutdown())) {
-        ZS_LOG_DEBUG(debug("step forwarding to cancel"))
-        cancel();
-        return;
-      }
-
-      // ... other steps here ...
-      if (!stepChannelPromise()) goto not_ready;
-      if (!stepSetupChannel()) goto not_ready;
-      // ... other steps here ...
-
-      goto ready;
-
-    not_ready:
-      {
-        ZS_LOG_TRACE(debug("not ready"))
-        return;
-      }
-
-    ready:
-      {
-        ZS_LOG_TRACE(log("ready"))
-        setState(State_Ready);
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelAudio::stepChannelPromise()
-    {
-      if (mChannelResourceLifetimeHolderPromise) {
-        ZS_LOG_TRACE(log("already setup channel promise"))
-          return true;
-      }
-
-      if (mQueuedRTP.size() < 1) {
-        ZS_LOG_TRACE(log("cannot setup channel promise until first packet is received"))
-          return false;
-      }
-
-      auto packet = mQueuedRTP.front();
-
-      mChannelResourceLifetimeHolderPromise = UseMediaEngine::setupChannel(
-                                                                           mThisWeak.lock(),
-                                                                           mTransport,
-                                                                           MediaStreamTrack::convert(mTrack),
-                                                                           mParameters,
-                                                                           packet
-                                                                           );
-
-      mChannelResourceLifetimeHolderPromise->thenWeak(mThisWeak.lock());
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelAudio::stepSetupChannel()
-    {
-      if (mChannelResource) {
-        ZS_LOG_TRACE(log("already setup channel resource"))
-        return true;
-      }
-
-      if (!mChannelResourceLifetimeHolderPromise->isSettled()) {
-        ZS_LOG_TRACE(log("waiting for setup channel promise to be set up"))
-        return false;
-      }
-
-      if (mChannelResourceLifetimeHolderPromise->isRejected()) {
-        ZS_LOG_WARNING(Debug, log("media engine rejected channel setup"))
-        cancel();
-        return false;
-      }
-
-      mChannelResource = ZS_DYNAMIC_PTR_CAST(UseChannelResource, mChannelResourceLifetimeHolderPromise->value());
-
-      if (!mChannelResource) {
-        ZS_LOG_WARNING(Detail, log("failed to initialize channel resource"))
-        cancel();
-        return false;
-      }
-
-      ZS_LOG_DEBUG(log("media channel is setup") + ZS_PARAM("channel", mChannelResource->getID()))
-
-      IRTPReceiverChannelAudioAsyncDelegateProxy::create(mThisWeak.lock())->onReceiverChannelAudioDeliverPackets();
-
-      mChannelResource->notifyTransportState(mTransportState);
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::cancel()
-    {
-      //.......................................................................
-      // try to gracefully shutdown
-
-      if (isShutdown()) return;
-
-      setState(State_ShuttingDown);
-
-      mQueuedRTP = RTPPacketQueue();
-      mQueuedRTCP = RTCPPacketQueue();
-
-      if (!mGracefulShutdownReference) mGracefulShutdownReference = mThisWeak.lock();
-
-      if (!mCloseChannelPromise) {
-        if (mChannelResource) {
-          mCloseChannelPromise = mChannelResource->shutdown();
-          mCloseChannelPromise->thenWeak(mGracefulShutdownReference);
-        }
-      }
-
-      if (mGracefulShutdownReference) {
-        if (mCloseChannelPromise) {
-          if (!mCloseChannelPromise->isSettled()) {
-            ZS_LOG_DEBUG(log("waiting for close channel promise"))
-            return;
-          }
-        }
-      }
-
-      //.......................................................................
-      // final cleanup
-
-      setState(State_Shutdown);
-
-      mChannelResourceLifetimeHolderPromise.reset();
-
-      mChannelResource.reset();
-      mCloseChannelPromise.reset();
-
-      // make sure to cleanup any final reference to self
-      mGracefulShutdownReference.reset();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::setState(States state)
-    {
-      if (state == mCurrentState) return;
-
-      ZS_LOG_DETAIL(debug("state changed") + ZS_PARAM("new state", toString(state)) + ZS_PARAM("old state", toString(mCurrentState)))
-
-      mCurrentState = state;
-
-//      RTPReceiverChannelAudioPtr pThis = mThisWeak.lock();
-//      if (pThis) {
-//        mSubscriptions.delegate()->onRTPReceiverChannelAudioStateChanged(pThis, mCurrentState);
-//      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelAudio::setError(WORD errorCode, const char *inReason)
-    {
-      String reason(inReason);
-      if (reason.isEmpty()) {
-        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
-      }
-
-      if (0 != mLastError) {
-        ZS_LOG_WARNING(Detail, debug("error already set thus ignoring new error") + ZS_PARAM("new error", errorCode) + ZS_PARAM("new reason", reason))
-        return;
-      }
-
-      mLastError = errorCode;
-      mLastErrorReason = reason;
-
-      ZS_LOG_WARNING(Detail, debug("error set") + ZS_PARAM("error", mLastError) + ZS_PARAM("reason", mLastErrorReason))
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelAudioFactory
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    IRTPReceiverChannelAudioFactory &IRTPReceiverChannelAudioFactory::singleton()
-    {
-      return RTPReceiverChannelAudioFactory::singleton();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelAudioPtr IRTPReceiverChannelAudioFactory::create(
-                                                                       RTPReceiverChannelPtr receiverChannel,
-                                                                       MediaStreamTrackPtr track,
-                                                                       const Parameters &params
-                                                                       )
-    {
-      if (this) {}
-      return internal::RTPReceiverChannelAudio::create(receiverChannel, track, params);
-    }
-
-  } // internal namespace
-}
diff --git a/ortc/cpp/ortc_RTPReceiverChannelVideo.cpp b/ortc/cpp/ortc_RTPReceiverChannelVideo.cpp
deleted file mode 100644
index a6db2a14..00000000
--- a/ortc/cpp/ortc_RTPReceiverChannelVideo.cpp
+++ /dev/null
@@ -1,828 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
-#include <ortc/internal/ortc_RTPReceiverChannel.h>
-#include <ortc/internal/ortc_MediaStreamTrack.h>
-#include <ortc/internal/ortc_RTPPacket.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
-#include <ortc/internal/ortc_Helper.h>
-#include <ortc/internal/ortc_ORTC.h>
-#include <ortc/internal/platform.h>
-
-#include <ortc/IHelper.h>
-#include <ortc/services/IHTTP.h>
-
-#include <zsLib/ISettings.h>
-#include <zsLib/Stringize.h>
-#include <zsLib/Log.h>
-#include <zsLib/XML.h>
-
-#include <cryptopp/sha.h>
-
-#ifdef _DEBUG
-#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
-#else
-#define ASSERT(x)
-#endif //_DEBUG
-
-
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpreceiver) }
-
-namespace ortc
-{
-  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
-
-  namespace internal
-  {
-    ZS_DECLARE_CLASS_PTR(RTPReceiverChannelVideoSettingsDefaults);
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark (helpers)
-    #pragma mark
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark DTMFSenderSettingsDefaults
-    #pragma mark
-
-    class RTPReceiverChannelVideoSettingsDefaults : public ISettingsApplyDefaultsDelegate
-    {
-    public:
-      //-----------------------------------------------------------------------
-      ~RTPReceiverChannelVideoSettingsDefaults()
-      {
-        ISettings::removeDefaults(*this);
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPReceiverChannelVideoSettingsDefaultsPtr singleton()
-      {
-        static SingletonLazySharedPtr<RTPReceiverChannelVideoSettingsDefaults> singleton(create());
-        return singleton.singleton();
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPReceiverChannelVideoSettingsDefaultsPtr create()
-      {
-        auto pThis(make_shared<RTPReceiverChannelVideoSettingsDefaults>());
-        ISettings::installDefaults(pThis);
-        return pThis;
-      }
-
-      //-----------------------------------------------------------------------
-      virtual void notifySettingsApplyDefaults() override
-      {
-      }
-      
-    };
-
-    //-------------------------------------------------------------------------
-    void installRTPReceiverChannelVideoSettingsDefaults()
-    {
-      RTPReceiverChannelVideoSettingsDefaults::singleton();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelVideoForRTPReceiverChannel
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    ElementPtr IRTPReceiverChannelVideoForRTPReceiverChannel::toDebug(ForRTPReceiverChannelPtr object)
-    {
-      if (!object) return ElementPtr();
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelVideo, object)->toDebug();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideoPtr IRTPReceiverChannelVideoForRTPReceiverChannel::create(
-                                                                                     RTPReceiverChannelPtr receiverChannel,
-                                                                                     MediaStreamTrackPtr track,
-                                                                                     const Parameters &params
-                                                                                     )
-    {
-      return internal::IRTPReceiverChannelVideoFactory::singleton().create(receiverChannel, track, params);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelVideoForMediaStreamTrack
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    ElementPtr IRTPReceiverChannelVideoForMediaStreamTrack::toDebug(ForMediaStreamTrackPtr object)
-    {
-      if (!object) return ElementPtr();
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelVideo, object)->toDebug();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo
-    #pragma mark
-    
-    //---------------------------------------------------------------------------
-    const char *RTPReceiverChannelVideo::toString(States state)
-    {
-      switch (state) {
-        case State_Pending:       return "pending";
-        case State_Ready:         return "ready";
-        case State_ShuttingDown:  return "shutting down";
-        case State_Shutdown:      return "shutdown";
-      }
-      return "UNDEFINED";
-    }
-    
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideo::RTPReceiverChannelVideo(
-                                                     const make_private &,
-                                                     IMessageQueuePtr queue,
-                                                     UseChannelPtr receiverChannel,
-                                                     UseMediaStreamTrackPtr track,
-                                                     const Parameters &params
-                                                     ) :
-      MessageQueueAssociator(queue),
-      SharedRecursiveLock(SharedRecursiveLock::create()),
-      mReceiverChannel(receiverChannel),
-      mTrack(track),
-      mParameters(make_shared<Parameters>(params))
-    {
-      ZS_LOG_DETAIL(debug("created"))
-
-      ORTC_THROW_INVALID_PARAMETERS_IF(!receiverChannel)
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::init()
-    {
-      AutoRecursiveLock lock(*this);
-
-      mTransport = Transport::create(mThisWeak.lock());
-
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideo::~RTPReceiverChannelVideo()
-    {
-      if (isNoop()) return;
-
-      ZS_LOG_DETAIL(log("destroyed"))
-      mThisWeak.reset();
-
-      cancel();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideoPtr RTPReceiverChannelVideo::convert(ForSettingsPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelVideo, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideoPtr RTPReceiverChannelVideo::convert(ForReceiverChannelFromMediaBasePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelVideo, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideoPtr RTPReceiverChannelVideo::convert(ForRTPReceiverChannelPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelVideo, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideoPtr RTPReceiverChannelVideo::convert(ForMediaStreamTrackFromMediaBasePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelVideo, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideoPtr RTPReceiverChannelVideo::convert(ForMediaStreamTrackPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelVideo, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideoPtr RTPReceiverChannelVideo::convert(ForRTPMediaEnginePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPReceiverChannelVideo, object);
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo => IRTPReceiverChannelMediaBaseForRTPReceiverChannel
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::notifyTransportState(ISecureTransportTypes::States state)
-    {
-      IRTPReceiverChannelVideoAsyncDelegateProxy::create(mThisWeak.lock())->onSecureTransportState(state);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::notifyUpdate(ParametersPtr params)
-    {
-      IRTPReceiverChannelVideoAsyncDelegateProxy::create(mThisWeak.lock())->onUpdate(params);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelVideo::handlePacket(RTPPacketPtr packet)
-    {
-      UseChannelResourcePtr channelResource;
-
-      {
-        AutoRecursiveLock lock(*this);
-        if (isShuttingDown() || isShutdown())
-          return false;
-        channelResource = mChannelResource;
-        bool shouldQueue = false;
-        if (!channelResource)
-          shouldQueue = true;
-        if (mQueuedRTP.size() > 0)
-          shouldQueue = true;
-        if (shouldQueue) {
-          mQueuedRTP.push(packet);
-          if (1 == mQueuedRTP.size())
-            IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-          return true;
-        }
-      }
-
-      if (!channelResource) return false;
-      return channelResource->handlePacket(*packet);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelVideo::handlePacket(RTCPPacketPtr packet)
-    {
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        if (mQueuedRTP.size() > 0) {
-          mQueuedRTCP.push(packet);
-          return true;
-        }
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource) return false;
-      return channelResource->handlePacket(*packet);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats)
-    {
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource) {
-        promise->reject();
-        return;
-      }
-      return channelResource->requestStats(promise, stats);
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo => IRTPReceiverChannelVideoForRTPReceiverChannel
-    #pragma mark
-    
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideoPtr RTPReceiverChannelVideo::create(
-                                                               RTPReceiverChannelPtr receiverChannel,
-                                                               MediaStreamTrackPtr track,
-                                                               const Parameters &params
-                                                               )
-    {
-      RTPReceiverChannelVideoPtr pThis(make_shared<RTPReceiverChannelVideo>(make_private {}, IORTCForInternal::queueORTC(), receiverChannel, track, params));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo => IRTPReceiverChannelMediaBaseForRTPMediaEngine
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo => IWakeDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::onWake()
-    {
-      ZS_LOG_DEBUG(log("wake"))
-
-      AutoRecursiveLock lock(*this);
-      step();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo => ITimerDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::onTimer(ITimerPtr timer)
-    {
-      ZS_LOG_DEBUG(log("timer") + ZS_PARAM("timer id", timer->getID()))
-
-      AutoRecursiveLock lock(*this);
-#define TODO 1
-#define TODO 2
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo => IPromiseSettledDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::onPromiseSettled(PromisePtr promise)
-    {
-      ZS_LOG_DEBUG(log("promise settled") + ZS_PARAM("promise", promise->getID()))
-
-      AutoRecursiveLock lock(*this);
-      step();
-
-      if (ZS_DYNAMIC_PTR_CAST(PromiseWithRTPMediaEngineChannelResource, promise)) {
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo => IRTPReceiverChannelVideoAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::onReceiverChannelVideoDeliverPackets()
-    {
-      RTPPacketQueue rtpPackets;
-      RTCPPacketQueue rtcpPackets;
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        rtpPackets = mQueuedRTP;
-        rtcpPackets = mQueuedRTCP;
-        mQueuedRTP = RTPPacketQueue();
-        mQueuedRTCP = RTCPPacketQueue();
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource)
-        return;
-
-      while (rtpPackets.size() > 0) {
-        auto packet = rtpPackets.front();
-        channelResource->handlePacket(*packet);
-        rtpPackets.pop();
-      }
-
-      while (rtcpPackets.size() > 0) {
-        auto packet = rtcpPackets.front();
-        channelResource->handlePacket(*packet);
-        rtcpPackets.pop();
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::onSecureTransportState(ISecureTransport::States state)
-    {
-      ZS_LOG_TRACE(log("notified secure transport state") + ZS_PARAM("state", ISecureTransport::toString(state)))
-
-      AutoRecursiveLock lock(*this);
-
-      mTransportState = state;
-
-      if (mChannelResource)
-        mChannelResource->notifyTransportState(state);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::onUpdate(ParametersPtr params)
-    {
-      ZS_LOG_TRACE(log("on update") + params->toDebug())
-
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        mParameters = make_shared<Parameters>(*params);
-        channelResource = mChannelResource;
-      }
-
-      if (channelResource)
-        channelResource->notifyUpdate(params);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo => friend Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelVideo::SendRtcp(const uint8_t* packet, size_t length)
-    {
-      auto channel = mReceiverChannel.lock();
-      if (!channel) return false;
-      return channel->sendPacket(RTCPPacket::create(packet, length));
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo::Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideo::Transport::Transport(
-                                                  const make_private &,
-                                                  RTPReceiverChannelVideoPtr outer
-                                                  ) :
-      mOuter(outer)
-    {
-    }
-        
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideo::Transport::~Transport()
-    {
-      mThisWeak.reset();
-    }
-    
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::Transport::init()
-    {
-    }
-    
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideo::TransportPtr RTPReceiverChannelVideo::Transport::create(RTPReceiverChannelVideoPtr outer)
-    {
-      TransportPtr pThis(make_shared<Transport>(make_private{}, outer));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo::Transport => webrtc::Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelVideo::Transport::SendRtp(
-                                                     const uint8_t* packet,
-                                                     size_t length,
-                                                     const webrtc::PacketOptions& options
-                                                     )
-    {
-      return true;
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelVideo::Transport::SendRtcp(const uint8_t* packet, size_t length)
-    {
-      auto outer = mOuter.lock();
-      if (!outer) return false;
-      return outer->SendRtcp(packet, length);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo => (internal)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPReceiverChannelVideo::log(const char *message) const
-    {
-      ElementPtr objectEl = Element::create("ortc::RTPReceiverChannelVideo");
-      IHelper::debugAppend(objectEl, "id", mID);
-      return Log::Params(message, objectEl);
-    }
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPReceiverChannelVideo::debug(const char *message) const
-    {
-      return Log::Params(message, toDebug());
-    }
-
-    //-------------------------------------------------------------------------
-    ElementPtr RTPReceiverChannelVideo::toDebug() const
-    {
-      AutoRecursiveLock lock(*this);
-
-      ElementPtr resultEl = Element::create("ortc::RTPReceiverChannelVideo");
-
-      IHelper::debugAppend(resultEl, "id", mID);
-
-      IHelper::debugAppend(resultEl, "graceful shutdown", (bool)mGracefulShutdownReference);
-
-      IHelper::debugAppend(resultEl, "state", toString(mCurrentState));
-
-      IHelper::debugAppend(resultEl, "error", mLastError);
-      IHelper::debugAppend(resultEl, "error reason", mLastErrorReason);
-
-      auto receiverChannel = mReceiverChannel.lock();
-      IHelper::debugAppend(resultEl, "receiver channel", receiverChannel ? receiverChannel->getID() : 0);
-
-      return resultEl;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelVideo::isShuttingDown() const
-    {
-      return State_ShuttingDown == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelVideo::isShutdown() const
-    {
-      return State_Shutdown == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::step()
-    {
-      ZS_LOG_DEBUG(debug("step"))
-
-      if ((isShuttingDown()) ||
-          (isShutdown())) {
-        ZS_LOG_DEBUG(debug("step forwarding to cancel"))
-        cancel();
-        return;
-      }
-
-      // ... other steps here ...
-      if (!stepChannelPromise()) goto not_ready;
-      if (!stepSetupChannel()) goto not_ready;
-      // ... other steps here ...
-
-      goto ready;
-
-    not_ready:
-      {
-        ZS_LOG_TRACE(debug("not ready"))
-        return;
-      }
-
-    ready:
-      {
-        ZS_LOG_TRACE(log("ready"))
-        setState(State_Ready);
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelVideo::stepChannelPromise()
-    {
-      if (mChannelResourceLifetimeHolderPromise) {
-        ZS_LOG_TRACE(log("already setup channel promise"))
-        return true;
-      }
-
-      if (mQueuedRTP.size() < 1) {
-        ZS_LOG_TRACE(log("cannot setup channel promise until first packet is received"))
-        return false;
-      }
-
-      auto packet = mQueuedRTP.front();
-
-      mChannelResourceLifetimeHolderPromise = UseMediaEngine::setupChannel(
-                                                          mThisWeak.lock(),
-                                                          mTransport,
-                                                          MediaStreamTrack::convert(mTrack),
-                                                          mParameters,
-                                                          packet
-                                                          );
-
-      mChannelResourceLifetimeHolderPromise->thenWeak(mThisWeak.lock());
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPReceiverChannelVideo::stepSetupChannel()
-    {
-      if (mChannelResource) {
-        ZS_LOG_TRACE(log("already setup channel resource"))
-        return true;
-      }
-
-      if (!mChannelResourceLifetimeHolderPromise->isSettled()) {
-        ZS_LOG_TRACE(log("waiting for setup channel promise to be set up"))
-        return false;
-      }
-
-      if (mChannelResourceLifetimeHolderPromise->isRejected()) {
-        ZS_LOG_WARNING(Debug, log("media engine rejected channel setup"))
-        cancel();
-        return false;
-      }
-
-      mChannelResource = ZS_DYNAMIC_PTR_CAST(UseChannelResource, mChannelResourceLifetimeHolderPromise->value());
-
-      if (!mChannelResource) {
-        ZS_LOG_WARNING(Detail, log("failed to initialize channel resource"))
-        cancel();
-        return false;
-      }
-
-      ZS_LOG_DEBUG(log("media channel is setup") + ZS_PARAM("channel", mChannelResource->getID()))
-
-      IRTPReceiverChannelVideoAsyncDelegateProxy::create(mThisWeak.lock())->onReceiverChannelVideoDeliverPackets();
-
-      mChannelResource->notifyTransportState(mTransportState);
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::cancel()
-    {
-      //.......................................................................
-      // try to gracefully shutdown
-
-      if (isShutdown()) return;
-
-      setState(State_ShuttingDown);
-
-      mQueuedRTP = RTPPacketQueue();
-      mQueuedRTCP = RTCPPacketQueue();
-
-      if (!mGracefulShutdownReference) mGracefulShutdownReference = mThisWeak.lock();
-
-      if (!mCloseChannelPromise) {
-        if (mChannelResource) {
-          mCloseChannelPromise = mChannelResource->shutdown();
-          mCloseChannelPromise->thenWeak(mGracefulShutdownReference);
-        }
-      }
-
-      if (mGracefulShutdownReference) {
-        if (mCloseChannelPromise) {
-          if (!mCloseChannelPromise->isSettled()) {
-            ZS_LOG_DEBUG(log("waiting for close channel promise"))
-            return;
-          }
-        }
-      }
-
-      //.......................................................................
-      // final cleanup
-
-      setState(State_Shutdown);
-
-      mChannelResourceLifetimeHolderPromise.reset();
-
-      mChannelResource.reset();
-      mCloseChannelPromise.reset();
-
-      // make sure to cleanup any final reference to self
-      mGracefulShutdownReference.reset();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::setState(States state)
-    {
-      if (state == mCurrentState) return;
-
-      ZS_LOG_DETAIL(debug("state changed") + ZS_PARAM("new state", toString(state)) + ZS_PARAM("old state", toString(mCurrentState)))
-
-      mCurrentState = state;
-
-//      RTPReceiverChannelVideoPtr pThis = mThisWeak.lock();
-//      if (pThis) {
-//        mSubscriptions.delegate()->onRTPReceiverChannelVideoStateChanged(pThis, mCurrentState);
-//      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPReceiverChannelVideo::setError(WORD errorCode, const char *inReason)
-    {
-      String reason(inReason);
-      if (reason.isEmpty()) {
-        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
-      }
-
-      if (0 != mLastError) {
-        ZS_LOG_WARNING(Detail, debug("error already set thus ignoring new error") + ZS_PARAM("new error", errorCode) + ZS_PARAM("new reason", reason))
-        return;
-      }
-
-      mLastError = errorCode;
-      mLastErrorReason = reason;
-
-      ZS_LOG_WARNING(Detail, debug("error set") + ZS_PARAM("error", mLastError) + ZS_PARAM("reason", mLastErrorReason))
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelVideoFactory
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    IRTPReceiverChannelVideoFactory &IRTPReceiverChannelVideoFactory::singleton()
-    {
-      return RTPReceiverChannelVideoFactory::singleton();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPReceiverChannelVideoPtr IRTPReceiverChannelVideoFactory::create(
-                                                                       RTPReceiverChannelPtr receiverChannel,
-                                                                       MediaStreamTrackPtr track,
-                                                                       const Parameters &params
-                                                                       )
-    {
-      if (this) {}
-      return internal::RTPReceiverChannelVideo::create(receiverChannel, track, params);
-    }
-
-  } // internal namespace
-}
diff --git a/ortc/cpp/ortc_RTPSender.cpp b/ortc/cpp/ortc_RTPSender.cpp
index 69fe6533..196021c3 100644
--- a/ortc/cpp/ortc_RTPSender.cpp
+++ b/ortc/cpp/ortc_RTPSender.cpp
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_RTPSender.h>
 #include <ortc/internal/ortc_RTPSenderChannel.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
@@ -36,8 +38,6 @@
 #include <ortc/internal/ortc_RTPListener.h>
 #include <ortc/internal/ortc_MediaStreamTrack.h>
 #include <ortc/internal/ortc_SRTPSDESTransport.h>
-#include <ortc/internal/ortc_RTPPacket.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
 #include <ortc/internal/ortc_RTPTypes.h>
 #include <ortc/internal/ortc_ORTC.h>
 #include <ortc/internal/ortc_StatsReport.h>
@@ -46,6 +46,8 @@
 
 #include <ortc/IRTPReceiver.h>
 #include <ortc/IHelper.h>
+#include <ortc/RTPPacket.h>
+#include <ortc/RTCPPacket.h>
 
 #include <ortc/services/IHTTP.h>
 
@@ -70,7 +72,7 @@
 #endif //_DEBUG
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpsender) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_rtp_sender) }
 
 namespace ortc
 {
@@ -230,8 +232,6 @@ namespace ortc
     {
       notify(ISecureTransport::State_Closed);
 
-      ASSERT((bool)mChannel)
-
       auto outer = mHolder.lock();
       if (outer) {
         outer->notifyChannelGone();
@@ -345,14 +345,16 @@ namespace ortc
                          const make_private &,
                          IMessageQueuePtr queue,
                          IRTPSenderDelegatePtr delegate,
-                         IMediaStreamTrackPtr track,
+                         ortc::IMediaStreamTrackPtr track,
                          IRTPTransportPtr transport,
                          IRTCPTransportPtr rtcpTransport
                          ) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
-      mChannels(make_shared<ParametersToChannelHolderMap>()),
-      mTrack(MediaStreamTrack::convert(track))
+      mSubscriptions(decltype(mSubscriptions)::create()),
+      mDTMFSubscriptions(decltype(mDTMFSubscriptions)::create()),
+      mTrack(MediaStreamTrack::convert(track)),
+      mChannels(make_shared<ParametersToChannelHolderMap>())
     {
       ZS_LOG_DETAIL(debug("created"))
 
@@ -453,7 +455,6 @@ namespace ortc
         channels = mChannels; // obtain pointer to COW list while inside a lock
       }
 
-      bool result = false;
       for (auto iter = channels->begin(); iter != channels->end(); ++iter)
       {
         auto channel = (*iter).second;
@@ -484,7 +485,7 @@ namespace ortc
     //-------------------------------------------------------------------------
     RTPSenderPtr RTPSender::create(
                                    IRTPSenderDelegatePtr delegate,
-                                   IMediaStreamTrackPtr track,
+                                   ortc::IMediaStreamTrackPtr track,
                                    IRTPTransportPtr transport,
                                    IRTCPTransportPtr rtcpTransport
                                    )
@@ -527,7 +528,7 @@ namespace ortc
     }
 
     //-------------------------------------------------------------------------
-    IMediaStreamTrackPtr RTPSender::track() const
+    ortc::IMediaStreamTrackPtr RTPSender::track() const
     {
       AutoRecursiveLock lock(*this);
       return MediaStreamTrack::convert(mTrack);
@@ -634,7 +635,7 @@ namespace ortc
     }
 
     //-------------------------------------------------------------------------
-    PromisePtr RTPSender::setTrack(IMediaStreamTrackPtr inTrack)
+    PromisePtr RTPSender::setTrack(ortc::IMediaStreamTrackPtr inTrack)
     {
       UseMediaStreamTrackPtr track = MediaStreamTrack::convert(inTrack);
 
@@ -677,7 +678,9 @@ namespace ortc
                           puid, trackId, mTrack->getID(),
                           puid, channelId, channel->getID()
                           );
+#if 0
             mTrack->notifyDetachSenderChannel(RTPSenderChannel::convert(channel->mChannel));
+#endif //0
           }
         }
 
@@ -692,7 +695,9 @@ namespace ortc
                           puid, trackId, mTrack->getID(),
                           puid, channelId, channel->getID()
                           );
+#if 0
             mTrack->notifyAttachSenderChannel(RTPSenderChannel::convert(channel->mChannel));
+#endif //0
           }
         }
 
@@ -877,7 +882,8 @@ namespace ortc
                     size, size, packet->buffer()->SizeInBytes()
                     );
 
-      ZS_LOG_TRACE(log("received packet") + ZS_PARAM("via", IICETypes::toString(viaTransport)) + packet->toDebug())
+      ZS_LOG_TRACE(log("received packet") + ZS_PARAM("via", IICETypes::toString(viaTransport)))
+      ZS_EVENTING_TRACE_OBJECT(Insane, *packet, "rtp sender received packet");
 
       ParametersToChannelHolderMapPtr channels;
 
@@ -1051,7 +1057,7 @@ namespace ortc
     #pragma mark
 
     //-------------------------------------------------------------------------
-    IDTMFSenderSubscriptionPtr RTPSender::subscribeDTMF(IDTMFSenderDelegatePtr originalDelegate)
+    IDTMFSenderSubscriptionPtr RTPSender::subscribe(IDTMFSenderDelegatePtr originalDelegate)
     {
       ZS_LOG_DETAIL(log("subscribing to dtmf"));
 
@@ -1330,7 +1336,9 @@ namespace ortc
                         puid, trackId, mTrack->getID(),
                         puid, channelId, existingChannel->getID()
                         );
+#if 0
           mTrack->notifyDetachSenderChannel(RTPSenderChannel::convert(existingChannel->mChannel));
+#endif //0
         }
 
         replacementChannels->erase(current);
@@ -1560,8 +1568,9 @@ namespace ortc
                       puid, trackId, mTrack->getID(),
                       puid, channelId, channel->getID()
                       );
-
+#if 0
         mTrack->notifyAttachSenderChannel(RTPSenderChannel::convert(channel->mChannel));
+#endif //0
       }
       ZS_EVENTING_2(
                     x, i, Debug, RtpSenderAddChannel, ol, RtpSender, Info,
@@ -1602,7 +1611,9 @@ namespace ortc
                       puid, trackId, mTrack->getID(),
                       puid, channelId, channel->getID()
                       );
+#if 0
         mTrack->notifyDetachSenderChannel(RTPSenderChannel::convert(channel->mChannel));
+#endif //0
       }
     }
 
@@ -1667,7 +1678,7 @@ namespace ortc
     //-------------------------------------------------------------------------
     RTPSenderPtr IRTPSenderFactory::create(
                                            IRTPSenderDelegatePtr delegate,
-                                           IMediaStreamTrackPtr track,
+                                           ortc::IMediaStreamTrackPtr track,
                                            IRTPTransportPtr transport,
                                            IRTCPTransportPtr rtcpTransport
                                            )
@@ -1718,7 +1729,7 @@ namespace ortc
   //---------------------------------------------------------------------------
   IRTPSenderPtr IRTPSender::create(
                                    IRTPSenderDelegatePtr delegate,
-                                   IMediaStreamTrackPtr track,
+                                   ortc::IMediaStreamTrackPtr track,
                                    IRTPTransportPtr transport,
                                    IRTCPTransportPtr rtcpTransport
                                    )
diff --git a/ortc/cpp/ortc_RTPSenderChannel.cpp b/ortc/cpp/ortc_RTPSenderChannel.cpp
index b8303af0..d8bc1f6c 100644
--- a/ortc/cpp/ortc_RTPSenderChannel.cpp
+++ b/ortc/cpp/ortc_RTPSenderChannel.cpp
@@ -30,22 +30,20 @@
  */
 
 #include <ortc/internal/ortc_RTPSenderChannel.h>
-#include <ortc/internal/ortc_RTPSenderChannelMediaBase.h>
-#include <ortc/internal/ortc_RTPSenderChannelAudio.h>
-#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
 #include <ortc/internal/ortc_RTPSender.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
 #include <ortc/internal/ortc_ISecureTransport.h>
 #include <ortc/internal/ortc_RTPListener.h>
 #include <ortc/internal/ortc_MediaStreamTrack.h>
-#include <ortc/internal/ortc_RTPPacket.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
 #include <ortc/internal/ortc_RTPTypes.h>
 #include <ortc/internal/ortc_ORTC.h>
 #include <ortc/internal/ortc.events.h>
 #include <ortc/internal/platform.h>
 
 #include <ortc/IHelper.h>
+#include <ortc/RTPPacket.h>
+#include <ortc/RTCPPacket.h>
+
 #include <ortc/services/IHTTP.h>
 
 #include <zsLib/eventing/IHasher.h>
@@ -65,8 +63,7 @@
 #define ASSERT(x)
 #endif //_DEBUG
 
-
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpsender) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_rtp_sender) }
 
 namespace ortc
 {
@@ -205,10 +202,10 @@ namespace ortc
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
       mSender(sender),
-      mTrack(track),
       mParameters(make_shared<Parameters>(params)),
       mRetagAfterInSeconds(Seconds(ISettings::getUInt(ORTC_SETTING_RTP_SENDER_CHANNEL_RETAG_RTP_PACKETS_AFTER_SSRC_NOT_SENT_IN_SECONDS))),
-      mTagSDES(ISettings::getBool(ORTC_SETTING_RTP_SENDER_CHANNEL_TAG_MID_RID_IN_RTCP_SDES))
+      mTagSDES(ISettings::getBool(ORTC_SETTING_RTP_SENDER_CHANNEL_TAG_MID_RID_IN_RTCP_SDES)),
+      mTrack(track)
     {
       ZS_LOG_DETAIL(debug("created"))
 
@@ -238,15 +235,11 @@ namespace ortc
         switch (kind.value()) {
           case IMediaStreamTrackTypes::Kind_Audio:
           {
-            mAudio = UseAudio::create(mThisWeak.lock(), MediaStreamTrack::convert(mTrack), *mParameters);
-            mMediaBase = mAudio;
             found = true;
             break;
           }
           case IMediaStreamTrackTypes::Kind_Video:
           {
-            mVideo = UseVideo::create(mThisWeak.lock(), MediaStreamTrack::convert(mTrack), *mParameters);
-            mMediaBase = mVideo;
             found = true;
             break;
           }
@@ -255,10 +248,9 @@ namespace ortc
 
       ORTC_THROW_INVALID_PARAMETERS_IF(!found);
 
-      ZS_EVENTING_3(
+      ZS_EVENTING_2(
                     x, i, Detail, RtpSenderChannelCreateMediaChannel, ol, RtpSender, Info,
                     puid, id, mID,
-                    puid, mediaBaseId, mMediaBase->getID(),
                     string, kind, IMediaStreamTrack::toString(kind.value())
                     );
 
@@ -340,10 +332,9 @@ namespace ortc
     void RTPSenderChannel::notifyTrackChanged(MediaStreamTrackPtr inTrack)
     {
       UseMediaStreamTrackPtr track = inTrack;
-      ZS_EVENTING_3(
+      ZS_EVENTING_2(
                     x, i, Debug, RtpSenderChannelChangeTrack, ol, RtpSenderChannel, InternalEvent,
                     puid, id, mID,
-                    puid, mediaBaseId, mMediaBase->getID(),
                     puid, trackId, ((bool)track) ? track->getID() : 0
                     );
       IRTPSenderChannelAsyncDelegateProxy::create(mThisWeak.lock())->onTrackChanged(track);
@@ -383,23 +374,17 @@ namespace ortc
     {
       ZS_LOG_TRACE(log("on provide stats") + ZS_PARAM("promise", promise->getID()));
 
-      UseMediaBasePtr mediaBase;
-
       {
         AutoRecursiveLock lock(*this);
-        mediaBase = mMediaBase;
       }
-
-      mediaBase->requestStats(promise, stats);
     }
 
     //-------------------------------------------------------------------------
     bool RTPSenderChannel::handlePacket(RTCPPacketPtr packet)
     {
-      ZS_EVENTING_5(
+      ZS_EVENTING_4(
                     x, i, Trace, RtpSenderChannelDeliverIncomingPacketToMediaChannel, ol, RtpSenderChannel, Deliver,
                     puid, id, mID,
-                    puid, mediaBaseId, mMediaBase->getID(),
                     enum, packetType, zsLib::to_underlying(IICETypes::Component_RTCP),
                     buffer, packet, packet->buffer()->BytePtr(),
                     size, size, packet->buffer()->SizeInBytes()
@@ -443,7 +428,7 @@ namespace ortc
         }
       }
 
-      return mMediaBase->handlePacket(packet);
+      return false;
     }
 
     //-------------------------------------------------------------------------
@@ -453,25 +438,24 @@ namespace ortc
                                       Milliseconds interToneGap
                                       )
     {
-      mMediaBase->insertDTMF(tones, duration, interToneGap);
     }
 
     //-------------------------------------------------------------------------
     String RTPSenderChannel::toneBuffer() const
     {
-      return mMediaBase->toneBuffer();
+      return String();
     }
 
     //-------------------------------------------------------------------------
     Milliseconds RTPSenderChannel::duration() const
     {
-      return mMediaBase->duration();
+      return Milliseconds();
     }
 
     //-------------------------------------------------------------------------
     Milliseconds RTPSenderChannel::interToneGap() const
     {
-      return mMediaBase->interToneGap();
+      return Milliseconds();
     }
 
     //-------------------------------------------------------------------------
@@ -678,14 +662,12 @@ namespace ortc
 #define TODO_VERIFY_RESULT 1
 #define TODO_VERIFY_RESULT 2
       if (!mAudio) return 0;
-      return mAudio->sendAudioSamples(audioSamples, numberOfSamples, numberOfChannels);
+      return 0;
     }
 
     //-------------------------------------------------------------------------
     void RTPSenderChannel::sendVideoFrame(VideoFramePtr videoFrame)
     {
-      if (!mVideo) return;
-      mVideo->sendVideoFrame(videoFrame);
     }
     
     //-------------------------------------------------------------------------
@@ -734,17 +716,11 @@ namespace ortc
     //-------------------------------------------------------------------------
     void RTPSenderChannel::onTrackChanged(UseMediaStreamTrackPtr track)
     {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelMediaBase, UseBaseMediaStreamTrack)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelAudio, UseAudioMediaStreamTrack)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelVideo, UseVideoMediaStreamTrack)
-
       switch (mKind.value()) {
         case IMediaStreamTrackTypes::Kind_Audio: {
-          mMediaBase->onTrackChanged(IMediaStreamTrackForRTPSenderChannelAudioPtr(MediaStreamTrack::convert(track)));
           break;
         }
         case IMediaStreamTrackTypes::Kind_Video: {
-          mMediaBase->onTrackChanged(IMediaStreamTrackForRTPSenderChannelVideoPtr(MediaStreamTrack::convert(track)));
           break;
         }
       }
@@ -765,8 +741,6 @@ namespace ortc
           cancel();
         }
       }
-
-      mMediaBase->notifyTransportState(state);
     }
 
     //-------------------------------------------------------------------------
@@ -821,8 +795,6 @@ namespace ortc
 
         setupTagging();
       }
-      
-      mediaBase->notifyUpdate(params);
     }
 
     //-------------------------------------------------------------------------
diff --git a/ortc/cpp/ortc_RTPSenderChannelAudio.cpp b/ortc/cpp/ortc_RTPSenderChannelAudio.cpp
deleted file mode 100644
index 99ec2778..00000000
--- a/ortc/cpp/ortc_RTPSenderChannelAudio.cpp
+++ /dev/null
@@ -1,939 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#include <ortc/internal/ortc_RTPSenderChannelAudio.h>
-#include <ortc/internal/ortc_RTPSenderChannel.h>
-#include <ortc/internal/ortc_MediaStreamTrack.h>
-#include <ortc/internal/ortc_RTPPacket.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
-#include <ortc/internal/ortc_ORTC.h>
-#include <ortc/internal/ortc_StatsReport.h>
-#include <ortc/internal/platform.h>
-
-#include <ortc/IHelper.h>
-
-#include <ortc/services/IHTTP.h>
-
-#include <zsLib/ISettings.h>
-#include <zsLib/Stringize.h>
-#include <zsLib/Log.h>
-#include <zsLib/XML.h>
-
-#include <cryptopp/sha.h>
-
-#ifdef _DEBUG
-#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
-#else
-#define ASSERT(x)
-#endif //_DEBUG
-
-
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpsender) }
-
-namespace ortc
-{
-  ZS_DECLARE_USING_PTR(zsLib, ISettings);
-
-  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
-
-  namespace internal
-  {
-    ZS_DECLARE_CLASS_PTR(RTPSenderChannelAudioSettingsDefaults);
-
-    ZS_DECLARE_TYPEDEF_PTR(IStatsReportForInternal, UseStatsReport);
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark (helpers)
-    #pragma mark
-
-
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudioSettingsDefaults
-    #pragma mark
-
-    class RTPSenderChannelAudioSettingsDefaults : public ISettingsApplyDefaultsDelegate
-    {
-    public:
-      //-----------------------------------------------------------------------
-      ~RTPSenderChannelAudioSettingsDefaults()
-      {
-        ISettings::removeDefaults(*this);
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPSenderChannelAudioSettingsDefaultsPtr singleton()
-      {
-        static SingletonLazySharedPtr<RTPSenderChannelAudioSettingsDefaults> singleton(create());
-        return singleton.singleton();
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPSenderChannelAudioSettingsDefaultsPtr create()
-      {
-        auto pThis(make_shared<RTPSenderChannelAudioSettingsDefaults>());
-        ISettings::installDefaults(pThis);
-        return pThis;
-      }
-
-      //-----------------------------------------------------------------------
-      virtual void notifySettingsApplyDefaults() override
-      {
-      }
-      
-    };
-
-    //-------------------------------------------------------------------------
-    void installRTPSenderChannelAudioSettingsDefaults()
-    {
-      RTPSenderChannelAudioSettingsDefaults::singleton();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelAudioForRTPSenderChannel
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudioPtr IRTPSenderChannelAudioForRTPSenderChannel::create(
-                                                                               RTPSenderChannelPtr senderChannel,
-                                                                               MediaStreamTrackPtr track,
-                                                                               const Parameters &params
-                                                                               )
-    {
-      return internal::IRTPSenderChannelAudioFactory::singleton().create(senderChannel, track, params);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio::ToneInfo
-    #pragma mark
-    
-    //-------------------------------------------------------------------------
-    ElementPtr RTPSenderChannelAudio::ToneInfo::toDebug() const
-    {
-      ElementPtr resultEl = Element::create("ortc::RTPSenderChannelAudio::ToneInfo");
-
-      IHelper::debugAppend(resultEl, "tones", mTones);
-      IHelper::debugAppend(resultEl, "duration", mDuration);
-      IHelper::debugAppend(resultEl, "inter tone gap", mInterToneGap);
-
-      return resultEl;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio
-    #pragma mark
-    
-    //-------------------------------------------------------------------------
-    const char *RTPSenderChannelAudio::toString(States state)
-    {
-      switch (state) {
-        case State_Pending:       return "pending";
-        case State_Ready:         return "ready";
-        case State_ShuttingDown:  return "shutting down";
-        case State_Shutdown:      return "shutdown";
-      }
-      return "UNDEFINED";
-    }
-    
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudio::RTPSenderChannelAudio(
-                                                 const make_private &,
-                                                 IMessageQueuePtr queue,
-                                                 UseChannelPtr senderChannel,
-                                                 UseMediaStreamTrackPtr track,
-                                                 const Parameters &params
-                                                 ) :
-      MessageQueueAssociator(queue),
-      SharedRecursiveLock(SharedRecursiveLock::create()),
-      mSenderChannel(senderChannel),
-      mTrack(track),
-      mParameters(make_shared<Parameters>(params))
-    {
-      ZS_LOG_DETAIL(debug("created"))
-
-      ORTC_THROW_INVALID_PARAMETERS_IF(!senderChannel)
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::init()
-    {
-      TransportPtr transport = Transport::create(mThisWeak.lock());
-
-      PromiseWithRTPMediaEngineChannelResourcePtr setupChannelPromise = UseMediaEngine::setupChannel(
-                                                                                                     mThisWeak.lock(),
-                                                                                                     transport,
-                                                                                                     MediaStreamTrack::convert(mTrack),
-                                                                                                     mParameters,
-                                                                                                     mThisWeak.lock()
-                                                                                                     );
-      {
-        AutoRecursiveLock lock(*this);
-        mChannelResourceLifetimeHolderPromise = setupChannelPromise;
-        mTransport = transport;
-      }
-      setupChannelPromise->thenWeak(mThisWeak.lock());
-
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudio::~RTPSenderChannelAudio()
-    {
-      if (isNoop()) return;
-
-      ZS_LOG_DETAIL(log("destroyed"))
-      mThisWeak.reset();
-
-      cancel();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudioPtr RTPSenderChannelAudio::convert(ForRTPSenderChannelFromMediaBasePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPSenderChannelAudio, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudioPtr RTPSenderChannelAudio::convert(ForRTPSenderChannelPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPSenderChannelAudio, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudioPtr RTPSenderChannelAudio::convert(ForMediaStreamTrackFromMediaBasePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPSenderChannelAudio, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudioPtr RTPSenderChannelAudio::convert(ForMediaStreamTrackPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPSenderChannelAudio, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudioPtr RTPSenderChannelAudio::convert(ForRTPMediaEnginePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPSenderChannelAudio, object);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => IRTPSenderChannelMediaBaseForRTPSenderChannel
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::onTrackChanged(UseBaseMediaStreamTrackPtr track)
-    {
-      AutoRecursiveLock lock(*this);
-      mTrack = MediaStreamTrack::convert(track);  // NOTE: track might be NULL
-#define TODO_HANDLE_CHANGE_IN_TRACK 1
-#define TODO_HANDLE_CHANGE_IN_TRACK 2
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::notifyTransportState(ISecureTransportTypes::States state)
-    {
-      IRTPSenderChannelAudioAsyncDelegateProxy::create(mThisWeak.lock())->onSecureTransportState(state);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::notifyUpdate(ParametersPtr params)
-    {
-      IRTPSenderChannelAudioAsyncDelegateProxy::create(mThisWeak.lock())->onUpdate(params);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelAudio::handlePacket(RTCPPacketPtr packet)
-    {
-      UseChannelResourcePtr channelResource;
-
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource) return false;
-      return channelResource->handlePacket(*packet);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats)
-    {
-      UseChannelResourcePtr channelResource;
-
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource) {
-        promise->reject();
-        return;
-      }
-      return channelResource->requestStats(promise, stats);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::insertDTMF(
-                                           const char *tones,
-                                           Milliseconds duration,
-                                           Milliseconds interToneGap
-                                           )
-    {
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-
-        if ((!channelResource) ||
-            (mPendingTones.size() > 0)) {
-          auto info = make_shared<ToneInfo>();
-          info->mTones = String(tones);
-          info->mDuration = duration;
-          info->mInterToneGap = interToneGap;
-          mPendingTones.push_back(info);
-          return;
-        }
-      }
-
-      channelResource->insertDTMF(tones, duration, interToneGap);
-    }
-
-    //-------------------------------------------------------------------------
-    String RTPSenderChannelAudio::toneBuffer() const
-    {
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-
-        if (mPendingTones.size() > 0) {
-          auto info = mPendingTones.front();
-          return info->mTones;
-        }
-      }
-
-      if (!channelResource) return String();
-
-      return channelResource->toneBuffer();
-    }
-
-    //-------------------------------------------------------------------------
-    Milliseconds RTPSenderChannelAudio::duration() const
-    {
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-        if (mPendingTones.size() > 0) {
-          auto info = mPendingTones.front();
-          return info->mDuration;
-        }
-      }
-
-      if (!channelResource) return Milliseconds();
-
-      return channelResource->duration();
-    }
-
-    //-------------------------------------------------------------------------
-    Milliseconds RTPSenderChannelAudio::interToneGap() const
-    {
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-        if (mPendingTones.size() > 0) {
-          auto info = mPendingTones.front();
-          return info->mInterToneGap;
-        }
-      }
-
-      if (!channelResource) return Milliseconds();
-
-      return channelResource->interToneGap();
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => IRTPSenderChannelAudioForRTPSenderChannel
-    #pragma mark
-    
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudioPtr RTPSenderChannelAudio::create(
-                                                           RTPSenderChannelPtr senderChannel,
-                                                           MediaStreamTrackPtr track,
-                                                           const Parameters &params
-                                                           )
-    {
-      RTPSenderChannelAudioPtr pThis(make_shared<RTPSenderChannelAudio>(make_private {}, IORTCForInternal::queueORTC(), senderChannel, track, params));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-
-    //-------------------------------------------------------------------------
-    int32_t RTPSenderChannelAudio::sendAudioSamples(
-                                                    const void* audioSamples,
-                                                    const size_t numberOfSamples,
-                                                    const uint8_t numberOfChannels
-                                                    )
-    {
-#define TODO_IMPLEMENT_THIS 1
-#define TODO_IMPLEMENT_THIS 2
-      return 0;
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => IRTPSenderChannelAudioForMediaStreamTrack
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => IRTPSenderChannelMediaBaseForRTPMediaEngine
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => IWakeDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::onWake()
-    {
-      ZS_LOG_DEBUG(log("wake"));
-
-      ToneInfoList pending;
-      UseChannelResourcePtr channelResource;
-
-      {
-        AutoRecursiveLock lock(*this);
-        step();
-
-        if ((mChannelResource) &&
-            (mPendingTones.size() > 0)) {
-          pending = mPendingTones;
-          mPendingTones.clear();
-
-          auto tempLockoutTones = make_shared<ToneInfo>();
-          tempLockoutTones->mTones = ORTC_SENDER_CHANNEL_PENDING_TONE_LOCK_OUT_MAGIC_STRING;
-
-          mPendingTones.push_back(tempLockoutTones);
-
-          channelResource = mChannelResource;
-        }
-      }
-
-      if (pending.size() > 0)
-      {
-        while (pending.size() > 0)
-        {
-          ToneInfoPtr tone = pending.front();
-          pending.pop_front();
-
-          if (0 == tone->mTones.compare(ORTC_SENDER_CHANNEL_PENDING_TONE_LOCK_OUT_MAGIC_STRING)) continue;
-
-          channelResource->insertDTMF(tone->mTones, tone->mDuration, tone->mInterToneGap);
-        }
-
-        {
-          AutoRecursiveLock lock(*this);
-
-          if (mPendingTones.size() > 1) {
-            // NOTE: a pending tone was inserted while the current tone was
-            // being played out thus attempt to deliver pending tones again
-            IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-            return;
-          }
-
-          // NOTE: the only possible tone in the tone buffer is the lock out
-          /// tone thus clear out the pending tone
-          mPendingTones.clear();
-        }
-      }
-    }
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => IWakeDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::onDTMFSenderToneChanged(
-                                                        IDTMFSenderPtr sender,
-                                                        String tone
-                                                        )
-    {
-      auto senderChannel = mSenderChannel.lock();
-
-      if (!senderChannel) {
-        ZS_LOG_WARNING(Debug, log("cannot foreward tone event (sender channel is gone)"));
-        return;
-      }
-
-      senderChannel->notifyDTMFSenderToneChanged(tone);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => ITimerDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::onTimer(ITimerPtr timer)
-    {
-      ZS_LOG_DEBUG(log("timer") + ZS_PARAM("timer id", timer->getID()))
-
-      AutoRecursiveLock lock(*this);
-#define TODO 1
-#define TODO 2
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => IPromiseSettledDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::onPromiseSettled(PromisePtr promise)
-    {
-      ZS_LOG_DEBUG(log("promise settled") + ZS_PARAM("promise", promise->getID()))
-
-      AutoRecursiveLock lock(*this);
-      step();
-      
-      if (ZS_DYNAMIC_PTR_CAST(PromiseWithRTPMediaEngineChannelResource, promise)) {
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => IRTPSenderChannelAudioAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::onSecureTransportState(ISecureTransport::States state)
-    {
-      ZS_LOG_TRACE(log("notified secure transport state") + ZS_PARAM("state", ISecureTransport::toString(state)))
-
-      AutoRecursiveLock lock(*this);
-
-      mTransportState = state;
-
-      if (mChannelResource)
-        mChannelResource->notifyTransportState(state);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::onUpdate(ParametersPtr params)
-    {
-      ZS_LOG_TRACE(log("on update") + params->toDebug())
-
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        mParameters = make_shared<Parameters>(*params);
-        channelResource = mChannelResource;
-      }
-
-      if (channelResource)
-        channelResource->notifyUpdate(params);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => friend Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelAudio::SendRtp(
-                                        const uint8_t* packet,
-                                        size_t length,
-                                        const webrtc::PacketOptions& options
-                                        )
-    {
-      auto channel = mSenderChannel.lock();
-      if (!channel) return false;
-      return channel->sendPacket(RTPPacket::create(packet, length));
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelAudio::SendRtcp(const uint8_t* packet, size_t length)
-    {
-      auto channel = mSenderChannel.lock();
-      if (!channel) return false;
-      return channel->sendPacket(RTCPPacket::create(packet, length));
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio::Transport
-    #pragma mark
-    
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudio::Transport::Transport(
-                                                const make_private &,
-                                                RTPSenderChannelAudioPtr outer
-                                                ) :
-      mOuter(outer)
-    {
-    }
-    
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudio::Transport::~Transport()
-    {
-      mThisWeak.reset();
-    }
-    
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::Transport::init()
-    {
-    }
-    
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudio::TransportPtr RTPSenderChannelAudio::Transport::create(RTPSenderChannelAudioPtr outer)
-    {
-      TransportPtr pThis(make_shared<Transport>(make_private{}, outer));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio::Transport => webrtc::Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelAudio::Transport::SendRtp(
-                                                   const uint8_t* packet,
-                                                   size_t length,
-                                                   const webrtc::PacketOptions& options
-                                                   )
-    {
-      auto outer = mOuter.lock();
-      if (!outer) return false;
-      return outer->SendRtp(packet, length, options);
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelAudio::Transport::SendRtcp(const uint8_t* packet, size_t length)
-    {
-      auto outer = mOuter.lock();
-      if (!outer) return false;
-      return outer->SendRtcp(packet, length);
-    }
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio => (internal)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPSenderChannelAudio::log(const char *message) const
-    {
-      ElementPtr objectEl = Element::create("ortc::RTPSenderChannelAudio");
-      IHelper::debugAppend(objectEl, "id", mID);
-      return Log::Params(message, objectEl);
-    }
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPSenderChannelAudio::debug(const char *message) const
-    {
-      return Log::Params(message, toDebug());
-    }
-
-    //-------------------------------------------------------------------------
-    ElementPtr RTPSenderChannelAudio::toDebug() const
-    {
-      AutoRecursiveLock lock(*this);
-
-      ElementPtr resultEl = Element::create("ortc::RTPSenderChannelAudio");
-
-      IHelper::debugAppend(resultEl, "id", mID);
-
-      IHelper::debugAppend(resultEl, "graceful shutdown", (bool)mGracefulShutdownReference);
-
-      IHelper::debugAppend(resultEl, "state", toString(mCurrentState));
-
-      IHelper::debugAppend(resultEl, "error", mLastError);
-      IHelper::debugAppend(resultEl, "error reason", mLastErrorReason);
-
-      auto senderChannel = mSenderChannel.lock();
-      IHelper::debugAppend(resultEl, "sender channel", senderChannel ? senderChannel->getID() : 0);
-
-      return resultEl;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelAudio::isShuttingDown() const
-    {
-      return State_ShuttingDown == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelAudio::isShutdown() const
-    {
-      return State_Shutdown == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::step()
-    {
-      ZS_LOG_DEBUG(debug("step"))
-
-      if ((isShuttingDown()) ||
-          (isShutdown())) {
-        ZS_LOG_DEBUG(debug("step forwarding to cancel"))
-        cancel();
-        return;
-      }
-
-      // ... other steps here ...
-      if (!stepSetupChannel()) goto not_ready;
-      // ... other steps here ...
-
-      goto ready;
-
-    not_ready:
-      {
-        ZS_LOG_TRACE(debug("not ready"))
-        return;
-      }
-
-    ready:
-      {
-        ZS_LOG_TRACE(log("ready"))
-        setState(State_Ready);
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelAudio::stepSetupChannel()
-    {
-      if (mChannelResource) {
-        ZS_LOG_TRACE(log("already setup channel resource"))
-        return true;
-      }
-
-      if (!mChannelResourceLifetimeHolderPromise->isSettled()) {
-        ZS_LOG_TRACE(log("waiting for setup channel promise to be set up"))
-        return false;
-      }
-
-      if (mChannelResourceLifetimeHolderPromise->isRejected()) {
-        ZS_LOG_WARNING(Debug, log("media engine rejected channel setup"))
-        cancel();
-        return false;
-      }
-
-      mChannelResource = ZS_DYNAMIC_PTR_CAST(UseChannelResource, mChannelResourceLifetimeHolderPromise->value());
-
-      if (!mChannelResource) {
-        ZS_LOG_WARNING(Detail, log("failed to initialize channel resource"))
-        cancel();
-        return false;
-      }
-
-      ZS_LOG_DEBUG(log("media channel is setup") + ZS_PARAM("channel", mChannelResource->getID()))
-
-      mChannelResource->notifyTransportState(mTransportState);
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::cancel()
-    {
-      //.......................................................................
-      // try to gracefully shutdown
-
-      if (isShutdown()) return;
-
-      setState(State_ShuttingDown);
-
-      if (!mGracefulShutdownReference) mGracefulShutdownReference = mThisWeak.lock();
-
-      if (!mCloseChannelPromise) {
-        if (mChannelResource) {
-          mCloseChannelPromise = mChannelResource->shutdown();
-          mCloseChannelPromise->thenWeak(mGracefulShutdownReference);
-        }
-      }
-
-      if (mGracefulShutdownReference) {
-        if (mCloseChannelPromise) {
-          if (!mCloseChannelPromise->isSettled()) {
-            ZS_LOG_DEBUG(log("waiting for close channel promise"))
-            return;
-          }
-        }
-      }
-
-      //.......................................................................
-      // final cleanup
-
-      setState(State_Shutdown);
-
-      mChannelResourceLifetimeHolderPromise.reset();
-
-      mChannelResource.reset();
-      mCloseChannelPromise.reset();
-
-      // make sure to cleanup any final reference to self
-      mGracefulShutdownReference.reset();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::setState(States state)
-    {
-      if (state == mCurrentState) return;
-
-      ZS_LOG_DETAIL(debug("state changed") + ZS_PARAM("new state", toString(state)) + ZS_PARAM("old state", toString(mCurrentState)))
-
-      mCurrentState = state;
-
-//      RTPSenderChannelAudioPtr pThis = mThisWeak.lock();
-//      if (pThis) {
-//        mSubscriptions.delegate()->onRTPSenderChannelAudioStateChanged(pThis, mCurrentState);
-//      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelAudio::setError(WORD errorCode, const char *inReason)
-    {
-      String reason(inReason);
-      if (reason.isEmpty()) {
-        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
-      }
-
-      if (0 != mLastError) {
-        ZS_LOG_WARNING(Detail, debug("error already set thus ignoring new error") + ZS_PARAM("new error", errorCode) + ZS_PARAM("new reason", reason))
-        return;
-      }
-
-      mLastError = errorCode;
-      mLastErrorReason = reason;
-
-      ZS_LOG_WARNING(Detail, debug("error set") + ZS_PARAM("error", mLastError) + ZS_PARAM("reason", mLastErrorReason))
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelAudioFactory
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    IRTPSenderChannelAudioFactory &IRTPSenderChannelAudioFactory::singleton()
-    {
-      return RTPSenderChannelAudioFactory::singleton();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelAudioPtr IRTPSenderChannelAudioFactory::create(
-                                                                   RTPSenderChannelPtr senderChannel,
-                                                                   MediaStreamTrackPtr track,
-                                                                   const Parameters &params
-                                                                   )
-    {
-      if (this) {}
-      return internal::RTPSenderChannelAudio::create(senderChannel, track, params);
-    }
-
-  } // internal namespace
-
-}
diff --git a/ortc/cpp/ortc_RTPSenderChannelVideo.cpp b/ortc/cpp/ortc_RTPSenderChannelVideo.cpp
deleted file mode 100644
index a74c1ac3..00000000
--- a/ortc/cpp/ortc_RTPSenderChannelVideo.cpp
+++ /dev/null
@@ -1,763 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
-#include <ortc/internal/ortc_RTPSenderChannel.h>
-#include <ortc/internal/ortc_MediaStreamTrack.h>
-#include <ortc/internal/ortc_RTPPacket.h>
-#include <ortc/internal/ortc_RTCPPacket.h>
-#include <ortc/internal/ortc_ORTC.h>
-#include <ortc/internal/platform.h>
-
-#include <ortc/IHelper.h>
-#include <ortc/services/IHTTP.h>
-
-#include <zsLib/ISettings.h>
-#include <zsLib/Stringize.h>
-#include <zsLib/Log.h>
-#include <zsLib/XML.h>
-
-#include <cryptopp/sha.h>
-
-#include <webrtc/system_wrappers/include/cpu_info.h>
-
-#ifdef _DEBUG
-#define ASSERT(x) ZS_THROW_BAD_STATE_IF(!(x))
-#else
-#define ASSERT(x)
-#endif //_DEBUG
-
-
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtpsender) }
-
-namespace ortc
-{
-  ZS_DECLARE_USING_PTR(zsLib, ISettings);
-  ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
-
-  namespace internal
-  {
-    ZS_DECLARE_CLASS_PTR(RTPSenderChannelVideoSettingsDefaults);
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark (helpers)
-    #pragma mark
-
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideoSettingsDefaults
-    #pragma mark
-
-    class RTPSenderChannelVideoSettingsDefaults : public ISettingsApplyDefaultsDelegate
-    {
-    public:
-      //-----------------------------------------------------------------------
-      ~RTPSenderChannelVideoSettingsDefaults()
-      {
-        ISettings::removeDefaults(*this);
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPSenderChannelVideoSettingsDefaultsPtr singleton()
-      {
-        static SingletonLazySharedPtr<RTPSenderChannelVideoSettingsDefaults> singleton(create());
-        return singleton.singleton();
-      }
-
-      //-----------------------------------------------------------------------
-      static RTPSenderChannelVideoSettingsDefaultsPtr create()
-      {
-        auto pThis(make_shared<RTPSenderChannelVideoSettingsDefaults>());
-        ISettings::installDefaults(pThis);
-        return pThis;
-      }
-
-      //-----------------------------------------------------------------------
-      virtual void notifySettingsApplyDefaults() override
-      {
-        //      ISettings::setUInt(ORTC_SETTING_RTP_SENDER_CHANNEL_VIDEO_, 0);
-      }
-      
-    };
-
-    //-------------------------------------------------------------------------
-    void installRTPSenderChannelVideoSettingsDefaults()
-    {
-      RTPSenderChannelVideoSettingsDefaults::singleton();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelVideoForRTPSenderChannel
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideoPtr IRTPSenderChannelVideoForRTPSenderChannel::create(
-                                                                               RTPSenderChannelPtr senderChannel,
-                                                                               MediaStreamTrackPtr track,
-                                                                               const Parameters &params
-                                                                               )
-    {
-      return internal::IRTPSenderChannelVideoFactory::singleton().create(senderChannel, track, params);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo
-    #pragma mark
-    
-    //-------------------------------------------------------------------------
-    const char *RTPSenderChannelVideo::toString(States state)
-    {
-      switch (state) {
-        case State_Pending:       return "pending";
-        case State_Ready:         return "ready";
-        case State_ShuttingDown:  return "shutting down";
-        case State_Shutdown:      return "shutdown";
-      }
-      return "UNDEFINED";
-    }
-    
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideo::RTPSenderChannelVideo(
-                                                 const make_private &,
-                                                 IMessageQueuePtr queue,
-                                                 UseChannelPtr senderChannel,
-                                                 UseMediaStreamTrackPtr track,
-                                                 const Parameters &params
-                                                 ) :
-      MessageQueueAssociator(queue),
-      SharedRecursiveLock(SharedRecursiveLock::create()),
-      mSenderChannel(senderChannel),
-      mTrack(track),
-      mParameters(make_shared<Parameters>(params))
-    {
-      ZS_LOG_DETAIL(debug("created"))
-
-      ORTC_THROW_INVALID_PARAMETERS_IF(!senderChannel)
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::init()
-    {
-      TransportPtr transport = Transport::create(mThisWeak.lock());
-
-      PromiseWithRTPMediaEngineChannelResourcePtr setupChannelPromise = UseMediaEngine::setupChannel(
-                                                                                                     mThisWeak.lock(),
-                                                                                                     transport,
-                                                                                                     MediaStreamTrack::convert(mTrack),
-                                                                                                     mParameters,
-                                                                                                     IDTMFSenderDelegatePtr()
-                                                                                                     );
-      {
-        AutoRecursiveLock lock(*this);
-        mChannelResourceLifetimeHolderPromise = setupChannelPromise;
-        mTransport = transport;
-      }
-
-      setupChannelPromise->thenWeak(mThisWeak.lock());
-
-      IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideo::~RTPSenderChannelVideo()
-    {
-      if (isNoop()) return;
-
-      ZS_LOG_DETAIL(log("destroyed"))
-      mThisWeak.reset();
-
-      cancel();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideoPtr RTPSenderChannelVideo::convert(ForRTPSenderChannelFromMediaBasePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPSenderChannelVideo, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideoPtr RTPSenderChannelVideo::convert(ForRTPSenderChannelPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPSenderChannelVideo, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideoPtr RTPSenderChannelVideo::convert(ForMediaStreamTrackFromMediaBasePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPSenderChannelVideo, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideoPtr RTPSenderChannelVideo::convert(ForMediaStreamTrackPtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPSenderChannelVideo, object);
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideoPtr RTPSenderChannelVideo::convert(ForRTPMediaEnginePtr object)
-    {
-      return ZS_DYNAMIC_PTR_CAST(RTPSenderChannelVideo, object);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo => IRTPSenderChannelMediaBaseForRTPSenderChannel
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::onTrackChanged(UseBaseMediaStreamTrackPtr track)
-    {
-      AutoRecursiveLock lock(*this);
-      mTrack = MediaStreamTrack::convert(track);  // NOTE: track might be NULL
-#define TODO_HANDLE_CHANGE_IN_TRACK 1
-#define TODO_HANDLE_CHANGE_IN_TRACK 2
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::notifyTransportState(ISecureTransportTypes::States state)
-    {
-      IRTPSenderChannelVideoAsyncDelegateProxy::create(mThisWeak.lock())->onSecureTransportState(state);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::notifyUpdate(ParametersPtr params)
-    {
-      IRTPSenderChannelVideoAsyncDelegateProxy::create(mThisWeak.lock())->onUpdate(params);
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelVideo::handlePacket(RTCPPacketPtr packet)
-    {
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource) return true;
-      return channelResource->handlePacket(*packet);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats)
-    {
-      UseChannelResourcePtr channelResource;
-
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource) {
-        promise->reject();
-        return;
-      }
-      return channelResource->requestStats(promise, stats);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo => IRTPSenderChannelVideoForRTPSenderChannel
-    #pragma mark
-    
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideoPtr RTPSenderChannelVideo::create(
-                                                           RTPSenderChannelPtr senderChannel,
-                                                           MediaStreamTrackPtr track,
-                                                           const Parameters &params
-                                                           )
-    {
-      RTPSenderChannelVideoPtr pThis(make_shared<RTPSenderChannelVideo>(make_private {}, IORTCForInternal::queueORTC(), senderChannel, track, params));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo => IRTPSenderChannelVideoForMediaStreamTrack
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::sendVideoFrame(VideoFramePtr videoFrame)
-    {
-      UseChannelResourcePtr channelResource;
-
-      {
-        AutoRecursiveLock lock(*this);
-        channelResource = mChannelResource;
-      }
-
-      if (!channelResource) return;
-      channelResource->sendVideoFrame(videoFrame);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo => IRTPSenderChannelMediaBaseForRTPMediaEngine
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo => IWakeDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::onWake()
-    {
-      ZS_LOG_DEBUG(log("wake"))
-
-      AutoRecursiveLock lock(*this);
-      step();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo => ITimerDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::onTimer(ITimerPtr timer)
-    {
-      ZS_LOG_DEBUG(log("timer") + ZS_PARAM("timer id", timer->getID()))
-
-      AutoRecursiveLock lock(*this);
-#define TODO 1
-#define TODO 2
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo => IPromiseSettledDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::onPromiseSettled(PromisePtr promise)
-    {
-      ZS_LOG_DEBUG(log("promise settled") + ZS_PARAM("promise", promise->getID()))
-
-      AutoRecursiveLock lock(*this);
-      step();
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo => IRTPSenderChannelVideoAsyncDelegate
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::onSecureTransportState(ISecureTransport::States state)
-    {
-      ZS_LOG_TRACE(log("notified secure transport state") + ZS_PARAM("state", ISecureTransport::toString(state)))
-
-      AutoRecursiveLock lock(*this);
-
-      mTransportState = state;
-
-      if (mChannelResource)
-        mChannelResource->notifyTransportState(state);
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::onUpdate(ParametersPtr params)
-    {
-      ZS_LOG_TRACE(log("on update") + params->toDebug())
-
-      UseChannelResourcePtr channelResource;
-      {
-        AutoRecursiveLock lock(*this);
-        mParameters = make_shared<Parameters>(*params);
-        channelResource = mChannelResource;
-      }
-
-      if (channelResource)
-        channelResource->notifyUpdate(params);
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo => friend Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelVideo::SendRtp(
-                                        const uint8_t* packet,
-                                        size_t length,
-                                        const webrtc::PacketOptions& options
-                                        )
-    {
-      auto channel = mSenderChannel.lock();
-      if (!channel) return false;
-      return channel->sendPacket(RTPPacket::create(packet, length));
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelVideo::SendRtcp(const uint8_t* packet, size_t length)
-    {
-      auto channel = mSenderChannel.lock();
-      if (!channel) return false;
-      return channel->sendPacket(RTCPPacket::create(packet, length));
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo::Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideo::Transport::Transport(
-                                                const make_private &,
-                                                RTPSenderChannelVideoPtr outer
-                                                ) :
-      mOuter(outer)
-    {
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideo::Transport::~Transport()
-    {
-      mThisWeak.reset();
-    }
-    
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::Transport::init()
-    {
-    }
-    
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideo::TransportPtr RTPSenderChannelVideo::Transport::create(RTPSenderChannelVideoPtr outer)
-    {
-      TransportPtr pThis(make_shared<Transport>(make_private{}, outer));
-      pThis->mThisWeak = pThis;
-      pThis->init();
-      return pThis;
-    }
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo::Transport => webrtc::Transport
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelVideo::Transport::SendRtp(
-                                                   const uint8_t* packet,
-                                                   size_t length,
-                                                   const webrtc::PacketOptions& options
-                                                   )
-    {
-      auto outer = mOuter.lock();
-      if (!outer) return false;
-      return outer->SendRtp(packet, length, options);
-    }
-    
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelVideo::Transport::SendRtcp(const uint8_t* packet, size_t length)
-    {
-      auto outer = mOuter.lock();
-      if (!outer) return false;
-      return outer->SendRtcp(packet, length);
-    }
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo => (internal)
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPSenderChannelVideo::log(const char *message) const
-    {
-      ElementPtr objectEl = Element::create("ortc::RTPSenderChannelVideo");
-      IHelper::debugAppend(objectEl, "id", mID);
-      return Log::Params(message, objectEl);
-    }
-
-    //-------------------------------------------------------------------------
-    Log::Params RTPSenderChannelVideo::debug(const char *message) const
-    {
-      return Log::Params(message, toDebug());
-    }
-
-    //-------------------------------------------------------------------------
-    ElementPtr RTPSenderChannelVideo::toDebug() const
-    {
-      AutoRecursiveLock lock(*this);
-
-      ElementPtr resultEl = Element::create("ortc::RTPSenderChannelVideo");
-
-      IHelper::debugAppend(resultEl, "id", mID);
-
-      IHelper::debugAppend(resultEl, "graceful shutdown", (bool)mGracefulShutdownReference);
-
-      IHelper::debugAppend(resultEl, "state", toString(mCurrentState));
-
-      IHelper::debugAppend(resultEl, "error", mLastError);
-      IHelper::debugAppend(resultEl, "error reason", mLastErrorReason);
-
-      auto senderChannel = mSenderChannel.lock();
-      IHelper::debugAppend(resultEl, "sender channel", senderChannel ? senderChannel->getID() : 0);
-
-      return resultEl;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelVideo::isShuttingDown() const
-    {
-      return State_ShuttingDown == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelVideo::isShutdown() const
-    {
-      return State_Shutdown == mCurrentState;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::step()
-    {
-      ZS_LOG_DEBUG(debug("step"))
-
-      if ((isShuttingDown()) ||
-          (isShutdown())) {
-        ZS_LOG_DEBUG(debug("step forwarding to cancel"))
-        cancel();
-        return;
-      }
-
-      // ... other steps here ...
-      if (!stepSetupChannel()) goto not_ready;
-      // ... other steps here ...
-
-      goto ready;
-
-    not_ready:
-      {
-        ZS_LOG_TRACE(debug("not ready"))
-        return;
-      }
-
-    ready:
-      {
-        ZS_LOG_TRACE(log("ready"))
-        setState(State_Ready);
-      }
-    }
-
-    //-------------------------------------------------------------------------
-    bool RTPSenderChannelVideo::stepSetupChannel()
-    {
-      if (mChannelResource) {
-        ZS_LOG_TRACE(log("already setup channel resource"))
-        return true;
-      }
-
-      if (!mChannelResourceLifetimeHolderPromise->isSettled()) {
-        ZS_LOG_TRACE(log("waiting for setup channel promise to be set up"))
-        return false;
-      }
-
-      if (mChannelResourceLifetimeHolderPromise->isRejected()) {
-        ZS_LOG_WARNING(Debug, log("media engine rejected channel setup"))
-        cancel();
-        return false;
-      }
-
-      mChannelResource = ZS_DYNAMIC_PTR_CAST(UseChannelResource, mChannelResourceLifetimeHolderPromise->value());
-
-      if (!mChannelResource) {
-        ZS_LOG_WARNING(Detail, log("failed to initialize channel resource"))
-        cancel();
-        return false;
-      }
-
-      ZS_LOG_DEBUG(log("media channel is setup") + ZS_PARAM("channel", mChannelResource->getID()))
-
-      mChannelResource->notifyTransportState(mTransportState);
-
-      return true;
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::cancel()
-    {
-      //.......................................................................
-      // try to gracefully shutdown
-
-      if (isShutdown()) return;
-
-      setState(State_ShuttingDown);
-
-      if (!mGracefulShutdownReference) mGracefulShutdownReference = mThisWeak.lock();
-
-      if (!mCloseChannelPromise) {
-        if (mChannelResource) {
-          mCloseChannelPromise = mChannelResource->shutdown();
-          mCloseChannelPromise->thenWeak(mGracefulShutdownReference);
-        }
-      }
-
-      if (mGracefulShutdownReference) {
-        if (mCloseChannelPromise) {
-          if (!mCloseChannelPromise->isSettled()) {
-            ZS_LOG_DEBUG(log("waiting for close channel promise"))
-            return;
-          }
-        }
-      }
-      
-      //.......................................................................
-      // final cleanup
-
-      setState(State_Shutdown);
-
-      mChannelResourceLifetimeHolderPromise.reset();
-
-      mChannelResource.reset();
-      mCloseChannelPromise.reset();
-
-      // make sure to cleanup any final reference to self
-      mGracefulShutdownReference.reset();
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::setState(States state)
-    {
-      if (state == mCurrentState) return;
-
-      ZS_LOG_DETAIL(debug("state changed") + ZS_PARAM("new state", toString(state)) + ZS_PARAM("old state", toString(mCurrentState)))
-
-      mCurrentState = state;
-
-//      RTPSenderChannelVideoPtr pThis = mThisWeak.lock();
-//      if (pThis) {
-//        mSubscriptions.delegate()->onRTPSenderChannelVideoStateChanged(pThis, mCurrentState);
-//      }
-    }
-
-    //-------------------------------------------------------------------------
-    void RTPSenderChannelVideo::setError(WORD errorCode, const char *inReason)
-    {
-      String reason(inReason);
-      if (reason.isEmpty()) {
-        reason = UseHTTP::toString(UseHTTP::toStatusCode(errorCode));
-      }
-
-      if (0 != mLastError) {
-        ZS_LOG_WARNING(Detail, debug("error already set thus ignoring new error") + ZS_PARAM("new error", errorCode) + ZS_PARAM("new reason", reason))
-        return;
-      }
-
-      mLastError = errorCode;
-      mLastErrorReason = reason;
-
-      ZS_LOG_WARNING(Detail, debug("error set") + ZS_PARAM("error", mLastError) + ZS_PARAM("reason", mLastErrorReason))
-    }
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelVideoFactory
-    #pragma mark
-
-    //-------------------------------------------------------------------------
-    IRTPSenderChannelVideoFactory &IRTPSenderChannelVideoFactory::singleton()
-    {
-      return RTPSenderChannelVideoFactory::singleton();
-    }
-
-    //-------------------------------------------------------------------------
-    RTPSenderChannelVideoPtr IRTPSenderChannelVideoFactory::create(
-                                                                   RTPSenderChannelPtr senderChannel,
-                                                                   MediaStreamTrackPtr track,
-                                                                   const Parameters &params
-                                                                   )
-    {
-      if (this) {}
-      return internal::RTPSenderChannelVideo::create(senderChannel, track, params);
-    }
-
-  } // internal namespace
-
-}
diff --git a/ortc/cpp/ortc_RTPTypes.cpp b/ortc/cpp/ortc_RTPTypes.cpp
index 0768b151..994771a0 100644
--- a/ortc/cpp/ortc_RTPTypes.cpp
+++ b/ortc/cpp/ortc_RTPTypes.cpp
@@ -33,11 +33,11 @@
 #include <ortc/internal/platform.h>
 #include <ortc/internal/ortc_RTPTypes.h>
 #include <ortc/internal/ortc_RTPUtils.h>
-#include <ortc/internal/ortc_RTPPacket.h>
 #include <ortc/internal/ortc_Helper.h>
 
 #include <ortc/IRTPTypes.h>
 #include <ortc/IHelper.h>
+#include <ortc/RTPPacket.h>
 
 #include <zsLib/eventing/IHasher.h>
 
@@ -57,7 +57,7 @@
 #endif //_DEBUG
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc) }
 
 namespace ortc
 {
@@ -1366,11 +1366,11 @@ namespace ortc
         auto check = pending.begin();
         String encodingID = check->first;
         EncodingParameters *encoding = check->second;
-        pending.erase(check);
 
         if (encoding->mDependencyEncodingIDs.size() < 1) return encoding;
 
         previouslyChecked[check->first] = check->second;
+        pending.erase(check);
 
         for (auto iter = encoding->mDependencyEncodingIDs.begin(); iter != encoding->mDependencyEncodingIDs.end(); ++iter) {
           auto &dependencyID = (*iter);
@@ -2314,62 +2314,25 @@ namespace ortc
     mMaxSpatialLayers(source.mMaxSpatialLayers),
     mSVCMultiStreamSupport(source.mSVCMultiStreamSupport)
   {
-    if ((source.mParameters) ||
-        (source.mOptions)) {
-      SupportedCodecs supported = toSupportedCodec(source.mName);
-      if (source.mParameters) {
-        switch (supported) {
-          case SupportedCodec_Opus: {
-            auto codec = OpusCodecCapabilityParameters::convert(source.mParameters);
-            if (codec) {
-              mParameters = OpusCodecCapabilityParameters::create(*codec);
-            }
-            break;
-          }
-          case SupportedCodec_VP8:    {
-            auto codec = VP8CodecCapabilityParameters::convert(source.mParameters);
-            if (codec) {
-              mParameters = VP8CodecCapabilityParameters::create(*codec);
-            }
-            break;
-          }
-          case SupportedCodec_H264:   {
-            auto codec = H264CodecCapabilityParameters::convert(source.mParameters);
-            if (codec) {
-              mParameters = H264CodecCapabilityParameters::create(*codec);
-            }
-            break;
-          }
-          case SupportedCodec_RTX:   {
-            auto codec = RTXCodecCapabilityParameters::convert(source.mParameters);
-            if (codec) {
-              mParameters = RTXCodecCapabilityParameters::create(*codec);
-            }
-            break;
-          }
-          case SupportedCodec_FlexFEC:   {
-            auto codec = FlexFECCodecCapabilityParameters::convert(source.mParameters);
-            if (codec) {
-              mParameters = FlexFECCodecCapabilityParameters::create(*codec);
-            }
-            break;
-          }
-          default: break;
-        }
-      }
-      if (source.mOptions) {
-        switch (supported) {
-          case SupportedCodec_Opus: {
-            auto codec = OpusCodecCapabilityOptions::convert(source.mOptions);
-            if (codec) {
-              mOptions = OpusCodecCapabilityOptions::create(*codec);
-            }
-            break;
-          }
-          default: break;
-        }
-      }
-    }
+    copyAny(source);
+  }
+
+  //---------------------------------------------------------------------------
+  IRTPTypes::CodecCapability &IRTPTypes::CodecCapability::operator=(const CodecCapability &op2)
+  {    
+    mName = op2.mName;
+    mKind = op2.mKind;
+    mClockRate = op2.mClockRate;
+    mPreferredPayloadType = op2.mPreferredPayloadType;
+    mPTime = op2.mPTime;
+    mMaxPTime = op2.mMaxPTime;
+    mNumChannels = op2.mNumChannels;
+    mRTCPFeedback = op2.mRTCPFeedback;
+    mMaxTemporalLayers = op2.mMaxTemporalLayers;
+    mMaxSpatialLayers = op2.mMaxSpatialLayers;
+    mSVCMultiStreamSupport = op2.mSVCMultiStreamSupport;
+    copyAny(op2);
+    return *this;
   }
 
   //---------------------------------------------------------------------------
@@ -2477,6 +2440,72 @@ namespace ortc
     return hasher->finalizeAsString();
   }
 
+  //---------------------------------------------------------------------------
+  void IRTPTypes::CodecCapability::copyAny(const CodecCapability &source)
+  {
+    mParameters.reset();
+    mOptions.reset();
+
+    if ((!source.mParameters) &&
+        (!source.mOptions)) {
+      return;
+    }
+
+    SupportedCodecs supported = toSupportedCodec(source.mName);
+    if (source.mParameters) {
+      switch (supported) {
+        case SupportedCodec_Opus: {
+          auto codec = OpusCodecCapabilityParameters::convert(source.mParameters);
+          if (codec) {
+            mParameters = OpusCodecCapabilityParameters::create(*codec);
+          }
+          break;
+        }
+        case SupportedCodec_VP8:    {
+          auto codec = VP8CodecCapabilityParameters::convert(source.mParameters);
+          if (codec) {
+            mParameters = VP8CodecCapabilityParameters::create(*codec);
+          }
+          break;
+        }
+        case SupportedCodec_H264:   {
+          auto codec = H264CodecCapabilityParameters::convert(source.mParameters);
+          if (codec) {
+            mParameters = H264CodecCapabilityParameters::create(*codec);
+          }
+          break;
+        }
+        case SupportedCodec_RTX:   {
+          auto codec = RTXCodecCapabilityParameters::convert(source.mParameters);
+          if (codec) {
+            mParameters = RTXCodecCapabilityParameters::create(*codec);
+          }
+          break;
+        }
+        case SupportedCodec_FlexFEC:   {
+          auto codec = FlexFECCodecCapabilityParameters::convert(source.mParameters);
+          if (codec) {
+            mParameters = FlexFECCodecCapabilityParameters::create(*codec);
+          }
+          break;
+        }
+        default: break;
+      }
+    }
+    if (source.mOptions) {
+      switch (supported) {
+        case SupportedCodec_Opus: {
+          auto codec = OpusCodecCapabilityOptions::convert(source.mOptions);
+          if (codec) {
+            mOptions = OpusCodecCapabilityOptions::create(*codec);
+          }
+          break;
+        }
+        default: break;
+      }
+    }
+  }
+
   //---------------------------------------------------------------------------
   //---------------------------------------------------------------------------
   //---------------------------------------------------------------------------
@@ -3459,6 +3488,20 @@ namespace ortc
   #pragma mark IRTPTypes::CodecParameters
   #pragma mark
 
+
+  //---------------------------------------------------------------------------
+  IRTPTypes::CodecParameters::CodecParameters(const CodecParameters &source) :
+    mName(source.mName),
+    mPayloadType(source.mPayloadType),
+    mClockRate(source.mClockRate),
+    mPTime(source.mPTime),
+    mMaxPTime(source.mMaxPTime),
+    mNumChannels(source.mNumChannels),
+    mRTCPFeedback(source.mRTCPFeedback)
+  {
+    copyAny(source);
+  }
+
   //---------------------------------------------------------------------------
   IRTPTypes::CodecParameters::CodecParameters(ElementPtr elem)
   {
@@ -3518,6 +3561,20 @@ namespace ortc
     }
   }
 
+  //---------------------------------------------------------------------------
+  IRTPTypes::CodecParameters &IRTPTypes::CodecParameters::operator=(const CodecParameters &source)
+  {
+    mName = source.mName;
+    mPayloadType = source.mPayloadType;
+    mClockRate = source.mClockRate;
+    mPTime = source.mPTime;
+    mMaxPTime = source.mMaxPTime;
+    mNumChannels = source.mNumChannels;
+    mRTCPFeedback = source.mRTCPFeedback;
+    copyAny(source);
+    return *this;
+  }
+
   //---------------------------------------------------------------------------
   ElementPtr IRTPTypes::CodecParameters::createElement(const char *objectName) const
   {
@@ -3597,65 +3654,6 @@ namespace ortc
     return elem;
   }
 
-  //---------------------------------------------------------------------------
-  IRTPTypes::CodecParameters::CodecParameters(const CodecParameters &source) :
-    mName(source.mName),
-    mPayloadType(source.mPayloadType),
-    mClockRate(source.mClockRate),
-    mPTime(source.mPTime),
-    mMaxPTime(source.mMaxPTime),
-    mNumChannels(source.mNumChannels),
-    mRTCPFeedback(source.mRTCPFeedback)
-  {
-    if (source.mParameters) {
-      SupportedCodecs supported = toSupportedCodec(source.mName);
-      switch (supported) {
-        case SupportedCodec_Opus: {
-          auto codec = OpusCodecParameters::convert(source.mParameters);
-          if (codec) {
-            mParameters = OpusCodecParameters::create(*codec);
-          }
-          break;
-        }
-        case SupportedCodec_VP8: {
-          auto codec = VP8CodecParameters::convert(source.mParameters);
-          if (codec) {
-            mParameters = VP8CodecParameters::create(*codec);
-          }
-          break;
-        }
-        case SupportedCodec_H264: {
-          auto codec = H264CodecParameters::convert(source.mParameters);
-          if (codec) {
-            mParameters = H264CodecParameters::create(*codec);
-          }
-          break;
-        }
-        case SupportedCodec_RTX: {
-          auto codec = RTXCodecParameters::convert(source.mParameters);
-          if (codec) {
-            mParameters = RTXCodecParameters::create(*codec);
-          }
-          break;
-        }
-        case SupportedCodec_RED: {
-          auto codec = REDCodecParameters::convert(source.mParameters);
-          if (codec) {
-            mParameters = REDCodecParameters::create(*codec);
-          }
-          break;
-        }
-        case SupportedCodec_FlexFEC: {
-          auto codec = FlexFECCodecParameters::convert(source.mParameters);
-          if (codec) {
-            mParameters = FlexFECCodecParameters::create(*codec);
-          }
-          break;
-        }
-        default: break;
-      }
-    }
-  }
 
   //---------------------------------------------------------------------------
   ElementPtr IRTPTypes::CodecParameters::toDebug() const
@@ -3735,6 +3733,61 @@ namespace ortc
     return hasher->finalizeAsString();
   }
 
+  //---------------------------------------------------------------------------
+  void IRTPTypes::CodecParameters::copyAny(const CodecParameters &source)
+  {
+    mParameters.reset();
+
+    if (!source.mParameters) return;
+
+    SupportedCodecs supported = toSupportedCodec(source.mName);
+    switch (supported) {
+      case SupportedCodec_Opus: {
+        auto codec = OpusCodecParameters::convert(source.mParameters);
+        if (codec) {
+          mParameters = OpusCodecParameters::create(*codec);
+        }
+        break;
+      }
+      case SupportedCodec_VP8: {
+        auto codec = VP8CodecParameters::convert(source.mParameters);
+        if (codec) {
+          mParameters = VP8CodecParameters::create(*codec);
+        }
+        break;
+      }
+      case SupportedCodec_H264: {
+        auto codec = H264CodecParameters::convert(source.mParameters);
+        if (codec) {
+          mParameters = H264CodecParameters::create(*codec);
+        }
+        break;
+      }
+      case SupportedCodec_RTX: {
+        auto codec = RTXCodecParameters::convert(source.mParameters);
+        if (codec) {
+          mParameters = RTXCodecParameters::create(*codec);
+        }
+        break;
+      }
+      case SupportedCodec_RED: {
+        auto codec = REDCodecParameters::convert(source.mParameters);
+        if (codec) {
+          mParameters = REDCodecParameters::create(*codec);
+        }
+        break;
+      }
+      case SupportedCodec_FlexFEC: {
+        auto codec = FlexFECCodecParameters::convert(source.mParameters);
+        if (codec) {
+          mParameters = FlexFECCodecParameters::create(*codec);
+        }
+        break;
+      }
+      default: break;
+    }
+  }
+  
   //---------------------------------------------------------------------------
   //---------------------------------------------------------------------------
   //---------------------------------------------------------------------------
@@ -4106,7 +4159,6 @@ namespace ortc
   const char *IRTPTypes::toString(PriorityTypes type)
   {
     switch (type) {
-      case PriorityType_Unknown:        return "";
       case PriorityType_VeryLow:        return "very-low";
       case PriorityType_Low:            return "low";
       case PriorityType_Medium:         return "medium";
@@ -4125,7 +4177,7 @@ namespace ortc
       if (typeStr == IRTPTypes::toString(index)) return index;
     }
 
-    return PriorityType_Unknown;
+    ORTC_THROW_INVALID_PARAMETERS("unknown priority type");
   }
 
   //---------------------------------------------------------------------------
diff --git a/ortc/cpp/ortc_RTPUtils.cpp b/ortc/cpp/ortc_RTPUtils.cpp
index fad19d97..30e93d0f 100644
--- a/ortc/cpp/ortc_RTPUtils.cpp
+++ b/ortc/cpp/ortc_RTPUtils.cpp
@@ -48,7 +48,7 @@ namespace std {
 }
 #endif //_WIN32
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_rtptypes) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_rtp_types) }
 
 namespace ortc
 {
@@ -70,7 +70,7 @@ namespace ortc
 
     //-------------------------------------------------------------------------
     static const size_t kMinRtpPacketLen = 12;
-    static const size_t kMaxRtpPacketLen = 2048;
+    //static const size_t kMaxRtpPacketLen = 2048;
     static const size_t kMinRtcpPacketLen = 4;
 
     static const uint8_t kRtpVersion = 2;
diff --git a/ortc/cpp/ortc_SCTPTransport.cpp b/ortc/cpp/ortc_SCTPTransport.cpp
index a6ecad50..e39d2db5 100644
--- a/ortc/cpp/ortc_SCTPTransport.cpp
+++ b/ortc/cpp/ortc_SCTPTransport.cpp
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_SCTPTransport.h>
 #include <ortc/internal/ortc_SCTPTransportListener.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
@@ -86,7 +88,7 @@ enum WindowsErrorCompatibility {
   ((sizeof(a) / sizeof(*(a))) /                     \
   static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_sctp_datachannel) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_sctp_data_channel) }
 
 namespace ortc
 {
@@ -274,9 +276,9 @@ namespace ortc
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
-#pragma mark
-#pragma mark SCTPTransportSettingsDefaults
-#pragma mark
+    #pragma mark
+    #pragma mark SCTPTransportSettingsDefaults
+    #pragma mark
 
     class SCTPTransportSettingsDefaults : public ISettingsApplyDefaultsDelegate
     {
@@ -321,21 +323,21 @@ namespace ortc
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
-#pragma mark
-#pragma mark SCTPInit
-#pragma mark
+    #pragma mark
+    #pragma mark SCTPInit
+    #pragma mark
 
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-#pragma mark
-#pragma mark SCTPInit
-#pragma mark
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark SCTPInit
+    #pragma mark
 
-// code borrowed from:
-// https://chromium.googlesource.com/external/webrtc/+/master/talk/media/sctp/sctpdataengine.cc
-// https://chromium.googlesource.com/external/webrtc/+/master/talk/media/sctp/sctpdataengine.h
+    // code borrowed from:
+    // https://chromium.googlesource.com/external/webrtc/+/master/talk/media/sctp/sctpdataengine.cc
+    // https://chromium.googlesource.com/external/webrtc/+/master/talk/media/sctp/sctpdataengine.h
 
     class SCTPInit : public ISingletonManagerDelegate
     {
@@ -520,7 +522,6 @@ namespace ortc
 
         const SCTPPayloadProtocolIdentifier ppid = static_cast<SCTPPayloadProtocolIdentifier>(ntohl(rcv.rcv_ppid));
 
-
         if (0 == (flags & MSG_NOTIFICATION)) {
           switch (ppid) {
           case SCTP_PPID_CONTROL:
@@ -566,11 +567,11 @@ namespace ortc
 
     protected:
       //-----------------------------------------------------------------------
-#pragma mark
-#pragma mark SCTPInit => (internal)
-#pragma mark
+      #pragma mark
+      #pragma mark SCTPInit => (internal)
+      #pragma mark
 
-//-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
       Log::Params log(const char *message) const
       {
         ElementPtr objectEl = Element::create("ortc::SCTPInit");
@@ -671,13 +672,13 @@ namespace ortc
     const char *SCTPTransport::toString(InternalStates state)
     {
       switch (state) {
-      case InternalState_New:                     return "new";
-      case InternalState_Connecting:              return "connecting";
-      case InternalState_ConnectingDisrupted:     return "connecting disrupted";
-      case InternalState_Ready:                   return "ready";
-      case InternalState_Disconnected:            return "disconnected";
-      case InternalState_ShuttingDown:            return "shutting down";
-      case InternalState_Shutdown:                return "shutdown";
+        case InternalState_New:                     return "new";
+        case InternalState_Connecting:              return "connecting";
+        case InternalState_ConnectingDisrupted:     return "connecting disrupted";
+        case InternalState_Ready:                   return "ready";
+        case InternalState_Disconnected:            return "disconnected";
+        case InternalState_ShuttingDown:            return "shutting down";
+        case InternalState_Shutdown:                return "shutdown";
       }
       return "UNDEFINED";
     }
@@ -686,31 +687,34 @@ namespace ortc
     ISCTPTransportTypes::States SCTPTransport::toState(InternalStates state)
     {
       switch (state) {
-      case InternalState_New:                   return ISCTPTransportTypes::State_New;
-      case InternalState_Connecting:            return ISCTPTransportTypes::State_Connecting;
-      case InternalState_ConnectingDisrupted:   return ISCTPTransportTypes::State_Connecting;
-      case InternalState_Ready:                 return ISCTPTransportTypes::State_Connected;
-      case InternalState_Disconnected:          return ISCTPTransportTypes::State_Connected;
-      case InternalState_ShuttingDown:          return ISCTPTransportTypes::State_Closed;
-      case InternalState_Shutdown:              return ISCTPTransportTypes::State_Closed;
+        case InternalState_New:                   return ISCTPTransportTypes::State_New;
+        case InternalState_Connecting:            return ISCTPTransportTypes::State_Connecting;
+        case InternalState_ConnectingDisrupted:   return ISCTPTransportTypes::State_Connecting;
+        case InternalState_Ready:                 return ISCTPTransportTypes::State_Connected;
+        case InternalState_Disconnected:          return ISCTPTransportTypes::State_Connected;
+        case InternalState_ShuttingDown:          return ISCTPTransportTypes::State_Closed;
+        case InternalState_Shutdown:              return ISCTPTransportTypes::State_Closed;
       }
-      ZS_THROW_NOT_IMPLEMENTED(String("state is not implemented:") + toString(state))
-        return ISCTPTransportTypes::State_Closed;
+      ZS_THROW_NOT_IMPLEMENTED(String("state is not implemented:") + toString(state));
+      return ISCTPTransportTypes::State_Closed;
     }
 
     //-------------------------------------------------------------------------
     SCTPTransport::SCTPTransport(
-      const make_private &,
-      IMessageQueuePtr queue,
-      UseListenerPtr listener,
-      UseSecureTransportPtr secureTransport,
-      WORD localPort,
-      WORD remotePort
-    ) :
+                                 const make_private &,
+                                 IMessageQueuePtr queue,
+                                 ISCTPTransportDelegatePtr originalDelegate,
+                                 UseListenerPtr listener,
+                                 UseSecureTransportPtr secureTransport,
+                                 WORD localPort,
+                                 WORD remotePort
+                                 ) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
       mSCTPInit(SCTPInit::singleton()),
       mMaxSessionsPerPort(ISettings::getUInt(ORTC_SETTING_SCTP_TRANSPORT_MAX_SESSIONS_PER_PORT)),
+      mSubscriptions(decltype(mSubscriptions)::create()),
+      mDataChannelSubscriptions(decltype(mDataChannelSubscriptions)::create()),
       mListener(listener),
       mSecureTransport(secureTransport),
       mDeliveryQueue(IORTCForInternal::queueORTCPipeline()),
@@ -732,18 +736,21 @@ namespace ortc
 
       ZS_LOG_DETAIL(debug("created"));
 
-      ORTC_THROW_INVALID_STATE_IF(!mSCTPInit)
+      ORTC_THROW_INVALID_STATE_IF(!mSCTPInit);
+
+      if (originalDelegate) {
+        mDefaultSubscription = mSubscriptions.subscribe(originalDelegate, IORTCForInternal::queueDelegate());
+      }
     }
 
     //-------------------------------------------------------------------------
     void SCTPTransport::init()
     {
       AutoRecursiveLock lock(*this);
-      //IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
 
-      ZS_LOG_DETAIL(debug("SCTP init"))
+      ZS_LOG_DETAIL(debug("SCTP init"));
 
-        auto secureTransport = mSecureTransport.lock();
+      auto secureTransport = mSecureTransport.lock();
       if (secureTransport) {
         mSecureTransportSubscription = secureTransport->subscribe(mThisWeak.lock());
       }
@@ -756,8 +763,8 @@ namespace ortc
     {
       if (isNoop()) return;
 
-      ZS_LOG_DETAIL(log("destroyed"))
-        mThisWeak.reset();
+      ZS_LOG_DETAIL(log("destroyed"));
+      mThisWeak.reset();
       mThisSocket->reset();
 
       cancel();
@@ -815,7 +822,6 @@ namespace ortc
       return PromiseWithStatsReport::createRejected(IORTCForInternal::queueDelegate());
     }
 
-
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -831,6 +837,29 @@ namespace ortc
       return transport->toDebug();
     }
 
+    //-------------------------------------------------------------------------
+    PUID SCTPTransport::getID() const
+    {
+      AutoRecursiveLock lock(*this);
+
+      // Caller has seen the real ID thus do not hide the real ID.
+      if (mObtainedID) return mID;
+
+      // Ideally the redirect transport and this transport woud have the same
+      // ID but that's not possible. To the external world hide the ID of
+      // this transport's real ID if the redirect transport is in place. But
+      // do not hide the ID if the real ID has been revealed before the
+      // redirect was put into place.
+      if (mRedirectToExistingTransport) {
+        // Once a redirect is in place the redirect linkage cannot be broken.
+        return mRedirectToExistingTransport->getID();
+      }
+
+      // Caller has obtained real ID so this ID cannot change for this object.
+      mObtainedID = true; // mutuable
+      return mID;
+    }
+
     //-------------------------------------------------------------------------
     ISCTPTransportPtr SCTPTransport::create(
       ISCTPTransportDelegatePtr delegate,
@@ -856,12 +885,19 @@ namespace ortc
         inLocalPort = allocatedLocalPort.value();
       }
 
-      SCTPTransportPtr pThis(make_shared<SCTPTransport>(make_private{}, IORTCForInternal::queueORTC(), listener, useSecureTransport));
+      SCTPTransportPtr pThis(make_shared<SCTPTransport>(make_private{}, IORTCForInternal::queueORTC(), delegate, listener, useSecureTransport));
       pThis->mThisWeak = pThis;
       pThis->mThisSocket = new SCTPTransportWeakPtr(pThis);
 
       ISCTPTransportPtr registeredTransport = pThis;
 
+      // A tear away is created to allow caller to hold an instance of the tear
+      // away as a means to ensure an instance of the listener is held as
+      // well as this object since both objects are needed. This object cannot
+      // hold an instance directly to the listener as the listener holds
+      // instances to every SCTP transport as that would cause a circular
+      // reference. Thus by using a tear away to hold the references to this
+      // object and the listener prevents the circular reference.
       auto tearAway = ISCTPTransportTearAway::create(registeredTransport, make_shared<TearAwayData>());
       ORTC_THROW_INVALID_STATE_IF(!tearAway);
 
@@ -869,7 +905,6 @@ namespace ortc
       ORTC_THROW_INVALID_STATE_IF(!tearAwayData);
 
       tearAwayData->mListener = listener;
-      tearAwayData->mDelegate = delegate;
 
       AutoRecursiveLock lock(*pThis);
       pThis->mTearAway = tearAway;
@@ -883,39 +918,47 @@ namespace ortc
     ISCTPTransportTypes::States SCTPTransport::state() const
     {
       AutoRecursiveLock lock(*this);
+      if (mRedirectToExistingTransport) return mRedirectToExistingTransport->state();
       return mLastReportedState;
     }
 
     //-------------------------------------------------------------------------
     IDTLSTransportPtr SCTPTransport::transport() const
     {
+      // NOTE: Redirect and this object must share same secure transport.
       return DTLSTransport::convert(mSecureTransport.lock());
     }
 
     //-------------------------------------------------------------------------
     WORD SCTPTransport::port() const
     {
+      // NOTE: Redirect and this object must share same secure port.
       return mLocalPort;
     }
 
     //-------------------------------------------------------------------------
     WORD SCTPTransport::localPort() const
     {
+      // NOTE: Redirect and this object must share same secure port.
       return mLocalPort;
     }
 
     //-------------------------------------------------------------------------
     Optional<WORD> SCTPTransport::remotePort() const
     {
+      // NOTE: Redirect and this object must share same secure port.
       return mRemotePort;
     }
 
     //-------------------------------------------------------------------------
     ISCTPTransportTypes::PromiseWithSocketOptionsPtr SCTPTransport::getOptions(const SocketOptions &inWhichOptions)
     {
+      AutoRecursiveLock lock(*this);
+
+      if (mRedirectToExistingTransport) return mRedirectToExistingTransport->getOptions(inWhichOptions);
+
       auto promise = PromiseWithSocketOptions::create(IORTCForInternal::queueDelegate());
 
-      AutoRecursiveLock lock(*this);
       if ((isShuttingDown()) ||
           (isShutdown())) {
         promise->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "transport is closing or closed"));
@@ -941,10 +984,12 @@ namespace ortc
     //-------------------------------------------------------------------------
     PromisePtr SCTPTransport::setOptions(const SocketOptions &inOptions)
     {
-      auto promise = Promise::create(IORTCForInternal::queueDelegate());
-
       AutoRecursiveLock lock(*this);
 
+      if (mRedirectToExistingTransport) return mRedirectToExistingTransport->setOptions(inOptions);
+
+      auto promise = Promise::create(IORTCForInternal::queueDelegate());
+
       if ((isShuttingDown()) ||
           (isShutdown())) {
         promise->reject(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "transport is closing or closed"));
@@ -987,15 +1032,35 @@ namespace ortc
       ZS_LOG_DEBUG(log("start called") + remoteCapabilities.toDebug());
 
       AutoRecursiveLock lock(*this);
+
+      if (mRedirectToExistingTransport) {
+        mRedirectToExistingTransport->start(remoteCapabilities, inRemotePort);
+        return;
+      }
+
       if ((isShuttingDown()) ||
           (isShutdown())) {
         ORTC_THROW_INVALID_STATE("already shutting down");
       }
 
       if (mCapabilities) {
-        ORTC_THROW_INVALID_STATE("already started");
+        ORTC_THROW_INVALID_STATE_IF(!mStartedFromListener);
+        if (mStartedFromListener) {
+          // Not allowed to change capabilities after declaring the
+          // capabilities to the sctp transport listener.
+          ORTC_THROW_INVALID_STATE_IF(mCapabilities->mMaxMessageSize != remoteCapabilities.mMaxMessageSize);
+          ORTC_THROW_INVALID_STATE_IF(mCapabilities->mMaxSessionsPerPort != remoteCapabilities.mMaxSessionsPerPort);
+        }
+        ZS_LOG_DEBUG(log("already started"));
+        mStartedFromListener = false;
+
+        // Needed to ensure any moved requests from a redirection get handled.
+        IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
+        return;
       }
 
+      mStartedFromListener = false;
+
       if (0 != inRemotePort) {
         mRemotePort = inRemotePort;
       }
@@ -1019,33 +1084,134 @@ namespace ortc
         ORTC_THROW_INVALID_PARAMETERS("unable to allocate port, local port=" + string(mLocalPort) + ", remote port=" + string(remotePort));
       }
 
-      auto usePThis = SCTPTransport::convert(forListener);
-
       mLocalPort = localPort;
       mRemotePort = remotePort;
+      mCapabilities = make_shared<Capabilities>(remoteCapabilities);
+
+      // The SCTP transport used in the mapping of local:remote may already
+      // exist if the remote party initialized an SCTP transport before the
+      // local side has a chance to start its SCTP transport. This ensures
+      // this object remaps all requrests to an existing SCTP transport rather
+      // than creating a duplicate transport.
+      if (forListener != originalForListener) {
+        mRedirectToExistingTransport = SCTPTransport::convert(forListener);
+
+        if (mRedirectToExistingTransport) {
+          AutoRecursiveLock lock(*mRedirectToExistingTransport);
 
-      auto originalTearAwayInterface = mTearAway.lock();
-      auto tearAway = ISCTPTransportTearAway::tearAway(originalTearAwayInterface);
-      if (tearAway) {
-        tearAway->setDelegate(usePThis);
-
-        auto tearAwayData = ISCTPTransportTearAway::data(originalTearAwayInterface);
-        if (tearAwayData) {
-          auto delegate = tearAwayData->mDelegate.lock();
-          if ((!tearAwayData->mDefaultSubscription) &&
-              (delegate)) {
-            tearAwayData->mDefaultSubscription = usePThis->subscribe(delegate);
-            tearAwayData->mDelegate.reset();
+          if ((mRedirectToExistingTransport->isShuttingDown()) ||
+              (mRedirectToExistingTransport->isShutdown())) {
+            ORTC_THROW_INVALID_STATE("already shutting down");
           }
-        }
-      }
 
-      if (forListener != originalForListener) {
-        cancel();
+          // Need to move get/set options to new transport
+          {
+            for (auto iter = mGetSocketOptions.begin(); iter != mGetSocketOptions.end(); ++iter) {
+              auto &value = (*iter);
+              mRedirectToExistingTransport->mGetSocketOptions.push_back(value);
+            }
+            for (auto iter = mSetSocketOptions.begin(); iter != mSetSocketOptions.end(); ++iter) {
+              auto &value = (*iter);
+              mRedirectToExistingTransport->mSetSocketOptions.push_back(value);
+            }
+
+            mGetSocketOptions.clear();
+            mSetSocketOptions.clear();
+          }
+
+          // Need to move the existing data channels to the redirected transport.
+          {
+            for (auto iter = mSessions.begin(); iter != mSessions.end(); ++iter) {
+              auto &sessionID = (*iter).first;
+              auto &dataChannel = (*iter).second;
+              if (!dataChannel) continue;
+
+              bool remapped = false;
+
+              try {
+                SessionID tempID = sessionID;
+                UseDataChannelPtr channel = dataChannel;
+
+                if (!mRedirectToExistingTransport->isSessionAvailable(sessionID)) goto skip_register;
+                mRedirectToExistingTransport->registerNewDataChannel(channel, tempID);
+                remapped = true;
+              } catch(const InvalidParameters &e) {
+                goto skip_register;
+              } catch(const InvalidStateError &e) {
+                goto skip_register;
+              }
+
+            skip_register:
+              {
+                if (!remapped) {
+                  mFilterSessionRequests.insert(sessionID);
+                  dataChannel->notifyRemapFailure();
+                  continue;
+                }
+
+                auto found = mAnnouncedIncomingDataChannels.find(dataChannel->getID());
+                if (found != mAnnouncedIncomingDataChannels.end()) {
+                  mRedirectToExistingTransport->mAnnouncedIncomingDataChannels[dataChannel->getID()] = dataChannel;
+                }
+              }
+            }
+
+            // sessions being reset should also be moved to a new transport
+            for (auto iter = mPendingResetSessions.begin(); iter != mPendingResetSessions.end(); ++iter) {
+              auto &sessionID = (*iter).first;
+              auto &dataChannel = (*iter).second;
+              if (!dataChannel) continue;
+
+              if (!mRedirectToExistingTransport->isSessionAvailable(sessionID)) {
+                mFilterSessionRequests.insert(sessionID);
+                dataChannel->notifyClosed();
+                continue;
+              }
+              auto found = mAnnouncedIncomingDataChannels.find(dataChannel->getID());
+              if (found != mAnnouncedIncomingDataChannels.end()) {
+                mRedirectToExistingTransport->mAnnouncedIncomingDataChannels[dataChannel->getID()] = dataChannel;
+              }
+              mRedirectToExistingTransport->mPendingResetSessions[sessionID] = dataChannel;
+            }
+
+            // sessions queued to reset should also be moved to a new transport
+            for (auto iter = mQueuedResetSessions.begin(); iter != mQueuedResetSessions.end(); ++iter) {
+              auto &sessionID = (*iter).first;
+              auto &dataChannel = (*iter).second;
+              if (!dataChannel) continue;
+
+              if (!mRedirectToExistingTransport->isSessionAvailable(sessionID)) {
+                mFilterSessionRequests.insert(sessionID);
+                dataChannel->notifyClosed();
+                continue;
+              }
+              auto found = mAnnouncedIncomingDataChannels.find(dataChannel->getID());
+              if (found != mAnnouncedIncomingDataChannels.end()) {
+                mRedirectToExistingTransport->mAnnouncedIncomingDataChannels[dataChannel->getID()] = dataChannel;
+              }
+              mRedirectToExistingTransport->mQueuedResetSessions[sessionID] = dataChannel;
+            }
+
+            // everything is now moved
+            mSessions.clear();
+            mPendingResetSessions.clear();
+            mQueuedResetSessions.clear();
+            mAnnouncedIncomingDataChannels.clear();
+
+            // finally is socket is setup then kill the socket
+            if (mSocket) {
+              usrsctp_close(mSocket);
+              mSocket = NULL;
+              usrsctp_deregister_address(mThisSocket);
+            }
+          }
+
+          mRedirectToExistingTransportSubscription = mRedirectToExistingTransport->subscribe(mThisWeak.lock());
+          mRedirectToExistingTransport->start(remoteCapabilities, inRemotePort);
+        }
         return;
       }
 
-      mCapabilities = make_shared<Capabilities>(remoteCapabilities);
       IWakeDelegateProxy::create(mThisWeak.lock())->onWake();
     }
 
@@ -1056,13 +1222,14 @@ namespace ortc
       ZS_LOG_DEBUG(log("stop called"))
 
       AutoRecursiveLock lock(*this);
+      if (mRedirectToExistingTransport) return mRedirectToExistingTransport->stop();
       cancel();
     }
 
     //-------------------------------------------------------------------------
     ISCTPTransportSubscriptionPtr SCTPTransport::subscribe(ISCTPTransportDelegatePtr originalDelegate)
     {
-      ZS_LOG_DETAIL(log("subscribing to transport state"))
+      ZS_LOG_DETAIL(log("subscribing to transport state"));
 
       AutoRecursiveLock lock(*this);
 
@@ -1073,15 +1240,29 @@ namespace ortc
       if (delegate) {
         SCTPTransportPtr pThis = mThisWeak.lock();
 
-        for (auto iter = mAnnouncedIncomingDataChannels.begin(); iter != mAnnouncedIncomingDataChannels.end(); ++iter) {
-          // NOTE: ID of data channels are always greater than last so order
-          // should be guarenteed.
-          auto dataChannel = (*iter).second;
-          delegate->onSCTPTransportDataChannel(mThisWeak.lock(), DataChannel::convert(dataChannel));
-        }
+        if (mRedirectToExistingTransport) {
+          AutoRecursiveLock lock(*mRedirectToExistingTransport);
+
+          for (auto iter = mRedirectToExistingTransport->mAnnouncedIncomingDataChannels.begin(); iter != mRedirectToExistingTransport->mAnnouncedIncomingDataChannels.end(); ++iter) {
+            // NOTE: ID of data channels are always greater than last so order should be guarenteed.
+            auto dataChannel = (*iter).second;
+            delegate->onSCTPTransportDataChannel(pThis, DataChannel::convert(dataChannel));
+          }
+
+          if (State_New != mRedirectToExistingTransport->mLastReportedState) {
+            delegate->onSCTPTransportStateChange(pThis, mRedirectToExistingTransport->mLastReportedState);
+          }
+        } else {
+          for (auto iter = mAnnouncedIncomingDataChannels.begin(); iter != mAnnouncedIncomingDataChannels.end(); ++iter) {
+            // NOTE: ID of data channels are always greater than last so order
+            // should be guarenteed.
+            auto dataChannel = (*iter).second;
+            delegate->onSCTPTransportDataChannel(pThis, DataChannel::convert(dataChannel));
+          }
 
-        if (State_New != mLastReportedState) {
-          delegate->onSCTPTransportStateChange(pThis, mLastReportedState);
+          if (State_New != mLastReportedState) {
+            delegate->onSCTPTransportStateChange(pThis, mLastReportedState);
+          }
         }
       }
 
@@ -1108,6 +1289,11 @@ namespace ortc
     {
       AutoRecursiveLock lock(*this);
 
+      if (mRedirectToExistingTransport) {
+        mRedirectToExistingTransport->registerNewDataChannel(ioDataChannel, ioSessionID);
+        return;
+      }
+
       UseDataChannelPtr dataChannel = ioDataChannel;
       WORD sessionID = ioSessionID;
 
@@ -1215,7 +1401,9 @@ namespace ortc
       ZS_LOG_DETAIL(log("datachannel subscribing to SCTP Transport"))
       
       AutoRecursiveLock lock(*this);
-      
+
+      if (mRedirectToExistingTransport) return mRedirectToExistingTransport->subscribe(originalDelegate);
+
       ISCTPTransportForDataChannelSubscriptionPtr subscription = mDataChannelSubscriptions.subscribe(originalDelegate, IORTCForInternal::queueORTC());
       
       ISCTPTransportForDataChannelDelegatePtr delegate = mDataChannelSubscriptions.delegate(subscription, true);
@@ -1238,6 +1426,8 @@ namespace ortc
     //-------------------------------------------------------------------------
     bool SCTPTransport::isReady() const
     {
+      AutoRecursiveLock lock(*this);
+      if (mRedirectToExistingTransport) return mRedirectToExistingTransport->isReady();
       return InternalState_Ready == mCurrentState;
     }
 
@@ -1252,6 +1442,12 @@ namespace ortc
 
       AutoRecursiveLock lock(*this);
 
+      if (mRedirectToExistingTransport) {
+        if (mFilterSessionRequests.end() != mFilterSessionRequests.find(params->mID.value())) return;
+        mRedirectToExistingTransport->announceIncoming(dataChannel, params);
+        return;
+      }
+
       auto found = mSessions.find(params->mID.value());
       if (found == mSessions.end()) {
         ZS_LOG_WARNING(Debug, log("cannot announce incoming session as it is not active") + params->toDebug())
@@ -1289,13 +1485,19 @@ namespace ortc
                     bool, hasMaxRetransmits, packet->mMaxRetransmits.hasValue(),
                     ulong, maxRetransmits, packet->mMaxRetransmits.value(),
                     buffer, data, ((bool)packet->mBuffer) ? packet->mBuffer->BytePtr() : NULL,
-                    size, size, ((bool)packet->mBuffer) ? SafeInt<unsigned int>(packet->mBuffer->SizeInBytes()) : 0
+                    size, size, ((bool)packet->mBuffer) ? size_t((SafeInt<unsigned int>(packet->mBuffer->SizeInBytes()))) : 0
                     );
 
-      ZS_DECLARE_TYPEDEF_PTR(ISCTPTransportForDataChannel::RejectReason, RejectReason)
+      ZS_DECLARE_TYPEDEF_PTR(ISCTPTransportForDataChannel::RejectReason, RejectReason);
+
       {
         AutoRecursiveLock lock(*this);
 
+        if (mRedirectToExistingTransport) {
+          if (mFilterSessionRequests.end() != mFilterSessionRequests.find(packet->mSessionID)) return Promise::createRejected(RejectReason::create(UseHTTP::HTTPStatusCode_Conflict, "cannot send because of a remap conflict"), IORTCForInternal::queueORTC());;
+          return mRedirectToExistingTransport->sendDataNow(packet);
+        }
+
         if ((isShuttingDown()) ||
             (isShutdown())) {
           ZS_LOG_WARNING(Debug, log("cannot send data while shutting down / shutdown"))
@@ -1351,6 +1553,12 @@ namespace ortc
 
       AutoRecursiveLock lock(*this);
 
+      if (mRedirectToExistingTransport) {
+        if (mFilterSessionRequests.end() != mFilterSessionRequests.find(sessionID)) return;
+        mRedirectToExistingTransport->requestShutdown(dataChannel, sessionID);
+        return;
+      }
+
       if (isShutdown()) {
         ZS_LOG_WARNING(Trace, log("already shutdown transport"))
         dataChannel->notifyClosed();
@@ -1433,13 +1641,34 @@ namespace ortc
                                                         WORD localPort
                                                         )
     {
-      SCTPTransportPtr pThis(make_shared<SCTPTransport>(make_private {}, IORTCForInternal::queueORTC(), listener, secureTransport, localPort));
+      SCTPTransportPtr pThis(make_shared<SCTPTransport>(make_private {}, IORTCForInternal::queueORTC(), ISCTPTransportDelegatePtr(), listener, secureTransport, localPort));
       pThis->mThisWeak = pThis;
       pThis->mThisSocket = new SCTPTransportWeakPtr(pThis);
       pThis->init();
       return pThis;
     }
 
+    //-------------------------------------------------------------------------
+    void SCTPTransport::startFromListener(
+                                          const Capabilities &remoteCapabilities,
+                                          WORD remotePort
+                                          ) throw (InvalidStateError, InvalidParameters)
+    {
+      AutoRecursiveLock lock(*this);
+
+      if (mRedirectToExistingTransport) {
+        mRedirectToExistingTransport->startFromListener(remoteCapabilities, remotePort);
+        return;
+      }
+
+      if (mCapabilities) {
+        ZS_LOG_DEBUG(log("already started from remote"));
+        return;
+      }
+      start(remoteCapabilities, remotePort);
+      mStartedFromListener = true;
+    }
+
     //-------------------------------------------------------------------------
     bool SCTPTransport::handleDataPacket(
                                          const BYTE *buffer,
@@ -1461,6 +1690,8 @@ namespace ortc
       {
         AutoRecursiveLock lock(*this);
 
+        if (mRedirectToExistingTransport) return mRedirectToExistingTransport->handleDataPacket(buffer, bufferLengthInBytes);
+
         {
           if (isShutdown()) {
             ZS_LOG_WARNING(Debug, log("packet arrived after shutdown"))
@@ -1535,10 +1766,53 @@ namespace ortc
                     size, size, bufferLengthInBytes
                     );
 
+      // NOTE: No need to redirect to existing transport as same secure
+      // secure transport is used.
       return transport->sendDataPacket(buffer, bufferLengthInBytes);
     }
 
 
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark SCTPTransport => ISCTPTransportDelegate
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    void SCTPTransport::onSCTPTransportStateChange(
+                                                   ISCTPTransportPtr transport,
+                                                   ISCTPTransportTypes::States state
+                                                   )
+    {
+      auto pThis = mThisWeak.lock();
+
+      ZS_EVENTING_1(x, i, Detail, SctpTransportInternalSCTPTransportStateChange, ol, SctpTransport, InternalEvent, puid, id, mID);
+
+      AutoRecursiveLock lock(*this);
+
+      // simulate redirect transport event as if it came from this transport
+      mSubscriptions.delegate()->onSCTPTransportStateChange(pThis, state);
+    }
+
+    //-------------------------------------------------------------------------
+    void SCTPTransport::onSCTPTransportDataChannel(
+                                                   ISCTPTransportPtr transport,
+                                                   IDataChannelPtr channel
+                                                   )
+    {
+      auto pThis = mThisWeak.lock();
+
+      ZS_EVENTING_1(x, i, Detail, SctpTransportInternalSCTPTransportDataChannel, ol, SctpTransport, InternalEvent, puid, id, mID);
+
+      AutoRecursiveLock lock(*this);
+
+      // simulate redirect transport event as if it came from this transport
+      mSubscriptions.delegate()->onSCTPTransportDataChannel(pThis, channel);
+    }
+
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -1592,7 +1866,7 @@ namespace ortc
                     dword, timestamp, packet->mTimestamp,
                     int, flags, packet->mFlags,
                     buffer, data, ((bool)packet->mBuffer) ? packet->mBuffer->BytePtr() : NULL,
-                    size, size, ((bool)packet->mBuffer) ? SafeInt<unsigned int>(packet->mBuffer->SizeInBytes()) : 0
+                    size, size, ((bool)packet->mBuffer) ? size_t(SafeInt<unsigned int>(packet->mBuffer->SizeInBytes())) : 0
                     );
 
       ZS_LOG_TRACE(log("on incoming packet") + packet->toDebug())
@@ -1609,6 +1883,10 @@ namespace ortc
         ZS_THROW_INVALID_ASSUMPTION_IF(notification.sn_header.sn_length != packet->mBuffer->SizeInBytes())
 
         AutoRecursiveLock lock(*this);
+        if (mRedirectToExistingTransport) {
+          mRedirectToExistingTransport->handleNotificationPacket(notification);
+          return;
+        }
         handleNotificationPacket(notification);
         return;
       }
@@ -1618,6 +1896,12 @@ namespace ortc
       {
         AutoRecursiveLock lock(*this);
 
+        if (mRedirectToExistingTransport) {
+          if (mFilterSessionRequests.end() != mFilterSessionRequests.find(packet->mSessionID)) return;
+          mRedirectToExistingTransport->onIncomingPacket(packet);
+          return;
+        }
+
         // scope: check active sessions
         {
           auto found = mSessions.find(packet->mSessionID);
@@ -1676,7 +1960,7 @@ namespace ortc
                       dword, timestamp, packet->mTimestamp,
                       int, flags, packet->mFlags,
                       buffer, data, ((bool)packet->mBuffer) ? packet->mBuffer->BytePtr() : NULL,
-                      size, size, ((bool)packet->mBuffer) ? SafeInt<unsigned int>(packet->mBuffer->SizeInBytes()) : 0          
+                      size, size, ((bool)packet->mBuffer) ? size_t(SafeInt<unsigned int>(packet->mBuffer->SizeInBytes())) : 0
                       );
         ZS_LOG_TRACE(log("forwarding to data channel") + ZS_PARAM("data channel", dataChannel->getID()) + packet->toDebug());
         dataChannel->handleSCTPPacket(packet);
@@ -1689,6 +1973,10 @@ namespace ortc
       ZS_LOG_TRACE(log("on notified to shutdown"))
 
       AutoRecursiveLock lock(*this);
+      if (mRedirectToExistingTransport) {
+        mRedirectToExistingTransport->onNotifiedToShutdown();
+        return;
+      }
       cancel();
     }
 
@@ -1753,6 +2041,8 @@ namespace ortc
     {
       AutoRecursiveLock lock(*this);
 
+      if (mRedirectToExistingTransport) return mRedirectToExistingTransport->toDebug();
+
       ElementPtr resultEl = Element::create("ortc::SCTPTransport");
 
       IHelper::debugAppend(resultEl, "id", mID);
@@ -1827,7 +2117,12 @@ namespace ortc
     //-------------------------------------------------------------------------
     void SCTPTransport::step()
     {
-      ZS_LOG_DEBUG(debug("step"))
+      ZS_LOG_DEBUG(debug("step"));
+
+      if (mRedirectToExistingTransport) {
+        mRedirectToExistingTransport->step();
+        return;
+      }
 
       if ((isShuttingDown()) ||
           (isShutdown())) {
@@ -1899,7 +2194,31 @@ namespace ortc
         }
         case ISecureTransportTypes::State_Connected:
         {
-          ZS_LOG_TRACE(log("secure transport already notified ready"))
+          ZS_LOG_TRACE(log("secure transport already notified ready"));
+          InternalStates currentState = mCurrentState;
+          switch (currentState)
+          {
+            case InternalState_New:
+            case InternalState_Connecting:
+            case InternalState_ConnectingDisrupted:
+            {
+              setState(InternalState_Connecting);
+              break;
+            }
+            case InternalState_Ready:
+            case InternalState_Disconnected:
+            {
+              setState(InternalState_Ready);
+              break;
+            }
+            case InternalState_ShuttingDown:
+            case InternalState_Shutdown:
+            {
+              ZS_LOG_WARNING(Trace, log("already shutting down"))
+              cancel();
+              return false;
+            }
+          }
           break;
         }
         case ISecureTransportTypes::State_Disconnected:
@@ -1938,13 +2257,11 @@ namespace ortc
         }
       }
 
-
-      if (!mSettledRole) {
+      if (mSettledRole) {
         ZS_LOG_TRACE(log("role of secure transport already settled"))
         return true;
       }
 
-
       ZS_LOG_DEBUG(log("secure transport notified ready"))
 
       mSettledRole = true;
diff --git a/ortc/cpp/ortc_SCTPTransportListener.cpp b/ortc/cpp/ortc_SCTPTransportListener.cpp
index c893cea9..70799290 100644
--- a/ortc/cpp/ortc_SCTPTransportListener.cpp
+++ b/ortc/cpp/ortc_SCTPTransportListener.cpp
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_SCTPTransportListener.h>
 #include <ortc/internal/ortc_SCTPTransport.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
@@ -55,7 +57,7 @@
 #endif //_DEBUG
 
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_sctp_datachannel) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_sctp_data_channel) }
 
 namespace ortc
 {
@@ -276,6 +278,7 @@ namespace ortc
                                                  ) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create()),
       mSecureTransport(DTLSTransport::convert(secureTransport)),
       mMaxPorts(SafeInt<decltype(mMaxPorts)>(ISettings::getUInt(ORTC_SETTING_SCTP_TRANSPORT_LISTENER_MAX_PORTS))),
       mCurrentAllocationPort(SafeInt<decltype(mCurrentAllocationPort)>(ISettings::getUInt(ORTC_SETTING_SCTP_TRANSPORT_LISTENER_DEFAULT_PORT))),
@@ -463,7 +466,7 @@ namespace ortc
           if (found != mTransports.end()) {
             ioTransport = (*found).second;
 
-            ZS_LOG_TRACE(log("found existing transport") + ZS_PARAM("transport", ioTransport->getID()) + ZS_PARAM("local port", localPort) + ZS_PARAM("remote port", remotePort) + ZS_PARAM("tuple id", tupleID));
+            ZS_LOG_TRACE(log("found existing transport") + ZS_PARAM("transport", ioTransport->getRealID()) + ZS_PARAM("local port", localPort) + ZS_PARAM("remote port", remotePort) + ZS_PARAM("tuple id", tupleID));
 
             if ((ioTransport->isShuttingDown()) ||
                 (ioTransport->isShutdown())) {
@@ -483,7 +486,7 @@ namespace ortc
                           word, remotePort, ioRemotePort
                           );
 
-            ZS_LOG_DEBUG(log("found existing transport") + ZS_PARAM("transport", ioTransport->getID()) + ZS_PARAM("local port", localPort) + ZS_PARAM("remote port", remotePort) + ZS_PARAM("tuple id", tupleID));
+            ZS_LOG_DEBUG(log("found existing transport") + ZS_PARAM("transport", ioTransport->getRealID()) + ZS_PARAM("local port", localPort) + ZS_PARAM("remote port", remotePort) + ZS_PARAM("tuple id", tupleID));
             return;
           }
 
@@ -538,7 +541,7 @@ namespace ortc
                       word, localPort, ioLocalPort,
                       word, remotePort, ioRemotePort
                       );
-        ZS_LOG_DEBUG(log("registered local/remote port pairing") + ZS_PARAM("transport", ioTransport->getID()) + ZS_PARAM("local port", localPort) + ZS_PARAM("remote port", remotePort) + ZS_PARAM("tuple id", tupleID));
+        ZS_LOG_DEBUG(log("registered local/remote port pairing") + ZS_PARAM("transport", ioTransport->getRealID()) + ZS_PARAM("local port", localPort) + ZS_PARAM("remote port", remotePort) + ZS_PARAM("tuple id", tupleID));
 
         mTransports[tupleID] = ioTransport;
       }
@@ -568,16 +571,16 @@ namespace ortc
       ZS_EVENTING_4(
                     x, i, Detail, SctpTransportListenerSctpTransportEvent, ol, SctpTransportListener, InternalEvent,
                     puid, id, mID,
-                    puid, secureTransportId, transport->getID(),
+                    puid, secureTransportId, transport->getRealID(),
                     word, localPort, localPort,
                     word, remotePort, remotePort
                     );
 
-      ZS_LOG_DEBUG(log("announcing incoming transport") + ZS_PARAM("transport", transport->getID()))
+      ZS_LOG_DEBUG(log("announcing incoming transport") + ZS_PARAM("transport", transport->getRealID()))
 
       mSubscriptions.delegate()->onSCTPTransport(SCTPTransport::convert(transport));
 
-      mAnnouncedTransports[transport->getID()] = transport;
+      mAnnouncedTransports[transport->getRealID()] = transport;
     }
 
     //-------------------------------------------------------------------------
@@ -590,7 +593,7 @@ namespace ortc
       ZS_EVENTING_4(
                     x, i, Detail, SctpTransportListenerSctpTransportShutdownEvent, ol, SctpTransportListener, InternalEvent,
                     puid, id, mID,
-                    puid, sctpTransportId, transport.getID(),
+                    puid, sctpTransportId, transport.getRealID(),
                     word, localPort, localPort,
                     word, remotePort, remotePort
                     );
@@ -604,13 +607,13 @@ namespace ortc
 
       auto tuple = UseListenerHelper::createTuple(localPort, remotePort);
 
-      ZS_LOG_DETAIL(log("notified shutdown of SCTP transport") + ZS_PARAM("tuple", tuple) + ZS_PARAM("local port", localPort) + ZS_PARAM("remote port", remotePort) + ZS_PARAM("transport id", transport.getID()))
+      ZS_LOG_DETAIL(log("notified shutdown of SCTP transport") + ZS_PARAM("tuple", tuple) + ZS_PARAM("local port", localPort) + ZS_PARAM("remote port", remotePort) + ZS_PARAM("transport id", transport.getRealID()))
 
       {
         auto found = mTransports.find(tuple);
         if (found != mTransports.end()) {
           auto registeredTransport = (*found).second;
-          if (registeredTransport->getID() == transport.getID()) {
+          if (registeredTransport->getRealID() == transport.getRealID()) {
             deallocatePort(mAllocatedLocalPorts, localPort);
             deallocatePort(mAllocatedRemotePorts, remotePort);
             mTransports.erase(found);
@@ -619,12 +622,12 @@ namespace ortc
       }
 
       {
-        auto found = mAnnouncedTransports.find(transport.getID());
+        auto found = mAnnouncedTransports.find(transport.getRealID());
         if (found != mAnnouncedTransports.end()) mAnnouncedTransports.erase(found);
       }
 
       {
-        auto found = mPendingTransports.find(transport.getID());
+        auto found = mPendingTransports.find(transport.getRealID());
         if (found != mPendingTransports.end()) mPendingTransports.erase(found);
       }
 
@@ -689,15 +692,15 @@ namespace ortc
           ZS_EVENTING_4(
                         x, i, Detail, SctpTransportListenerSctpTransportCreatedEvent, ol, SctpTransportListener, Receive,
                         puid, id, mID,
-                        puid, sctpTransportId, transport->getID(),
+                        puid, sctpTransportId, transport->getRealID(),
                         word, localPort, localPort,
                         word, remotePort, remotePort
                         );
 
           if (mRemoteCapabilities) {
-            transport->start(*mRemoteCapabilities, remotePort);
+            transport->startFromListener(*mRemoteCapabilities, remotePort);
           } else {
-            mPendingTransports[transport->getID()] = TransportPortPair(transport, remotePort);
+            mPendingTransports[transport->getRealID()] = TransportPortPair(transport, remotePort);
           }
           allocatePort(mAllocatedLocalPorts, localPort);
           allocatePort(mAllocatedRemotePorts, remotePort);
@@ -710,7 +713,7 @@ namespace ortc
       ZS_EVENTING_4(
                     x, i, Trace, SctpTransportListenerDeliverIncomingDataPacket, ol, SctpTransportListener, Receive,
                     puid, id, mID,
-                    puid, sctpTransportId, transport->getID(),
+                    puid, sctpTransportId, transport->getRealID(),
                     buffer, dataPacket, buffer,
                     size,size, bufferLengthInBytes
                     );
@@ -888,11 +891,11 @@ namespace ortc
             mTransports.erase(current);
 
             {
-              auto found = mPendingTransports.find(transport->getID());
+              auto found = mPendingTransports.find(transport->getRealID());
               if (found != mPendingTransports.end()) mPendingTransports.erase(found);
             }
             {
-              auto found = mAnnouncedTransports.find(transport->getID());
+              auto found = mAnnouncedTransports.find(transport->getRealID());
               if (found != mAnnouncedTransports.end()) mAnnouncedTransports.erase(found);
             }
             continue;
@@ -955,7 +958,7 @@ namespace ortc
       {
         auto port = (*iter).second.second;
         UseSCTPTransportPtr transport = (*iter).second.first;
-        transport->start(*mRemoteCapabilities, port);
+        transport->startFromListener(*mRemoteCapabilities, port);
       }
       mPendingTransports.clear();
 
diff --git a/ortc/cpp/ortc_SRTPSDESTransport.cpp b/ortc/cpp/ortc_SRTPSDESTransport.cpp
index e48fcca5..027662b1 100644
--- a/ortc/cpp/ortc_SRTPSDESTransport.cpp
+++ b/ortc/cpp/ortc_SRTPSDESTransport.cpp
@@ -1,4 +1,4 @@
-/*
+  /*
 
  Copyright (c) 2014, Hookflash Inc. / Hookflash Inc.
  All rights reserved.
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_SRTPSDESTransport.h>
 #include <ortc/internal/ortc_ICETransport.h>
 #include <ortc/internal/ortc_RTPListener.h>
@@ -51,7 +53,7 @@
 
 #include <cryptopp/sha.h>
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_srtp) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_srtp) }
 
 namespace ortc
 {
@@ -153,6 +155,8 @@ namespace ortc
                                          ) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create()),
+      mSecureTransportSubscriptions(decltype(mSecureTransportSubscriptions)::create()),
       mICETransportRTP(ICETransport::convert(iceTransport))
     {
       ZS_LOG_DETAIL(debug("created"))
diff --git a/ortc/cpp/ortc_SRTPTransport.cpp b/ortc/cpp/ortc_SRTPTransport.cpp
index 99a1951d..2ed79061 100644
--- a/ortc/cpp/ortc_SRTPTransport.cpp
+++ b/ortc/cpp/ortc_SRTPTransport.cpp
@@ -29,6 +29,8 @@
  
  */
 
+#define ZS_DECLARE_TEMPLATE_GENERATE_IMPLEMENTATION
+
 #include <ortc/internal/ortc_SRTPTransport.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
 #include <ortc/internal/ortc_Helper.h>
@@ -60,7 +62,6 @@
 #endif //HAVE_TGMATH_H
 
 //libSRTP
-#include "srtp.h"
 #include "srtp_priv.h"
 
 #ifdef _DEBUG
@@ -69,7 +70,7 @@
 #define ASSERT(x)
 #endif //_DEBUG
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_srtp) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_srtp) }
 
 #define ORTC_SRTPTRANSPORT_ILLEGAL_MKI_LEGNTH (0xFFFF)
 
@@ -291,7 +292,7 @@ namespace ortc
         AutoRecursiveLock lock(mLock);
 
         int err = srtp_init();
-        mInitialized = (err == err_status_ok);
+        mInitialized = (err == srtp_err_status_ok);
         if (!mInitialized) {
           ZS_LOG_ERROR(Trace, log("Failed to init SRTP") + ZS_PARAM("error", err))
         }
@@ -418,6 +419,7 @@ namespace ortc
                                  ) throw(InvalidParameters) :
       MessageQueueAssociator(queue),
       SharedRecursiveLock(SharedRecursiveLock::create()),
+      mSubscriptions(decltype(mSubscriptions)::create()),
       mSecureTransport(secureTransport),
       mSRTPInit(SRTPInit::singleton())
     {
@@ -499,14 +501,12 @@ namespace ortc
               memset(&policy, 0, sizeof(policy));
 
               if (CS_AES_CM_128_HMAC_SHA1_80 == mParams[loop].mCryptoSuite) {
-                  crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtp);
-                  crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtcp);
-              }
-              else if (CS_AES_CM_128_HMAC_SHA1_32 == mParams[loop].mCryptoSuite) {
-                  crypto_policy_set_aes_cm_128_hmac_sha1_32(&policy.rtp);   // rtp is 32,
-                  crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtcp);  // rtcp still 80
-              }
-              else {
+                  srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtp);
+                  srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtcp);
+              } else if (CS_AES_CM_128_HMAC_SHA1_32 == mParams[loop].mCryptoSuite) {
+                  srtp_crypto_policy_set_aes_cm_128_hmac_sha1_32(&policy.rtp);   // rtp is 32,
+                  srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtcp);  // rtcp still 80
+              } else {
                   ZS_LOG_WARNING(Detail, log("crypto suite is not understood") + mParams[loop].toDebug())
                   ORTC_THROW_INVALID_PARAMETERS("Crypto suite is not understood: " + mParams[loop].mCryptoSuite)
               }
@@ -525,7 +525,7 @@ namespace ortc
               policy.next = NULL;
 
               int err = srtp_create(&keyingMaterial->mSRTPSession, &policy);
-              if (err != err_status_ok) {
+              if (err != srtp_err_status_ok) {
                   keyingMaterial->mSRTPSession = NULL;
                   ZS_LOG_ERROR(Debug, log("Failed to create SRTP session, err=") + ZS_PARAM("err=", err))
                   ORTC_THROW_INVALID_PARAMETERS("Failed to create SRTP session")
@@ -814,11 +814,11 @@ namespace ortc
           AutoLock lock(usedKeys[loop]->mSRTPSessionLock);
           int err = (component == IICETypes::Component_RTP ? srtp_unprotect(usedKeys[loop]->mSRTPSession, decryptedBuffer->BytePtr(), &out_len) :
                                                              srtp_unprotect_rtcp(usedKeys[loop]->mSRTPSession, decryptedBuffer->BytePtr(), &out_len));
-          if (err == err_status_replay_fail) {
+          if (err == srtp_err_status_replay_fail) {
             return true;
           }
 
-          if (err != err_status_ok) {
+          if (err != srtp_err_status_ok) {
             ZS_LOG_WARNING(Trace, log("cannot use current keying material, trying with next key") + usedKeys[loop]->toDebug())
             continue;
           }
@@ -972,7 +972,7 @@ namespace ortc
         //}
       }
 
-      if (err != err_status_ok) {
+      if (err != srtp_err_status_ok) {
         ZS_LOG_WARNING(Debug, log("cannot use current keying material for encryption") + keyingMaterial->toDebug())
         return false;
       }
diff --git a/ortc/cpp/ortc_StatsReport.cpp b/ortc/cpp/ortc_StatsReport.cpp
index a1acf203..68cf3f5d 100644
--- a/ortc/cpp/ortc_StatsReport.cpp
+++ b/ortc/cpp/ortc_StatsReport.cpp
@@ -60,7 +60,7 @@
 
 using namespace date;
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_stats) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_stats) }
 
 namespace ortc
 {
@@ -671,6 +671,33 @@ namespace ortc
     IHelper::getElementValue(rootEl, "ortc::IStatsReportTypes::Stats", "id", mID);
   }
 
+  //---------------------------------------------------------------------------
+  IStatsReportTypes::StatsPtr IStatsReportTypes::Stats::create(const Stats &source)
+  {
+    if (!source.mStatsType.hasValue()) return make_shared<Stats>(source);
+    switch (source.mStatsType.value())
+    {
+      case StatsType_InboundRTP:      return make_shared<InboundRTPStreamStats>(dynamic_cast<const InboundRTPStreamStats &>(source));
+      case StatsType_OutboundRTP:     return make_shared<OutboundRTPStreamStats>(dynamic_cast<const OutboundRTPStreamStats &>(source));
+      case StatsType_Codec:           return make_shared<Codec>(dynamic_cast<const Codec &>(source));
+      case StatsType_SCTPTransport:   return make_shared<SCTPTransportStats>(dynamic_cast<const SCTPTransportStats &>(source));
+      case StatsType_DataChannel:     return make_shared<DataChannelStats>(dynamic_cast<const DataChannelStats &>(source));
+      case StatsType_Stream:          return make_shared<MediaStreamStats>(dynamic_cast<const MediaStreamStats &>(source));
+      case StatsType_Track:           return make_shared<MediaStreamTrackStats>(dynamic_cast<const MediaStreamTrackStats &>(source));
+      case StatsType_ICEGatherer:     return make_shared<ICEGathererStats>(dynamic_cast<const ICEGathererStats &>(source));
+      case StatsType_ICETransport:    return make_shared<ICETransportStats>(dynamic_cast<const ICETransportStats &>(source));
+      case StatsType_DTLSTransport:   return make_shared<DTLSTransportStats>(dynamic_cast<const DTLSTransportStats &>(source));
+      case StatsType_SRTPTransport:   return make_shared<SRTPTransportStats>(dynamic_cast<const SRTPTransportStats &>(source));
+      case StatsType_Certificate:     return make_shared<CertificateStats>(dynamic_cast<const CertificateStats &>(source));
+      case StatsType_Candidate:       return make_shared<ICECandidateAttributes>(dynamic_cast<const ICECandidateAttributes &>(source));
+      case StatsType_CandidatePair:   return make_shared<ICECandidatePairStats>(dynamic_cast<const ICECandidatePairStats &>(source));
+      case StatsType_LocalCandidate:  return make_shared<ICECandidateAttributes>(dynamic_cast<const ICECandidateAttributes &>(source));
+      case StatsType_RemoteCandidate: return make_shared<ICECandidateAttributes>(dynamic_cast<const ICECandidateAttributes &>(source));
+    }
+
+    return StatsPtr();
+  }
+
   //---------------------------------------------------------------------------
   IStatsReportTypes::StatsPtr IStatsReportTypes::Stats::create(ElementPtr rootEl)
   {
@@ -1114,7 +1141,7 @@ namespace ortc
     internal::reportFloat(mID, timestamp, "fractionLost", static_cast<float>(mFractionLost));
     internal::reportInt64(mID, timestamp, "endToEndDelay", SafeInt<int64_t>(mEndToEndDelay.count()));
 #ifndef ORTC_EXCLUDE_WEBRTC_COMPATIBILITY_STATS
-    internal::reportInt64(mID, timestamp, "winrtEndToEndDelayMs", SafeInt<int64_t>(mEndToEndDelay.count()));
+    internal::reportInt64(mID, timestamp, "winuwpEndToEndDelayMs", SafeInt<int64_t>(mEndToEndDelay.count()));
     internal::reportInt32(mID, timestamp, "googFirsReceived", SafeInt<int32_t>(mFIRCount));
     internal::reportInt32(mID, timestamp, "googPlisReceived", SafeInt<int32_t>(mPLICount));
     internal::reportInt32(mID, timestamp, "googNacksReceived", SafeInt<int32_t>(mNACKCount));
@@ -1425,7 +1452,7 @@ namespace ortc
     internal::reportInt32(mID, timestamp, "tracks", SafeInt<int32_t>(mTrackIDs.size()));
     unsigned long index = 0;
     for (auto iter = mTrackIDs.begin(); iter != mTrackIDs.end(); ++iter, ++index) {
-      auto &trackID = (*iter);
+      //auto &trackID = (*iter);
       internal::reportString(mID, timestamp, (String("trackId") + string(index)).c_str(), mStreamID);
     }
   }
diff --git a/ortc/cpp/ortc_webrtc.cpp b/ortc/cpp/ortc_webrtc.cpp
index 5ee4b29d..6faab993 100644
--- a/ortc/cpp/ortc_webrtc.cpp
+++ b/ortc/cpp/ortc_webrtc.cpp
@@ -33,7 +33,7 @@
 
 #include <zsLib/Log.h>
 
-namespace ortc { ZS_DECLARE_SUBSYSTEM(ortclib_webrtc) }
+namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_webrtc) }
 
 namespace ortc
 {
diff --git a/ortc/idl/Capabilities.idl b/ortc/idl/Capabilities.idl
new file mode 100644
index 00000000..dbc9dcd2
--- /dev/null
+++ b/ortc/idl/Capabilities.idl
@@ -0,0 +1,135 @@
+/*
+ 
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+ 
+ 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.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ 
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// The minimum and maximum legal values for an interger value.
+    /// </summary>
+    [dictionary]
+    struct LongRange
+    {
+      /// <summary>
+      /// Gets or sets the minimum value of this property.
+      /// </summary>
+      long min;
+      /// <summary>
+      /// Gets or sets the maximum legal value of this property.
+      /// </summary>
+      long max;
+
+      /// <summary>
+      /// Constructs a new minimum and maximum legal range for an integer value.
+      /// </summary>
+      [constructor, default]
+      void LongRange();
+
+      /// <summary>
+      /// Constructs a minimum and maximum legal range given an integer value.
+      /// </summary>
+      [constructor, default, altname(LongRangeWithValue)]
+      void LongRange(long value);
+
+      /// <summary>
+      /// Constructs a minimum and maximum legal range given an integer minimum and maximum value.
+      /// </summary>
+      [constructor, default, altname(LongRangeWithLimits)]
+      void LongRange(long min, long max);
+
+      /// <summary>
+      /// Constructs a minimum and maximum legal range given a JSON object.
+      /// </summary>
+      [constructor, altname(LongRangeWithJson)]
+      void LongRange(Json json);
+
+      /// <summary>
+      /// Convert the integer range into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of the integer range.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The minimum and maximum legal values for an real value.
+    /// </summary>
+    [dictionary]
+    struct DoubleRange
+    {
+      /// <summary>
+      /// Gets or sets the minimum value of this property.
+      /// </summary>
+      double min;
+      /// <summary>
+      /// Gets or sets the maximum legal value of this property.
+      /// </summary>
+      double max;
+
+      /// <summary>
+      /// Constructs a new minimum and maximum legal range for a real value.
+      /// </summary>
+      [constructor, default]
+      void DoubleRange();
+
+      /// <summary>
+      /// Constructs a minimum and maximum legal range given a real value.
+      /// </summary>
+      [constructor, default, altname(DoubleRangeWithValue)]
+      void DoubleRange(double value);
+
+      /// <summary>
+      /// Constructs a minimum and maximum legal range given a real minimum and maximum value.
+      /// </summary>
+      [constructor, default, altname(DoubleRangeWithLimits)]
+      void DoubleRange(double min, double max);
+
+      /// <summary>
+      /// Constructs a minimum and maximum legal range given a JSON object.
+      /// </summary>
+      [constructor, altname(DoubleRangeWithJson)]
+      void DoubleRange(Json json);
+
+      /// <summary>
+      /// Convert the real number range into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of a real value range.
+      /// </summary>
+      string hash();
+    }
+
+  }
+}
diff --git a/ortc/idl/Certificate.idl b/ortc/idl/Certificate.idl
new file mode 100644
index 00000000..e846b4b5
--- /dev/null
+++ b/ortc/idl/Certificate.idl
@@ -0,0 +1,147 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// The RTCDtlsFingerprint object includes the hash function algorithm and
+    /// certificate fingerprint as described in [RFC4572].
+    /// </summary>
+    [dictionary]
+    struct RTCDtlsFingerprint
+    {
+      /// <summary>
+      /// Gets or sets one of the the hash function algorithms defined in the
+      /// 'Hash function Textual Names' registry, initially specified in
+      /// [RFC4572] Section 8. As noted in [draft-ietf-rtcweb-jsep] Section
+      /// 5.2.1, the digest algorithm used for the fingerprint matches that
+      /// used in the certificate signature.
+      /// </summary>
+      string algorithm;
+      /// <summary>
+      /// The value of the certificate fingerprint in lowercase hex string as
+      /// expressed utilizing the syntax of 'fingerprint' in [RFC4572] Section
+      /// 5.
+      /// </summary>
+      string value;
+
+      /// <summary>
+      /// Construct a new empty fingerprint instance.
+      /// </summary>
+      [constructor]
+      void RTCDtlsFingerprint();
+
+      /// <summary>
+      /// Construct a new fingerprint instance by cloning existing fingerprint.
+      /// </summary>
+      [constructor, altname(RTCDtlsFingerprintClone)]
+      void RTCDtlsFingerprint(RTCDtlsFingerprint source);
+
+      /// <summary>
+      /// Construct a new fingerprint instance from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCDtlsFingerprintWithJson)]
+      void RTCDtlsFingerprint(Json json);
+
+      /// <summary>
+      /// Convert a fingerprint to a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash of the fingerprint.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCCertificate interface enables the certificates used by an
+    /// RTCDtlsTransport in its constructor. 
+    /// </summary>
+    interface RTCCertificate
+    {
+      typedef zs::PromiseWith<RTCCertificate> PromiseWithCertificate;
+
+      /// <summary>
+      /// The GenerateCertificate method causes the user agent to create and
+      /// store an X.509 certificate [ISO/IEC 9594-8:1997] and corresponding
+      /// private key. 
+      /// </summary>
+      /// <returns>An awaitable newly generated certificate.</returns>
+      [static]
+      PromiseWithCertificate generateCertificate() throws (NotImplemented);
+
+      /// <summary>
+      /// The GenerateCertificate method causes the user agent to create and
+      /// store an X.509 certificate [ISO/IEC 9594-8:1997] and corresponding
+      /// private key. 
+      /// </summary>
+      /// <returns>An awaitable newly generated certificate.</returns>
+      [static, default, altname(generateCertificateWithAlgorithm)]
+      PromiseWithCertificate generateCertificate(
+        /// <param name='keygenAlgorithm'>
+        //// This argument is used to control how the private key associated
+        /// with the certificate is generated.
+        /// </param>
+        string keygenAlgorithm
+        ) throws(NotImplemented);
+
+      [static, altname(generateCertificateWithJson)]
+      PromiseWithCertificate generateCertificate(Json keygenAlgorithm);
+
+      [constructor, delete]
+      void RTCCertificate();
+
+      /// <summary>
+      /// Gets the unique object identifier for the certificate object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets the expiry after which the certificate will be considered
+      /// invalid by the browser. After this time, attempts to construct an
+      /// RTCDtlsTransport object using this certificate will fail.
+      /// </summary>
+      [getter]
+      Time expires;
+
+      /// <summary>
+      /// Gets the fingerprint of the certificate. As noted in
+      /// [draft-ietf-rtcweb-jsep] Section 5.2.1, the digest algorithm used
+      /// for the fingerprint matches that used in the certificate signature.
+      /// </summary>
+      [getter]
+      RTCDtlsFingerprint fingerprint;
+    };
+  }
+}
diff --git a/ortc/idl/Constraints.idl b/ortc/idl/Constraints.idl
new file mode 100644
index 00000000..2a8e575d
--- /dev/null
+++ b/ortc/idl/Constraints.idl
@@ -0,0 +1,444 @@
+/*
+ 
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+ 
+ 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.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ 
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// This object represents the constrainable boolean parameters.
+    /// </summary>
+    [dictionary]
+    struct ConstrainBooleanParameters {
+      /// <summary>
+      /// Gets or sets the exact required value for this property.
+      /// </summary>
+      [optional]
+      bool exact;
+      /// <summary>
+      /// Gets or sets the ideal (target) value for this property.
+      /// </summary>
+      [optional]
+      bool ideal;
+
+      /// <summary>
+      /// Constructs a new constrainable boolean parameters.
+      /// </summary>
+      [constructor, default]
+      void ConstrainBooleanParameters();
+      /// <summary>
+      /// Constructs a new constrainable boolean parameters by cloning existing constrainable parameters.
+      /// </summary>
+      [constructor, altname(ConstrainBooleanParametersClone)]
+      void ConstrainBooleanParameters(ConstrainBooleanParameters source);
+      /// <summary>
+      /// Constructs a new constrainable boolean parameters from a JSON object.
+      /// </summary>
+      [constructor, default, altname(ConstrainBooleanParametersWithJson)]
+      void ConstrainBooleanParameters(Json json);
+
+      /// <summary>
+      /// Convert the constrainable boolean parameters into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of the contrainable boolean parameters.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// This object represents the constrainable boolean values.
+    /// </summary>
+    [dictionary]
+    struct ConstrainBoolean
+    {
+      /// <summary>
+      /// Gets or sets the exact boolean value requried. Use this value must
+      /// be mutually exclusively set from Parameters.
+      /// </summary>
+      [optional]
+      bool value;
+      /// <summary>
+      /// Gets or sets the boolean constrainable value parameters.
+      /// </summary>
+      [optional]
+      ConstrainBooleanParameters parameters;
+
+      /// <summary>
+      /// Constructs a new constrainable boolean value.
+      /// </summary>
+      [constructor, default]
+      void ConstrainBoolean();
+      /// <summary>
+      /// Constructs a new constrainable boolean value by cloning existing constrainable parameters.
+      /// </summary>
+      [constructor, altname(ConstrainBooleanClone)]
+      void ConstrainBoolean(ConstrainBoolean source);
+      /// <summary>
+      /// Constructs a new constrainable boolean value from a JSON object.
+      /// </summary>
+      [constructor, default, altname(ConstrainBooleanWithJson)]
+      void ConstrainBoolean(Json json);
+
+      /// <summary>
+      /// Convert the constrainable boolean value into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of the contrainable boolean value.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// This object represents the constrainable minimum, maximum, exact, or
+    /// ideal integer values.
+    /// </summary>
+    [dictionary]
+    struct ConstrainLongRange {
+      /// <summary>
+      /// Gets or sets the minimum value of this property.
+      /// </summary>
+      [optional]
+      long min;
+      /// <summary>
+      /// Gets or sets the maximum legal value of this property.
+      /// </summary>
+      [optional]
+      long max;
+      /// <summary>
+      /// Gets or sets the exact required value for this property.
+      /// </summary>
+      [optional]
+      long exact;
+      /// <summary>
+      /// Gets or sets the ideal (target) value for this property.
+      /// </summary>
+      [optional]
+      long ideal;
+
+      /// <summary>
+      /// Constructs a new constrainable long range.
+      /// </summary>
+      [constructor, default]
+      void ConstrainLongRange();
+      /// <summary>
+      /// Constructs a new constrainable long range by cloning existing constrainable range.
+      /// </summary>
+      [constructor, altname(ConstrainLongRangeClone)]
+      void ConstrainLongRange(ConstrainLongRange source);
+      /// <summary>
+      /// Constructs a new constrainable long range from a JSON object.
+      /// </summary>
+      [constructor, default, altname(ConstrainLongRangeWithJson)]
+      void ConstrainLongRange(Json json);
+
+      /// <summary>
+      /// Convert the constrainable long range into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of the contrainable long range.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// This object represents the constrainable integer values.
+    /// </summary>
+    [dictionary]
+    struct ConstrainLong {
+      /// <summary>
+      /// Gets or sets the exact integer value requried. This value must be
+      /// mutually exclusively set from Range.
+      /// </summary>
+      [optional]
+      long value;
+      /// <summary>
+      /// Gets or sets the constrainable integer range values.
+      /// </summary>
+      [optional]
+      ConstrainLongRange range;
+
+      /// <summary>
+      /// Constructs a new constrainable long value.
+      /// </summary>
+      [constructor, default]
+      void ConstrainLong();
+      /// <summary>
+      /// Constructs a new constrainable long value by cloning existing constrainable value.
+      /// </summary>
+      [constructor, altname(ConstrainLongClone)]
+      void ConstrainLong(ConstrainLong source);
+      /// <summary>
+      /// Constructs a new constrainable long value from a JSON object.
+      /// </summary>
+      [constructor, default, altname(ConstrainLongWithJson)]
+      void ConstrainLong(Json json);
+
+      /// <summary>
+      /// Convert the constrainable long value into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of the contrainable long value.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// This object represents the constrainable minimum, maximum, exact, or
+    /// ideal real values.
+    /// </summary>
+    [dictionary]
+    struct ConstrainDoubleRange {
+      /// <summary>
+      /// Gets or sets the minimum value of this property.
+      /// </summary>
+      [optional]
+      double min;
+      /// <summary>
+      /// Gets or sets the maximum legal value of this property.
+      /// </summary>
+      [optional]
+      double max;
+      /// <summary>
+      /// Gets or sets the exact required value for this property.
+      /// </summary>
+      [optional]
+      double exact;
+      /// <summary>
+      /// Gets or sets the ideal (target) value for this property.
+      /// </summary>
+      [optional]
+      double ideal;
+
+      /// <summary>
+      /// Constructs a new constrainable real range.
+      /// </summary>
+      [constructor, default]
+      void ConstrainDoubleRange();
+      /// <summary>
+      /// Constructs a new constrainable real range by cloning existing constrainable range.
+      /// </summary>
+      [constructor, altname(ConstrainDoubleRangeClone)]
+      void ConstrainDoubleRange(ConstrainDoubleRange source);
+      /// <summary>
+      /// Constructs a new constrainable real range from a JSON object.
+      /// </summary>
+      [constructor, default, altname(ConstrainDoubleRangeWithJson)]
+      void ConstrainDoubleRange(Json json);
+
+      /// <summary>
+      /// Convert the constrainable real range into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of the contrainable real range.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// This object represents the constrainable real values.
+    /// </summary>
+    [dictionary]
+    struct ConstrainDouble {
+      /// <summary>
+      /// Gets or sets the exact real value requried. This value must be
+      /// mutually exclusively set from Range.
+      /// </summary>
+      [optional]
+      double value;
+      /// <summary>
+      /// Gets or sets the constrainable real range values.
+      /// </summary>
+      [optional]
+      ConstrainDoubleRange range;
+
+      /// <summary>
+      /// Constructs a new constrainable real value.
+      /// </summary>
+      [constructor, default]
+      void ConstrainDouble();
+      /// <summary>
+      /// Constructs a new constrainable real value by cloning existing constrainable value.
+      /// </summary>
+      [constructor, altname(ConstrainDoubleClone)]
+      void ConstrainDouble(ConstrainDouble source);
+      /// <summary>
+      /// Constructs a new constrainable real value from a JSON object.
+      /// </summary>
+      [constructor, default, altname(ConstrainDoubleWithJson)]
+      void ConstrainDouble(Json json);
+
+      /// <summary>
+      /// Convert the constrainable real value into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of the contrainable real value.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// This object represents a single string value or a list of string
+    /// values.
+    /// </summary>
+    [dictionary]
+    struct StringOrStringList {
+      /// <summary>
+      /// Gets or sets a specific constrainable string value. This value must
+      /// be mutally exclusively set from Values;
+      /// </summary>
+      [optional]
+      string value;
+      /// <summary>
+      /// Gets or sets the constrainable string values.
+      /// </summary>
+      [optional]
+      StringList values;
+
+      /// <summary>
+      /// Constructs a new string or string list.
+      /// </summary>
+      [constructor, default]
+      void StringOrStringList();
+      /// <summary>
+      /// Constructs a new string or string list from an existing string or string list.
+      /// </summary>
+      [constructor, altname(StringOrStringListClone)]
+      void StringOrStringList(StringOrStringList source);
+      /// <summary>
+      /// Constructs a new string or string list from a JSON object.
+      /// </summary>
+      [constructor, default, altname(StringOrStringListWithJson)]
+      void StringOrStringList(Json json);
+
+      /// <summary>
+      /// Convert the string or string list into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of the string or string list.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// This object represents the constrainable string parameters.
+    /// </summary>
+    [dictionary]
+    struct ConstrainStringParameters {
+      /// <summary>
+      /// Gets or sets the exact required value for this property.
+      /// </summary>
+      [optional]
+      StringOrStringList exact;
+      /// <summary>
+      /// Gets or sets the ideal (target) value for this property.
+      /// </summary>
+      [optional]
+      StringOrStringList ideal;
+
+      /// <summary>
+      /// Constructs a new constrainable string parameters.
+      /// </summary>
+      [constructor, default]
+      void ConstrainStringParameters();
+      /// <summary>
+      /// Constructs a new constrainable string parameters from an existing constrainable parameters.
+      /// </summary>
+      [constructor, altname(ConstrainStringParametersClone)]
+      void ConstrainStringParameters(ConstrainStringParameters source);
+      /// <summary>
+      /// Constructs a new constrainable string parameters from a JSON object.
+      /// </summary>
+      [constructor, default, altname(ConstrainStringParametersWithJson)]
+      void ConstrainStringParameters(Json json);
+
+      /// <summary>
+      /// Convert the constrainable string parameters into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of the constrainable string parameters.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// This object represents the constrainable string values.
+    /// </summary>
+    [dictionary]
+    struct ConstrainString {
+      /// <summary>
+      /// Gets or sets the exact string value(s) requried. This value must be
+      /// mutually exclusively set from Parameters.
+      /// </summary>
+      [optional]
+      StringOrStringList value;
+      /// <summary>
+      /// Gets or sets the string constrainable value parameters.
+      /// </summary>
+      [optional]
+      ConstrainStringParameters parameters;
+
+      /// <summary>
+      /// Constructs a new constrainable string value.
+      /// </summary>
+      [constructor, default]
+      void ConstrainString();
+      /// <summary>
+      /// Constructs a new constrainable string value from an existing constrainable value.
+      /// </summary>
+      [constructor, altname(ConstrainStringClone)]
+      void ConstrainString(ConstrainString source);
+      /// <summary>
+      /// Constructs a new constrainable string value from a JSON object.
+      /// </summary>
+      [constructor, default, altname(ConstrainStringWithJson)]
+      void ConstrainString(Json json);
+
+      /// <summary>
+      /// Convert the constrainable string value into a JSON object.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Get a hash value of the constrainable string value.
+      /// </summary>
+      string hash();
+    };
+
+  }
+}
diff --git a/ortc/idl/DataChannel.idl b/ortc/idl/DataChannel.idl
new file mode 100644
index 00000000..43973fc0
--- /dev/null
+++ b/ortc/idl/DataChannel.idl
@@ -0,0 +1,285 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    interface RTCDataTransport
+    {
+      [constructor, delete]
+      void RTCDataTransport();
+    };
+
+    /// <summary>
+    /// An RTCDataChannel can be configured to operate in different
+    /// reliability modes. A reliable channel ensures that the data is
+    /// delivered at the other peer through retransmissions. An unreliable
+    /// channel is configured to either limit the number of retransmissions
+    /// (maxRetransmits ) or set a time during which transmissions (including
+    /// retransmissions) are allowed (maxPacketLifeTime). These properties
+    /// can not be used simultaneously and an attempt to do so will result in
+    /// an error. Not setting any of these properties results in a reliable
+    /// channel.
+    /// </summary>
+    [dictionary]
+    struct RTCDataChannelParameters
+    {
+      /// <summary>
+      /// Gets or sets a label that can be used to distinguish this
+      /// RTCDataChannel object from other RTCDataChannel objects.
+      /// </summary>
+      string            label;
+      /// <summary>
+      /// Gets or sets the if the RTCDataChannel is ordered, and false if out
+      /// of order delivery is allowed.
+      /// </summary>
+      bool              ordered = true;
+      /// <summary>
+      /// Gets or sets the maxPacketLifetime attribute represents the length
+      /// of the time window (in milliseconds) during which retransmissions
+      /// may occur in unreliable mode. A value of 0 means not used.
+      /// </summary>
+      Milliseconds      maxPacketLifetime;
+      /// <summary>
+      /// Gets or sets the maxRetransmits attribute returns the maximum number
+      /// of retransmissions that are attempted in unreliable mode if set.
+      /// </summary>
+      uint32            maxRetransmits;
+      /// <summary>
+      /// Custom definition of the protocol being carried over the data channel.
+      /// </summary>
+      string            protocol;
+      /// <summary>
+      /// Gets or sets an indicator if the this RTCDataChannel was negotiated
+      /// by the application. If true, the application negotiated the
+      /// RTCDataChannel, otherwise the value is false.
+      /// </summary>
+      bool              negotiated;
+      /// <summary>
+      /// The id attribute returns the id for this RTCDataChannel if set.
+      /// </summary>
+      [optional]
+      uint16            id;
+
+      /// <summary>
+      /// Constructs an instance of an RTCDataChannelParameters instance.
+      /// </summary>
+      [constructor, default]
+      void RTCDataChannelParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCDataChannelParameters instance cloning from an existing instance.
+      /// </summary>
+      [constructor, altname(RTCDataChannelParametersClone)]
+      void RTCDataChannelParameters(RTCDataChannelParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCDataChannelParameters instance from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCDataChannelParametersWithJson)]
+      void RTCDataChannelParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// RTCDataChannelStateChangeEvent represents the ready state event
+    /// fired when the RTCDataChannel state is changed.
+    /// </summary>
+    struct RTCDataChannelStateChangeEvent
+    {
+      [constructor, delete]
+      void RTCDataChannelStateChangeEvent();
+
+      /// <summary>
+      /// The RTCDataChannelState that cased the event to fire.
+      /// </summary>
+      [getter]
+      RTCDataChannelState state;
+    };
+
+    /// <summary>
+    /// RTCMessageEvent represents the event data when a message from the
+    /// RTCDataChannel is fired.
+    /// </summary>
+    struct RTCMessageEvent
+    {
+      [constructor, delete]
+      void RTCMessageEvent();
+
+      /// <summary>
+      /// Gets the binary message being sent. Only set if the data was binary.
+      /// </summary>
+      [getter]
+      binary binary;
+
+      /// <summary>
+      /// Gets the binary message being sent. Only set if the data was text.
+      /// </summary>
+      [getter]
+      string text;
+    };
+
+    /// <summary>
+    /// An RTCDataChannel class instance allows sending data messages to/from
+    /// the remote peer.
+    /// </summary>
+    interface RTCDataChannel : RTCStatsProvider
+    {
+      /// <summary>
+      /// Constructs an instance of RTCDataChannel object from a
+      /// RTCDataTransport object and an RTCDataChannelParameters object.
+      /// </summary>
+      [constructor]
+      void RTCDataChannel(RTCDataTransport transport, RTCDataChannelParameters params) throws (InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets or sets the related transport object.
+      /// </summary>
+      [getter]
+      RTCDataTransport transport;
+
+      /// <summary>
+      /// Gets or sets the parameters applying to this data channel.
+      /// </summary>
+      [getter]
+      RTCDataChannelParameters parameters;
+
+      /// <summary>
+      /// Gets or sets the state of the RTCDataChannel object. It must return
+      /// the value to which the user agent last set it (as defined by the
+      /// processing model algorithms).
+      /// </summary>
+      [getter]
+      RTCDataChannelState readyState;
+
+      /// <summary>
+      /// Gets the number of bytes of application data (UTF-8 text and binary
+      /// data) that have been queued using send() but that, as of the last
+      /// time the event loop started executing a task, had not yet been
+      /// transmitted to the network.
+      /// </summary>
+      [getter]
+      size_t bufferedAmount;
+
+      /// <summary>
+      /// Gets or sets the threshold at which the BufferedAmount is considered
+      /// to be low. When the bufferedAmount decreases from above this
+      /// threshold to equal or below it, the bufferedamountlow event fires.
+      /// The bufferedAmountLowThreshold is initially zero on each new
+      /// RTCDataChannel, but the application may change its value at any
+      /// time.
+      /// </summary>
+      [getter, setter]
+      size_t bufferedAmountLowThreshold;
+
+      /// <summary>
+      /// Gets or sets the binaryType attribute. On getting, return the value
+      /// to which it was last set. On setting, the user agent must set the
+      /// IDL attribute to the new value. When an RTCDataChannel object is
+      /// constructed, the binaryType attribute must be initialized to the
+      /// string 'blob'. This attribute controls how binary data is exposed to
+      /// scripts.
+      /// </summary>
+      [getter, setter]
+      string binaryType;
+
+      /// <summary>
+      /// Closes the RTCDataChannel.
+      /// </summary>
+      void close();
+
+      /// <summary>
+      /// The Send() method is overloaded to handle different data argument
+      /// types. This Send() method transmits a string to the remote peer.
+      /// </summary>
+      [default, altname(sendWithString)]
+      void send(string text) throws (InvalidParameters, InvalidStateError);
+      /// <summary>
+      /// The Send() method is overloaded to handle different data argument
+      /// types. This Send() method transmits a binary blob to the remote
+      /// peer.
+      /// </summary>
+      [altname(sendWithBinary)]
+      void send(binary data) throws (InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// The event handler when the state of the RTCDataChannel is open.
+      /// </summary>
+      [event]
+      void onOpen();
+
+      /// <summary>
+      /// The event handler when the state of the RTCDataChannel is closed.
+      /// </summary>
+      [event]
+      void onClose();
+
+      /// <summary>
+      /// The event handler when the state of the RTCDataChannel object
+      //// changes.
+      /// </summary>
+      [event]
+      void onStateChange(RTCDataChannelStateChangeEvent event);
+
+      /// <summary>
+      /// The error event handler for the RTCDataChannel.
+      /// </summary>
+      [event]
+      void onError(ErrorEvent event);
+
+      /// <summary>
+      /// The event handler when the BufferedAmount falls below the
+      /// BufferedAmountLowThreshold.
+      /// </summary>
+      [event]
+      void onBufferedAmountLow();
+
+      /// <summary>
+      /// The event handler when data from the remote peer arrives.
+      /// </summary>
+      [event]
+      void onMessage(RTCMessageEvent event);
+    };
+  }
+}
diff --git a/ortc/idl/DtlsTransport.idl b/ortc/idl/DtlsTransport.idl
new file mode 100644
index 00000000..c7702fe7
--- /dev/null
+++ b/ortc/idl/DtlsTransport.idl
@@ -0,0 +1,209 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// The RTCDtlsParameters object includes information relating to DTLS
+    /// configuration.
+    /// </summary>
+    [dictionary]
+    struct RTCDtlsParameters
+    {
+      typedef std::list<RTCDtlsFingerprint> FingerprintList;
+
+      /// <summary>
+      /// The DTLS role, with a default of Auto.
+      /// </summary>
+      RTCDtlsRole role = auto;
+      /// <summary>
+      /// Sequence of fingerprints, one fingerprint for each certificate.
+      /// </summary>
+      FingerprintList fingerprints;
+
+      /// <summary>
+      /// Construct a new empty RTCDtlsParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCDtlsParameters();
+      /// <summary>
+      /// Construct a new RTCDtlsParameters object by cloning the contents of an existing object.
+      /// </summary>
+      [constructor, altname(RTCDtlsParametersClone)]
+      void RTCDtlsParameters(RTCDtlsParameters source);
+      /// <summary>
+      /// Construct an RTCDtlsParameters from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCDtlsParametersWithJson)]
+      void RTCDtlsParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// Contains a single binary array of certificate data.
+    /// </summary>
+    struct RTCDtlsCertificateBinary
+    {
+      [constructor, delete]
+      void RTCDtlsCertificateBinary();
+
+      [getter]
+      binary certificate;
+    };
+
+    /// <summary>
+    /// The OnStateChange event of the RTCDtlsTransport object uses the
+    /// RTCDtlsTransportStateChangeEvent interface.
+    /// </summary>
+    struct RTCDtlsTransportStateChangeEvent
+    {
+      [constructor, delete]
+      void RTCDtlsTransportStateChangeEvent();
+
+      /// <summary>
+      /// Gets the new RTCDtlsTransportState that caused the event.
+      /// </summary>
+      [getter]
+      RTCDtlsTransportState state;
+    };
+
+    /// <summary>
+    /// The RTCDtlsTransport object includes information relating to Datagram
+    /// Transport Layer Security (DTLS) transport.
+    /// </summary>
+    interface RTCDtlsTransport : RTCDataTransport,
+                                 RTCRtpTransport,
+                                 RTCRtcpTransport,
+                                 RTCStatsProvider
+    {
+      typedef std::list<RTCCertificate> CertificateList;
+      typedef std::list<RTCDtlsCertificateBinary> BinaryList;
+
+      /// <summary>
+      /// A RTCDtlsTransport instance is constructed using an RTCIceTransport
+      /// and a sequence of RTCCertificate objects. If certificates is
+      /// non-empty, check that the expires attribute of each RTCCertificate
+      /// object is in the future. If a certificate has expired, throw an
+      /// InvalidParameter exception; otherwise, store the certificates.
+      /// </summary>
+      [constructor]
+      void RTCDtlsTransport(
+                            RTCIceTransport iceTransport,
+                            CertificateList certificates
+                            ) throws (InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets the certificates provided in the constructor.
+      /// </summary>
+      [getter]
+      CertificateList certificates;
+
+      /// <summary>
+      /// The associated RTCIceTransport instance.
+      /// </summary>
+      [getter]
+      RTCIceTransport transport;
+
+      /// <summary>
+      /// The current state of the DTLS transport.
+      /// </summary>
+      [getter]
+      RTCDtlsTransportState state;
+
+      /// <summary>
+      /// Gets the DTLS parameters of the local RTCDtlsTransport. If multiple
+      /// certificates were provided in the constructor, then multiple
+      /// fingerprints will be returned, one for each certificate.
+      /// </summary>
+      [getter]
+      RTCDtlsParameters localParameters;
+      /// <summary>
+      /// Gets the remote DTLS parameters passed in the Start() method.
+      /// Prior to calling start(), null is returned.
+      /// </summary>
+      [getter]
+      RTCDtlsParameters remoteParameters();
+
+      /// <summary>
+      /// Returns the certificate chain in use by the remote side, with each
+      /// certificate encoded in binary Distinguished Encoding Rules (DER)
+      /// [X690]. GetRemoteCertificates() returns an empty list prior to
+      /// selection of the remote certificate, which is completed once
+      /// RTCDtlsTransportState transitions to "Connected".
+      /// </summary>
+      BinaryList getRemoteCertificates();
+
+      /// <summary>
+      /// Start DTLS transport negotiation with the parameters of the remote
+      /// DTLS transport, including verification of the remote fingerprint,
+      /// then once the DTLS transport session is established, negotiate a
+      /// DTLS-SRTP [RFC5764] session to establish keys so as protect media
+      /// using SRTP [RFC3711]. Since symmetric RTP [RFC4961] is utilized,
+      /// the DTLS-SRTP session is bi-directional.
+      /// </summary>
+      void start(RTCDtlsParameters remoteParameters) throws (InvalidStateError, InvalidParameters);
+      /// <summary>
+      /// Stops and closes the RTCDtlsTransport object. Calling stop() when
+      /// state is "closed" has no effect.
+      /// </summary>
+      void stop();
+
+      /// <summary>
+      /// This event handler, uses the RTCDtlsTransportStateChangedEvent
+      /// interface. It is called any time the RTCDtlsTransportState changes.
+      /// </summary>
+      [event]
+      void onStateChange(RTCDtlsTransportStateChangeEvent event);
+
+      /// <summary>
+      /// This event is fired on reception of a DTLS error alert.
+      /// </summary>
+      [event]
+      void onError(ErrorEvent event);
+    };
+  }
+}
diff --git a/ortc/idl/DtmfSender.idl b/ortc/idl/DtmfSender.idl
new file mode 100644
index 00000000..34a04d22
--- /dev/null
+++ b/ortc/idl/DtmfSender.idl
@@ -0,0 +1,155 @@
+/*
+
+Copyright (c) 2017, Optical Tone Ltd.
+All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// The RTCDTMFToneChangeEvent dictionary provides information on the DTMF tone causing a tonechange event.
+    /// </summary>
+    struct RTCDtmfToneChangeEvent
+    {
+      [constructor, delete]
+      void RTCDtmfToneChangeEvent();
+
+      /// <summary>
+      /// Gets the character for the tone that has just begun playout (see insertDtmf()). If the
+      /// value is the empty string, it indicates that the toneBuffer is an empty string and that
+      /// the previous tones have completed playback.
+      /// </summary>
+      [getter]
+      string tone;
+    };
+
+    /// <summary>
+    /// An RTCDtmfSender instance allows sending DTMF tones to/from the remote
+    /// peer, as per [RFC4733].
+    /// </summary>
+    interface RTCDtmfSender
+    {
+      /// <summary>
+      /// Construct an instance of the RTCDtmfSender associated to an
+      /// RTCRtpSender.
+      /// </summary>
+      [constructor]
+      void RTCDtmfSender(RTCRtpSender sender) throws (InvalidStateError);
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets whether the RTCDtmfSender is capable of sending DTMF.
+      /// </summary>
+      bool canInsertDtmf();
+
+      /// <summary>
+      /// The InsertDTMF() method is used to send DTMF tones. Since DTMF tones
+      /// cannot be sent without configuring the DTMF codec, if InsertDTMF()
+      /// is called prior to sender.Send(parameters), or if
+      /// sender.Send(parameters) was called but parameters did not include
+      /// the DTMF codec, throw an InvalidStateError exception.
+      /// </summary>
+      [default]
+      void insertDtmf(string tones) throws(InvalidStateError, InvalidParameters);
+
+      /// <summary>
+      /// The InsertDTMF() method is used to send DTMF tones. Since DTMF tones
+      /// cannot be sent without configuring the DTMF codec, if InsertDTMF()
+      /// is called prior to sender.Send(parameters), or if
+      /// sender.Send(parameters) was called but parameters did not include
+      /// the DTMF codec, throw an InvalidStateError exception.
+      /// </summary>
+      [altname(insertDtmfWithDuration)]
+      void insertDtmf(
+                      string tones,
+                      Milliseconds duration
+                      ) throws (InvalidStateError, InvalidParameters);
+
+      /// <summary>
+      /// The InsertDTMF() method is used to send DTMF tones. Since DTMF tones
+      /// cannot be sent without configuring the DTMF codec, if InsertDTMF()
+      /// is called prior to sender.Send(parameters), or if
+      /// sender.Send(parameters) was called but parameters did not include
+      /// the DTMF codec, throw an InvalidStateError exception.
+      /// </summary>
+      [altname(insertDtmfWithDurationAndGap)]
+      void insertDtmf(
+                      string tones,
+                      Milliseconds duration,
+                      Milliseconds interToneGap
+                      ) throws (InvalidStateError, InvalidParameters);
+
+      /// <summary>
+      /// Gets the RTCRtpSender instance.
+      /// </summary>
+      [getter]
+      RTCRtpSender sender;
+
+      /// <summary>
+      /// Gets the toneBuffer attribute returns a list of the tones remaining
+      /// to be played out.
+      /// </summary>
+      [getter]
+      string toneBuffer;
+
+      /// <summary>
+      /// Get the duration attribute returns the current tone duration value
+      /// in milliseconds. This value will be the value last set via the
+      /// InsertDTMF() method, or the default value of 100 ms if
+      /// InsertDTMF() was called without specifying the duration.
+      /// </summary>
+      [getter]
+      Milliseconds duration;
+
+      /// <summary>
+      /// Gets the interToneGap attribute returns the current value of the
+      /// between-tone gap. This value will be the value last set via the
+      /// InsertDTMF() method, or the default value of 70 ms if InsertDTMF()
+      /// was called without specifying the interToneGap.
+      /// </summary>
+      [getter]
+      Milliseconds interToneGap;
+
+      /// <summary>
+      /// The OnToneChange event handler uses the RTCDTMFToneChangeEvent
+      /// interface to return the character for each tone as it is played out.
+      /// </summary>
+      [event]
+      void onToneChange(RTCDtmfToneChangeEvent event);
+    };
+
+  }
+}
diff --git a/ortc/idl/IceGatherer.idl b/ortc/idl/IceGatherer.idl
new file mode 100644
index 00000000..eb971151
--- /dev/null
+++ b/ortc/idl/IceGatherer.idl
@@ -0,0 +1,405 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// ICE interface policy information.
+    /// </summary>
+    [dictionary]
+    struct RTCIceGatherInterfacePolicy
+    {
+      /// <summary>
+      /// Gets or sets the string form of the RTCIceGatherInterfaceType enums
+      /// to specify which interface types this policy object applies.
+      /// </summary>
+      string                      interfaceType;
+      /// <summary>
+      /// Gets or sets the candidate filter policy to apply to the specified
+      /// interface types.
+      /// </summary>
+      RTCIceGatherFilterPolicy    gatherPolicy = none;
+
+      /// <summary>
+      /// Constructs a new empty RTCIceGatherInterfacePolicy object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceGatherInterfacePolicy();
+      /// <summary>
+      /// Constructs a new RTCIceGatherInterfacePolicy object cloning the data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCIceGatherInterfacePolicyClone)]
+      void RTCIceGatherInterfacePolicy(RTCIceGatherInterfacePolicy source);
+      /// <summary>
+      /// Constructs a new RTCIceGatherInterfacePolicy object extracing the data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCIceGatherInterfacePolicyWithJson)]
+      void RTCIceGatherInterfacePolicy(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// ICE server information.
+    /// </summary>
+    [dictionary]
+    struct RTCIceServer
+    {
+      /// <summary>
+      /// Gets or sets the STUN or TURN URI(s) as defined in [RFC7064] and [RFC7065] or other
+      /// URI types.
+      /// </summary>
+      StringList            urls;
+      /// <summary>
+      /// Gets or sets the username to use with that TURN server, if this
+      /// RTCIceServer object represents a TURN Server.
+      /// </summary>
+      string                username;
+      /// <summary>
+      /// Gets or sets the TURN server credential, if this RTCIceServer object
+      /// represents a TURN Server.
+      /// </summary>
+      string                credential;
+      /// <summary>
+      /// Gets or sets how credential should be used when that TURN server
+      /// requests authorization, if this RTCIceServer object represents a
+      /// TURN Server.
+      /// </summary>
+      RTCIceCredentialType  credentialType = password;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCIceServer object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceServer();
+      /// <summary>
+      /// Constructs an instance of an RTCIceServer object by cloning the data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCIceServerClone)]
+      void RTCIceServer(RTCIceServer source);
+      /// <summary>
+      /// Constructs an instance of an RTCIceServer object by extracting the data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCIceServerWithJson)]
+      void RTCIceServer(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// RTCIceGatherOptions provides options relating to the gathering of ICE
+    /// candidates.
+    /// </summary>
+    [dictionary]
+    struct RTCIceGatherOptions
+    {
+      typedef std::list<RTCIceGatherInterfacePolicy> InterfacePolicyList;
+      typedef std::list<RTCIceServer> ServerList;
+
+      /// <summary>
+      /// Gets or sets the option to specify continous gathering mode.
+      ///
+      /// If true, then the RTCIceGatherer will gather all candidates
+      /// available "for now" and fire a RTCIceGathererCandidateCompleteEvent.
+      /// However, should more candidates be discovered or Gather() get called
+      /// again after the the RTCIceGathererCandidateCompleteEvent then the
+      /// RTCIceGatherer is allowed to go back into the Gatherering state and
+      /// fire newly discovered candidates until another fired
+      /// RTCIceGathererCandidateCompleteEvent occurs.
+      ///
+      /// If false, then the RTCIceGatherer will not be able to discover any
+      /// new candidates after going into the Complete state, or go back
+      /// into the Gatherering state.
+      /// </summary>
+      bool                continuousGathering = true;
+      /// <summary>
+      /// Gets or sets the ICE gather policy per interface type.
+      /// </summary>
+      InterfacePolicyList interfacePolicies;
+      /// <summary>
+      /// Gets or sets additional ICE servers to be configured. Since
+      /// implementations may provide default ICE servers, and applications
+      /// can desire to restrict communications to the local LAN, iceServers
+      /// need not be set.
+      /// </summary>
+      ServerList          iceServers;
+
+      /// <summary>
+      /// Constructs a new instance of an empty RTCIceGatherOptions object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceGatherOptions();
+      /// <summary>
+      /// Constructs a new instance of an RTCIceGatherOptions object by cloning the contents of an existing object.
+      /// </summary>
+      [constructor, altname(RTCIceGatherOptionsClone)]
+      void RTCIceGatherOptions(RTCIceGatherOptions source);
+      /// <summary>
+      /// Constructs a new instance of an RTCIceGatherOptions object by extracting the data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCIceGatherOptionsWithJson)]
+      void RTCIceGatherOptions(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// This object represents the error event when the RTCIceGatherer object
+    /// has experienced an ICE gathering failure (such as an authentication
+    /// failure with TURN credentials).
+    /// </summary>
+    struct RTCIceGathererIceErrorEvent
+    {
+      [constructor, delete]
+      void RTCIceGathererIceErrorEvent();
+
+      /// <summary>
+      /// Gets the RTCIceCandidate used to communicate with the STUN or TURN
+      /// server. On a multihomed system, multiple interfaces may be sed to
+      /// contact the server, and this attribute allows the application to
+      /// figure out on which one the failure occurred.
+      /// </summary>
+      [getter, nullable]
+      RTCIceCandidate hostCandidate;
+      /// <summary>
+      /// Gets the STUN or TURN URL identifying the server on which the
+      /// failure ocurred.
+      /// </summary>
+      [getter]
+      string          url;
+      /// <summary>
+      /// Gets the numeric STUN error code returned by the STUN or TURN
+      /// server. If the server could not be reached on all interfaces,
+      /// ErrorCode will be set to a TBD value in the 7XX range, as this does
+      /// not conflict with the STUN error code range, and HostCandidate will
+      /// be null.
+      /// </summary>
+      [getter]
+      uint16          errorCode;
+      /// <summary>
+      /// Gets the STUN reason text returned by the STUN or TURN server.
+      /// </summary>
+      [getter]
+      string          errorText;
+    };
+
+    /// <summary>
+    /// This object represents the event for when the RTCIceGathererState
+    /// changed.
+    /// </summary>
+    struct RTCIceGathererStateChangeEvent
+    {
+      [constructor, delete]
+      void RTCIceGathererStateChangeEvent();
+
+      /// <summary>
+      /// Gets the new RTCIceGathererState that caused the event.
+      /// </summary>
+      [getter]
+      RTCIceGathererState state;
+    };
+
+    /// <summary>
+    /// This object represents the event for when a new RTCIceGathererCandidate
+    /// is made available (or is gone).
+    /// </summary>
+    struct RTCIceGathererCandidateEvent
+    {
+      [constructor, delete]
+      void RTCIceGathererCandidateEvent();
+      /// <summary>
+      /// Gets the ICE candidate that caused the event.
+      /// </summary>
+      [getter]
+      RTCIceCandidate candidate;
+      /// <summary>
+      /// Gets the URL of the server from which the candidate was obtained.
+      /// </summary>
+      [getter]
+      string url;
+    };
+
+    /// <summary>
+    /// This object represents the event for when a new
+    /// RTCIceCandidateComplete is made available.
+    /// </summary>
+    struct RTCIceGathererCandidateCompleteEvent
+    {
+      [constructor, delete]
+      void RTCIceGathererCandidateCompleteEvent();
+
+      /// <summary>
+      /// Gets the ICE candidate that caused the event.
+      /// </summary>
+      [getter]
+      RTCIceCandidateComplete candidate;
+    };
+
+    /// <summary>
+    /// The RTCIceGatherer gathers local host, server reflexive and relay
+    /// candidates, as well as enabling the retrieval of local Interactive
+    /// Connectivity Establishment (ICE) parameters which can be exchanged in
+    /// signaling. By enabling an endpoint to use a set of local candidates to
+    /// construct multiple RTCIceTransport objects, the RTCIceGatherer enables
+    /// support for scenarios such as parallel forking.
+    /// </summary>
+    interface RTCIceGatherer : RTCStatsProvider
+    {
+      typedef std::list<RTCIceCandidate> CandidateList;
+
+      /// <summary>
+      /// Constructs an instance of an RTCIceGatherer.
+      /// </summary>
+      [constructor]
+      void RTCIceGatherer(RTCIceGatherOptions options) throws(InvalidParameters);
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets the component-id of the RTCIceGatherer object. In
+      /// RTCIceGatherer objects returned by createAssociatedGatherer() the
+      /// value of component is "RTCP". In all other RTCIceGatherer objects,
+      /// the value of component is "RTP".
+      /// </summary>
+      [getter]
+      RTCIceComponent component;
+
+      /// <summary>
+      /// Gets the current state of the ICE gatherer.
+      /// </summary>
+      [getter]
+      RTCIceGathererState state;
+
+      /// <summary>
+      /// Obtain the ICE parameters of the RTCIceGatherer.
+      /// </summary>
+      [getter]
+      RTCIceParameters localParameters;
+      /// <summary>
+      /// Retrieve the sequence of valid local candidates associated with the
+      /// RTCIceGatherer. This retrieves all unpruned local candidates
+      /// currently known (except for peer reflexive candidates), even if an
+      /// onlocalcandidate event hasn't been processed yet. Prior to calling
+      /// Gather() an empty list will be returned.
+      /// </summary>
+      [getter]
+      CandidateList localCandidates;
+
+      /// <summary>
+      /// Create an associated RTCIceGatherer for RTCP, with the same
+      /// RTCIceParameters and RTCIceGatherOptions. If state is "closed",
+      /// throw an InvalidStateError exception. If an RTCIceGatherer calls the
+      /// method more than once, or if component is "RTCP", throw an
+      /// InvalidStateError exception.
+      /// </summary>
+      RTCIceGatherer createAssociatedGatherer() throws (InvalidStateError);
+
+      /// <summary>
+      /// Gather ICE candidates. Utilize the value of options passed in the constructor.
+      /// </summary>
+      [default]
+      void gather();
+
+      /// <summary>
+      /// Gather ICE candidates with the options specified.
+      /// </summary>
+      [altname(gatherWithOptions)]
+      void gather(RTCIceGatherOptions options);
+
+      /// <summary>
+      /// Prunes all local candidates, and closes the port. Associated
+      /// RTCIceTransport objects transition to the "disconnected" state
+      /// (unless they were in the "failed" state). Calling close() when state
+      /// is "closed" has no effect.
+      /// </summary>
+      void close();
+
+      /// <summary>
+      /// The RTCIceGathererState changed.
+      /// </summary>
+      [event]
+      void onStateChange(RTCIceGathererStateChangeEvent event);
+
+      /// <summary>
+      /// A new RTCIceGathererCandidate is made available.
+      /// </summary>
+      [event]
+      void onLocalCandidate(RTCIceGathererCandidateEvent event);
+
+      /// <summary>
+      /// A new RTCIceCandidateComplete is made available.
+      /// </summary>
+      [event]
+      void onLocalCandidateComplete(RTCIceGathererCandidateCompleteEvent event);
+
+      /// <summary>
+      /// A new RTCIceGathererCandidate is no longer available.
+      /// </summary>
+      [event]
+      void onLocalCandidateGone(RTCIceGathererCandidateEvent event);
+
+      /// <summary>
+      /// The RTCIceGatherer object has experienced an ICE gathering failure
+      /// (such as an authentication failure with TURN credentials).
+      /// </summary>
+      [event]
+      void onError(RTCIceGathererIceErrorEvent event);
+    };
+
+  }
+}
diff --git a/ortc/idl/IceTransport.idl b/ortc/idl/IceTransport.idl
new file mode 100644
index 00000000..95ea04a3
--- /dev/null
+++ b/ortc/idl/IceTransport.idl
@@ -0,0 +1,294 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// An abstract object representing an RTP transport.
+    /// </summary>
+    interface RTCRtpTransport
+    {
+      [constructor, delete]
+      void RTCRtpTransport();
+    };
+    /// <summary>
+    /// An abstract object representing an RTCP transport.
+    /// </summary>
+    interface RTCRtcpTransport
+    {
+      [constructor, delete]
+      void RTCRtcpTransport();
+    };
+
+    /// <summary>
+    /// This object represents the event data associated when the
+    /// RTCIceTransportState changes.
+    /// </summary>
+    struct RTCIceTransportStateChangeEvent
+    {
+      [constructor, delete]
+      void RTCIceTransportStateChangeEvent();
+
+      /// <summary>
+      /// Gets the RTCIceTransportState state at the time the event fired.
+      /// </summary>
+      [getter]
+      RTCIceTransportState state;
+    };
+
+    /// <summary>
+    /// This object represents the candidate pair events changes the
+    /// RTCIceTransport object uses the RTCIceCandidatePairChangeEvent
+    /// interface.
+    /// </summary>
+    struct RTCIceCandidatePairChangeEvent
+    {
+      [constructor, delete]
+      void RTCIceCandidatePairChangeEvent();
+
+      /// <summary>
+      /// Gets the selected RTCIceCandidatePair that caused the event.
+      /// </summary>
+      [getter]
+      RTCIceCandidatePair candidatePair;
+    };
+
+    /// <summary>
+    /// The RTCIceTransport allows an application access to information about
+    /// the Interactive Connectivity Establishment(ICE) transport over which
+    /// packets are sent and received. In particular, ICE manages
+    /// peer - to - peer connections which involve state which the
+    /// application may want to access.
+    /// </summary>
+    interface RTCIceTransport : RTCRtcpTransport,
+                                RTCStatsProvider
+    {
+      typedef std::list<RTCIceCandidate> CandidateList;
+
+      /// <summary>
+      /// Constructs an instance of the RTCIceTransport object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceTransport();
+
+      /// <summary>
+      /// Constructs an instance of the RTCIceTransport object using the
+      /// specified RTCIceGatherer. 
+      /// </summary>
+      [constructor, altname(RTCIceTransportWithGatherer)]
+      void RTCIceTransport(RTCIceGatherer gatherer) throws (InvalidStateError);
+
+      /// <summary>
+      /// Gets an unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets the iceGatherer attribute is set to the value of gatherer if
+      /// passed in the constructor or in the latest call to Start().
+      /// </summary>
+      [getter]
+      RTCIceGatherer gatherer;
+
+      /// <summary>
+      /// Gets the current role of the ICE transport.
+      /// </summary>
+      [getter]
+      RTCIceRole role;
+
+      /// <summary>
+      /// Gets the component-id of the RTCIceTransport object. In
+      /// RTCIceTransport objects returned by CreateAssociatedTransport(), the
+      /// value of component is "RTCP". In all other RTCIceTransport objects,
+      /// the value of component is "RTP".
+      /// </summary>
+      [getter]
+      RTCIceComponent component;
+
+      /// <summary>
+      /// Gets the current state of the ICE transport.
+      /// </summary>
+      [getter]
+      RTCIceTransportState state;
+
+      /// <summary>
+      /// Gets the sequence of candidates associated with the remote
+      /// RTCIceTransport. Only returns the candidates previously added using
+      /// SetRemoteCandidates() or AddRemoteCandidate(). If there are no
+      /// remote candidates, an empty list is returned.
+      /// </summary>
+      [getter]
+      CandidateList remoteCandidates;
+      /// <summary>
+      /// Gets the selected candidate pair on which packets are sent. If
+      /// there is no selected pair yet, or consent [RFC7675] is lost on the
+      /// selected pair, nullptr is returned.
+      /// </summary>
+      [getter]
+      RTCIceCandidatePair selectedCandidatePair;
+
+      /// <summary>
+      /// The first time Start() is called, candidate connectivity checks are
+      /// started and the ICE transport attempts to connect to the remote
+      /// RTCIceTransport. If start() is called with invalid parameters, throw
+      /// an InvalidParameters exception. For example, if gatherer.component
+      /// has a value different from iceTransport.component, throw an
+      /// InvalidParameters exception. If state or gatherer.state is "closed",
+      /// throw an InvalidStateError exception. When start() is called again,
+      /// RTCIceTransportState transitions to the "connected" state, all
+      /// remote candidates are flushed, and AddRemoteCandidate() or
+      /// SetRemoteCandidates() must be called to add the remote candidates
+      /// back or replace them.
+      /// </summary>
+      void start(
+                 RTCIceGatherer gatherer,
+                 RTCIceParameters remoteParameters,
+                 ) throws (InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// The first time Start() is called, candidate connectivity checks are
+      /// started and the ICE transport attempts to connect to the remote
+      /// RTCIceTransport. If start() is called with invalid parameters, throw
+      /// an InvalidParameters exception. For example, if gatherer.component
+      /// has a value different from iceTransport.component, throw an
+      /// InvalidParameters exception. If state or gatherer.state is "closed",
+      /// throw an InvalidStateError exception. When start() is called again,
+      /// RTCIceTransportState transitions to the "connected" state, all
+      /// remote candidates are flushed, and AddRemoteCandidate() or
+      /// SetRemoteCandidates() must be called to add the remote candidates
+      /// back or replace them.
+      /// </summary>
+      [default, altname(startWithRole)]
+      void start(
+                 RTCIceGatherer gatherer,
+                 RTCIceParameters remoteParameters,
+                 RTCIceRole role
+                 ) throws(InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// The first time Start() is called, candidate connectivity checks are
+      /// started and the ICE transport attempts to connect to the remote
+      /// RTCIceTransport. If start() is called with invalid parameters, throw
+      /// an InvalidParameters exception. For example, if gatherer.component
+      /// has a value different from iceTransport.component, throw an
+      /// InvalidParameters exception. If state or gatherer.state is "closed",
+      /// throw an InvalidStateError exception. When start() is called again,
+      /// RTCIceTransportState transitions to the "connected" state, all
+      /// remote candidates are flushed, and AddRemoteCandidate() or
+      /// SetRemoteCandidates() must be called to add the remote candidates
+      /// back or replace them.
+      /// </summary>
+      [altname(startWithOptions)]
+      void start(
+                 RTCIceGatherer gatherer,
+                 RTCIceParameters remoteParameters,
+                 RTCIceTransportOptions options
+                 ) throws(InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Stops and closes the current object. Also removes the object from
+      /// the RTCIceTransportController. Calling stop() when state is "closed"
+      /// has no effect.
+      /// </summary>
+      void stop();
+
+      /// <summary>
+      /// Get the current ICE parameters of the remote RTCIceTransport.
+      /// </summary>
+      [getter]
+      RTCIceParameters remoteParameters;
+
+      /// <summary>
+      /// Create an associated RTCIceTransport for RTCP. If called more than
+      /// once for the same component, or if state is "closed", throw an
+      /// InvalidStateError exception. If called when component is "RTCP",
+      /// throw an InvalidStateError exception.
+      /// </summary>
+      RTCIceTransport createAssociatedTransport();
+
+      /// <summary>
+      /// Add a remote candidate associated with the remote RTCIceTransport.
+      /// If state is "closed", throw an InvalidStateError exception.
+      /// </summary>
+      void addRemoteCandidate(RTCIceGathererCandidate remoteCandidate) throws (InvalidStateError, InvalidParameters);
+      /// <summary>
+      /// Set the sequence of candidates associated with the remote
+      /// RTCIceTransport. If state is "closed", throw an InvalidStateError
+      /// exception.
+      /// </summary>
+      void setRemoteCandidates(CandidateList remoteCandidates) throws (InvalidStateError, InvalidParameters);
+      void removeRemoteCandidate(RTCIceGathererCandidate remoteCandidate) throws (InvalidStateError, InvalidParameters);
+
+      /// <summary>
+      /// Keep a particular local/remote canadidate path alive with keep alives to ensure the path is always kept alive.
+      /// </summary>
+      [default]
+      void keepWarm(RTCIceCandidatePair candidatePair) throws (InvalidStateError);
+      /// <summary>
+      /// Tell engine to keep a particular local/remote canadidate path alive or not to ensure the path is always kept alive.
+      /// </summary>
+      [altname(setKeepWarm)]
+      void keepWarm(
+                    RTCIceCandidatePair candidatePair,
+                    bool keepWarm
+                    ) throws (InvalidStateError);
+
+      /// <summary>
+      /// The RTCIceTransportState changed.
+      /// </summary>
+      [event]
+      void onStateChange(RTCIceTransportStateChangeEvent event);
+
+      /// <summary>
+      /// A new RTCIceCandidatePair is available.
+      /// </summary>
+      [event]
+      void onCandidatePairAvailable(RTCIceCandidatePairChangeEvent event);
+
+      /// <summary>
+      /// A previous RTCIceCandidatePair is gone.
+      /// </summary>
+      [event]
+      void onCandidatePairGone(RTCIceCandidatePairChangeEvent event);
+
+      /// <summary>
+      /// The selected RTCIceCandidatePair changed.
+      /// </summary>
+      [event]
+      void onCandidatePairChange(RTCIceCandidatePairChangeEvent event);
+    };
+
+  }
+}
+
diff --git a/ortc/idl/IceTransportController.idl b/ortc/idl/IceTransportController.idl
new file mode 100644
index 00000000..914a227c
--- /dev/null
+++ b/ortc/idl/IceTransportController.idl
@@ -0,0 +1,90 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summmary>
+    /// The RTCIceTransportController object assists in the managing of ICE
+    /// freezing and bandwidth estimation.
+    /// </summmary>
+    interface RTCIceTransportController
+    {
+      typedef std::list<RTCIceTransport> IceTransportList;
+
+      /// <summmary>
+      /// Constructs an instance of the RTCIceTransportController.
+      /// </summmary>
+      [constructor]
+      void RTCIceTransportController();
+
+      /// <summmary>
+      /// Get a unique object instance identifier for this object.
+      /// </summmary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets the RTCIceTransport with a component of "RTP". If
+      /// addTransport() has not been called, an empty list is returned.
+      /// </summary>
+      [getter]
+      IceTransportList transports;
+
+      /// <summary>
+      /// Adds transport to the RTCIceTransportController object for the
+      /// purposes of managing ICE freezing and sharing bandwidth estimation.
+      /// Since addTransport manages ICE freezing, candidate pairs that are
+      /// not in the frozen state maintain their state when
+      /// AddTransport(transport) is called. RTCIceTransport objects will be
+      /// unfrozen according to their index. The added transport is inserted
+      /// as the final index.
+      ///
+      ///  If transport.state is "closed", throw an InvalidStateError
+      /// exception. If transport has already been added to another
+      /// RTCIceTransportController object, or if transport.component is
+      /// "RTCP", throw an InvalidStateError exception.
+      /// </summary>
+      void addTransport(RTCIceTransport transport) throws (InvalidParameters, InvalidStateError);
+      /// <summary>
+      /// The transport is inserted at index. If index is greater than the
+      /// current number of RTCIceTransports with a component of "RTP",
+      /// throw an InvalidParameters exception.
+      /// </summary>
+      [altname(addTransportWithIndex)]
+      void addTransport(
+                        RTCIceTransport transport,
+                        size_t index
+                        ) throws (InvalidParameters, InvalidStateError);
+    };
+  }
+}
diff --git a/ortc/idl/IceTypes.idl b/ortc/idl/IceTypes.idl
new file mode 100644
index 00000000..6c402057
--- /dev/null
+++ b/ortc/idl/IceTypes.idl
@@ -0,0 +1,312 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+      /// <summary>
+      /// An base object representing a gathered ICE candidate.
+      /// </summary>
+    struct RTCIceGathererCandidate
+    {
+      [constructor, delete]
+      void RTCIceGathererCandidate();
+
+      /// <summary>
+      /// Gets or sets the the component of the ICE candidate to indicate
+      /// if the candidate is related to RTP or RTCP.
+      /// </summary>
+      [getter]
+      RTCIceComponent  component;
+
+      /// <summary>
+      /// Return a new instance of an RTCIceGathererCandidate by extracting out the candidate
+      /// information from the JSON object.
+      /// </summary>
+      [static, default]
+      RTCIceGathererCandidate create(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCIceCandidate object includes information relating to an ICE
+    /// candidate.
+    /// </summary>
+    struct RTCIceCandidate : RTCIceGathererCandidate
+    {
+      /// <summary>
+      /// Gets or sets the type of interface this candidate was gathered from.
+      /// </summary>
+      [getter]
+      string                  interfaceType;
+      /// <summary>
+      /// Gets or sets a unique identifier that allows ICE to correlate
+      /// candidates that appear on multiple RTCIceTransports.
+      /// </summary>
+      [getter]
+      string                  foundation;
+      /// <summary>
+      /// Gets or sets the assigned usage priority of the candidate. This
+      /// priority represents the priority to choose this candidate over other
+      /// candidates as described in [RFC5245]. If
+      /// RTCIceParameters.UseUnfreezePriority is false then this priority
+      /// also represents the priority in which to unfreeze ICE candidates.
+      /// This is automatically populated by the RTC engine and/or browser.
+      /// </summary>
+      [getter]
+      uint32                  priority;
+      /// <summary>
+      /// Gets or sets the unfreeze priority. If
+      /// RTCIceParameters.UseUnfreezePriority is true then this priority is
+      /// used to determine the unfreezing search order in which to check ICE
+      /// candidates. The higher priority candidates will be searched as
+      /// posssible pairings before lower priority candidates. This is a
+      /// useful option as setting up a connection via a relay may be faster
+      /// than exhaustively searching for the most optimal candidate pairing
+      /// which is determined by standard Priority.
+      /// </summary>
+      /// <see cref="RTCIceParameters" />
+      [getter]
+      uint32                  unfreezePriority;
+      /// <summary>
+      /// Gets or sets the protocol of the candidate (UDP/TCP).
+      /// </summary>
+      [getter]
+      RTCIceProtocol          protocol;
+      /// <summary>
+      /// Gets or sets the IP address of the candidate.
+      /// </summary>
+      [getter]
+      string                  ip;
+      /// <summary>
+      /// Gets or sets the port for the candidate.
+      /// </summary>
+      [getter]
+      uint16                  port;
+      /// <summary>
+      /// Gets or sets the type of candidate.
+      /// </summary>
+      [getter]
+      RTCIceCandidateType     candidateType;
+      /// <summary>
+      /// Gets or sets the type of TCP candidate.
+      /// </summary>
+      [getter]
+      RTCIceTcpCandidateType  tcpType;
+      /// <summary>
+      /// Gets or sets the related address if not a host candidate type. For
+      /// candidates that are derived from others, such as relay or reflexive
+      /// candidates, the relatedAddress refers to the candidate that these
+      /// are derived from. For host candidates, the RelatedAddress is set to
+      /// the empty string.
+      /// </summary>
+      [getter]
+      string                  relatedAddress;
+      /// <summary>
+      /// Gets or sets the related port if not a host candidate type. For
+      /// candidates that are derived from others, such as relay or reflexive
+      /// candidates, the relatedPort refers to the host candidate that these
+      /// are derived from. For host candidates, the RelatedPort is null.
+      /// </summary>
+      [getter]
+      uint16                  relatedPort;
+    };
+
+    /// <summary>
+    /// A candidate representing the completed state of the ICE gathering process
+    /// which can be marshalled and sent to the remote party to inform of the
+    /// local gathering completion process.
+    /// </summary>
+    struct RTCIceCandidateComplete : RTCIceGathererCandidate
+    {
+      /// <summary>
+      /// This attribute is always present and set to true, indicating that
+      /// ICE candidate gathering is complete.
+      /// </summary>
+      [getter]
+      bool complete;
+    };
+
+    /// <summary>
+    /// The local RTCIceParameters object includes the ICE username fragment
+    /// and password and other ICE-related parameters. The RTCIceParameters
+    /// object corresponding to a remote peer may also include an iceLite
+    /// attribute (set to "true" if the remote peer only supports ICE-lite).
+    /// </summary>
+    [dictionary]
+    struct RTCIceParameters
+    {
+      /// <summary>
+      /// Set this value to true if the remote ICE implementation also
+      /// supports the separation of canddiate choise priorty versus
+      /// the priority to unfreeze the candidates. This allows the ICE engine
+      /// to search for a candidate that is more likely to work before trying
+      /// to find the most optimal candidate to use long term.
+      /// </summary>
+      bool    useUnfreezePriority;
+      /// <summary>
+      /// The ICE username fragment.
+      /// </summary>
+      string  usernameFragment;
+      /// <summary>
+      /// The ICE password.
+      /// </summary>
+      string  password;
+      /// <summary>
+      /// If only ICE-lite is supported (true) or not (false or unset). Since
+      /// [draft-ietf-rtcweb-transports] Section 3.4 requires client RTC
+      /// engines/browsers support for full ICE, IceLite will only be "true"
+      /// for a remote peer such as a gateway. GetLocalParameters().IceLite
+      /// will not return true.
+      /// </summary>
+      bool    iceLite;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCIceParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCIceParameters object by cloning the contents of an existing object.
+      /// </summary>
+      [constructor, altname(RTCIceParametersClone)]
+      void RTCIceParameters(RTCIceParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCIceParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCIceParametersWithJson)]
+      void RTCIceParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCIceCandidatePair contains the currently selected ICE candidate
+    /// pair.
+    /// </summary>
+    struct RTCIceCandidatePair
+    {
+      /// <summary>
+      /// Gets or sets the local ICE candidate.
+      /// </summary>
+      RTCIceCandidate local;
+      /// <summary>
+      /// Gets or sets the remote ICE candidate.
+      /// </summary>
+      RTCIceCandidate remote;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCIceCandidatePair object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceCandidatePair();
+      /// <summary>
+      /// Constructs an instance of an RTCIceCandidatePair object by cloning the contents of an existing object.
+      /// </summary>
+      [constructor, altname(RTCIceCandidatePairClone)]
+      void RTCIceCandidatePair(RTCIceCandidatePair source);
+      /// <summary>
+      /// Constructs an instance of an RTCIceCandidatePair object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCIceCandidatePairWithJson)]
+      void RTCIceCandidatePair(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCIceTransportOptions represents the ICE transport options
+    /// specified for the RTCIceTransport object.
+    /// </summary>
+    [dictionary]
+    struct RTCIceTransportOptions
+    {
+      /// <summary>
+      /// Gets or sets if aggressive ICE nomination should be used. If true,
+      /// the RTCIceTransport will use aggressive ICE nomination. If false,
+      /// the RTCICeTransport will use regular ICE nomination.
+      /// </summary>
+      bool aggressiveIce;
+      /// <summary>
+      /// Gets of sets the ICE role to use for the ICE transport.
+      /// </summary>
+      RTCIceRole role = controlled;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCIceTransportOptions object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceTransportOptions();
+      /// <summary>
+      /// Constructs an instance of an RTCIceTransportOptions object by cloning data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCIceTransportOptionsClone)]
+      void RTCIceTransportOptions(RTCIceTransportOptions source);
+      /// <summary>
+      /// Constructs an instance of an RTCIceTransportOptions object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, altname(RTCIceTransportOptionsWithJson)]
+      void RTCIceTransportOptions(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+  }
+}
diff --git a/ortc/idl/Identity.idl b/ortc/idl/Identity.idl
new file mode 100644
index 00000000..f0f923e4
--- /dev/null
+++ b/ortc/idl/Identity.idl
@@ -0,0 +1,145 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// The RTCIdentityAssertion dictionary provides information about an identity assertion.
+    /// </summary>
+    [dictionary]
+    struct RTCIdentityAssertion
+    {
+      /// <summary>
+      /// Gets or sets a domain name representing the identity provider. 
+      /// </summary>
+      string idp;
+      /// <summary>
+      /// Gets or sets a representation of the verified peer identity conforming to [RFC5322].
+      /// This identity will have been verified via the procedures described in [RTCWEB-SECURITY-ARCH].
+      /// See https://tools.ietf.org/html/draft-ietf-rtcweb-security-arch-12 for more information.
+      /// </summary>
+      string name;
+    };
+
+    /// <summary>
+    /// The RTCIdentityResult is a base64 JSON encoded assertion.
+    /// </summary>
+    [dictionary]
+    struct RTCIdentityResult
+    {
+      /// <summary>
+      /// Gets or sets the base64 and JSON encoded assertion.
+      /// </summary>
+      string assertion;
+    };
+
+    /// <summary>
+    /// The RTCIdentityError dictionary provides information relating to error responses.
+    /// </summary>
+    [dictionary]
+    struct RTCIdentityError
+    {
+      /// <summary>
+      /// Gets or sets the domain name of the identity provider that is providing the error response.
+      /// </summary>
+      string        idp;
+      /// <summary>
+      /// Gets or sets the IdP protocol that is in use.
+      /// </summary>
+      string        protocol;
+      /// <summary>
+      /// Gets or sets an IdP that is unable to generate an identity assertion due to a lack of sufficient
+      /// user authentication information can provide a URL to a page where the user can complete
+      /// authentication. If the IdP provides this URL, this attribute includes the value provided by the IdP.
+      /// </summary>
+      string        loginUrl;
+    };
+
+    typedef zs::PromiseRejectionReason<RTCIdentityError> PromiseRejectionIdentityError;
+
+    interface RTCIdentity
+    {
+      typedef PromiseWith<RTCIdentityResult> PromiseWithResult;
+      typedef PromiseWith<RTCIdentityAssertion> PromiseWithAssertion;
+
+      [constructor]
+      void RTCIdentity(RTCDtlsTransport transport);
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets the peer identity assertion information if an identity assertion was provided and verified.
+      /// Once this value is set to a value, it cannot change.
+      /// </summary>
+      [getter]
+      RTCIdentityAssertion peerIdentity;
+
+      /// <summary>
+      /// Sets the identity provider to be used for a given RTCIdentity object, and initiates the process of
+      /// obtaining an identity assertion.
+      /// </summary>
+      [default]
+      PromiseWithResult getIdentityAssertion(string provider);
+
+      /// <summary>
+      /// Sets the identity provider to be used for a given RTCIdentity object, and initiates the process of
+      /// obtaining an identity assertion.
+      /// </summary>
+      [altname(getIdentityAssertionWithProtocol)]
+      PromiseWithResult getIdentityAssertion(
+                                             string provider,
+                                             string protocol
+                                             );
+
+      /// <summary>
+      /// Sets the identity provider to be used for a given RTCIdentity object, and initiates the process of
+      /// obtaining an identity assertion.
+      /// </summary>
+      [altname(getIdentityAssertionWithProtocolAndUsername)]
+      PromiseWithResult getIdentityAssertion(
+                                             string provider,
+                                             string protocol,
+                                             string username
+                                             );
+
+      /// <summary>
+      /// Salidates the identity assertion. 
+      /// </summary>
+      PromiseWithAssertion setIdentityAssertion(string assertion);
+    };
+  }
+}
diff --git a/ortc/idl/Logger.idl b/ortc/idl/Logger.idl
new file mode 100644
index 00000000..1203956c
--- /dev/null
+++ b/ortc/idl/Logger.idl
@@ -0,0 +1,365 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    using namespace zs;
+
+    namespace log
+    {
+      /// <summary>
+      /// The level represents the detail level used when logging.
+      /// </summary>
+      enum Level
+      {
+        /// <summary>
+        /// Do not log any log messages.
+        /// </summary>
+        none,
+        /// <summary>
+        /// Log only the most important logger information.
+        /// </summary>
+        basic,
+        /// <summary>
+        /// Log a few more details from the logger information.
+        /// </summary>
+        detail,
+        /// <summary>
+        /// Log a level appropriate to debug the engine.
+        /// </summary>
+        debug,
+        /// <summary>
+        /// Log a level to trace the code path within the engine.
+        /// </summary>
+        trace,
+        /// <summary>
+        /// Log every possible mundane detail possible.
+        /// </summary>
+        insane
+      };
+
+      /// <summary>
+      /// The component represents the area of code that is capable of
+      /// logging.
+      /// </summary>
+      enum Component
+      {
+        /// <summary>
+        /// All components.
+        /// </summary>
+        all,
+        /// <summary>
+        /// The low level socket, aynchronous eventing, and OS abstraction
+        /// library.
+        /// </summary>
+        zslib,
+        /// <summary>
+        /// The socket abstraction library.
+        /// </summary>
+        socket,
+        /// <summary>
+        /// The eventing services library (ETW).
+        /// </summary>
+        eventing,
+        /// <summary>
+        /// The servers support library for the ORTC library.
+        /// </summary>
+        services,
+        /// <summary>
+        /// The DNS services support library for the ORTC library.
+        /// </summary>
+        dns,
+        /// <summary>
+        /// The TURN services support library for the ORTC library.
+        /// </summary>
+        turn,
+        /// <summary>
+        /// The HTTP services support library for the ORTC library.
+        /// </summary>
+        http,
+        /// <summary>
+        /// The logger tracer at the services layer.
+        /// </summary>
+        logger,
+        /// <summary>
+        /// The wire level tracing of services support for the ORTC library.
+        /// This component also includes the details of the STUN packet(s).
+        /// </summary>
+        wire,
+        /// <summary>
+        /// All STUN related request processing (minus the STUN on the wire).
+        /// </summary>
+        stun,
+        /// <summary>
+        /// The C++ ORTC library (for all objects who don't have their own
+        /// trace level).
+        /// </summary>
+        ortc,
+        /// <summary>
+        /// The C++ ORTC media area.
+        /// </summary>
+        webrtc,
+        /// <summary>
+        /// The C++ ORTC DTLS transport object.
+        /// </summary>
+        dtlsTransport,
+        /// <summary>
+        /// The C++ ORTC ICE gatherer object.
+        /// </summary>
+        iceGatherer,
+        /// <summary>
+        /// The C++ ORTC ICE gatherer router object.
+        /// </summary>
+        iceGathererRouter,
+        /// <summary>
+        /// The C++ ORTC ICE transport object.
+        /// </summary>
+        iceTransport,
+        /// <summary>
+        /// The C++ ORTC ICE transport controller object.
+        /// </summary>
+        iceTransportController,
+        /// <summary>
+        /// The C++ ORTC media devices object.
+        /// </summary>
+        mediaDevices,
+        /// <summary>
+        /// The C++ ORTC media stream track object.
+        /// </summary>
+        mediaStreamTrack,
+        /// <summary>
+        /// The C++ ORTC rtp / rtcp packet related traces.
+        /// </summary>
+        rtpRtcpPacket,
+        /// <summary>
+        /// The C++ ORTC rtp listener object.
+        /// </summary>
+        rtpListener,
+        /// <summary>
+        /// The C++ ORTC rtp listener object.
+        /// </summary>
+        rtpMediaEngine,
+        /// <summary>
+        /// The C++ ORTC rtp receiver object.
+        /// </summary>
+        rtpReceiver,
+        /// <summary>
+        /// The C++ ORTC rtp sender object.
+        /// </summary>
+        rtpSender,
+        /// <summary>
+        /// The C++ ORTC rtp type structure tracing (parsers, helpers and
+        /// other).
+        /// </summary>
+        rtpTypes,
+        /// <summary>
+        /// The C++ SCTP and data channel related objects.
+        /// </summary>
+        sctpDataChannel,
+        /// <summary>
+        /// The C++ SRTP related objects.
+        /// </summary>
+        srtp,
+        /// <summary>
+        /// The C++ SRTP related objects.
+        /// </summary>
+        stats,
+        /// <summary>
+        /// The C++ ORTC Adapter library.
+        /// </summary>
+        adapter,
+      };
+    }
+
+    /// <summary>
+    /// An API used to control the logging engine within the ORTC library.
+    /// </summary>
+    [static]
+    interface Logger
+    {
+      /// <summary>
+      /// Set the log level for a specific component.
+      /// </summary>
+      [static, default]
+      void setLogLevel(log::Component component, log::Level level);
+
+      /// <summary>
+      /// Sets the log level for a component by its component string name.
+      /// </summary>
+      [static, altname(setLogLevelByName)]
+      void setLogLevel(string component, log::Level level);
+
+      /// <summary>
+      /// Output log information to the standard out and optionally colorize
+      /// the output using ANSI color codes.
+      /// </summary>
+      [static]
+      void installStdOutLogger(bool colorizeOutput);
+      /// <summary>
+      /// Output the log information to a file and optional colorize the
+      /// file output using ANSI color codes.
+      /// </summary>
+      [static]
+      void installFileLogger(string fileName, bool colorizeOutput);
+      /// <summary>
+      /// Listen for an incoming telnet connections and output the logging
+      /// information to the incoming telnet connection.
+      /// </summary>
+      [static]
+      void installTelnetLogger(
+        uint16 listenPort,
+        Seconds maxWaitForSocketToBeAvailable,
+        bool colorizeOutput
+        );
+
+      /// <summary>
+      /// Create an outgoing telnet connection to connect to a telnet server
+      /// and output the logging information to the telnet server.
+      /// </summary>
+      [static]
+      void installOutgoingTelnetLogger(
+        string serverHostWithPort,
+        bool colorizeOutput,
+        string sendStringUponConnection
+        );
+      /// <summary>
+      /// Log to the connected debugger logger instance.
+      /// </summary>
+      [static]
+      void installDebuggerLogger();
+
+      /// <summary>
+      /// Returns true if the telnet logger is listening.
+      /// </summary>
+      [static]
+      bool isTelnetLoggerListening();
+      /// <summary>
+      /// Returns true if a telnet logger client is connected.
+      /// </summary>
+      [static]
+      bool isTelnetLoggerConnected();
+      /// <summary>
+      /// Returns true if the telnet logger has an outgoing client connected
+      /// telnet logger session.
+      /// </summary>
+      [static]
+      bool isOutgoingTelnetLoggerConnected();
+
+      /// <summary>
+      /// Uninstall the logger outputing to standard out.
+      /// </summary>
+      [static]
+      void uninstallStdOutLogger();
+      /// <summary>
+      /// Uninstall the logger outputing to a file.
+      /// </summary>
+      [static]
+      void uninstallFileLogger();
+      /// <summary>
+      /// Uninstall the telnet listening logger.
+      /// </summary>
+      [static]
+      void uninstallTelnetLogger();
+      /// <summary>
+      /// Uninstall the outgoing client telnet logger.
+      /// </summary>
+      [static]
+      void uninstallOutgoingTelnetLogger();
+      /// <summary>
+      /// Uninstall the logger outputting to a connected debugger.
+      /// </summary>
+      [static]
+      void uninstallDebuggerLogger();
+
+      /// <summary>
+      /// Set the default eventing level for all componenets.
+      /// </summary>
+      [static, default]
+      void setDefaultEventingLevel(log::Component component, log::Level level);
+
+      /// <summary>
+      /// Sets the log eventing for a component by its component string name.
+      /// </summary>
+      [static, altname(setDefaultEventingLevelByName)]
+      void setDefaultEventingLevel(string component, log::Level level);
+
+      /// <summary>
+      /// Set the eventing level for a specific component.
+      /// </summary>
+      [static, default]
+      void setEventingLevel(log::Component component, log::Level level);
+
+      /// <summary>
+      /// Sets the log eventing for a component by its component string name.
+      /// </summary>
+      [static, altname(setEventingLevelByName)]
+      void setEventingLevel(string component, log::Level level);
+
+      /// <summary>
+      /// Listen for an incoming eventing connection and output the eventing
+      /// information to the incoming eventing connection. Both the eventing
+      /// listener and connecting to an eventing server cannot be enabled
+      /// at the same time.
+      /// </summary>
+      [static]
+      void installEventingListener(
+        string sharedSecret,
+        uint16 listenPort,
+        Seconds maxWaitForSocketToBeAvailable
+      );
+
+      /// <summary>
+      /// Create an outgoing eventing connection to an eventing server and
+      /// output the eventing information to the server. Both the eventing
+      /// listener and connecting to an eventing server cannot be enabled
+      /// at the same time.
+      /// </summary>
+      [static]
+      void connectToEventingServer(
+        string sharedSecret,
+        string serverHostWithPort
+      );
+
+      /// <summary>
+      /// Uninstall the eventing listener.
+      /// </summary>
+      [static]
+      void uninstallEventingListener();
+      /// <summary>
+      /// Uninstall the outgoing client telnet logger.
+      /// </summary>
+      [static]
+      void disconnectEventingServer();
+    };
+  }
+}
diff --git a/ortc/idl/MediaDevices.idl b/ortc/idl/MediaDevices.idl
new file mode 100644
index 00000000..a57db15e
--- /dev/null
+++ b/ortc/idl/MediaDevices.idl
@@ -0,0 +1,277 @@
+/*
+ 
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+ 
+ 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.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ 
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// MediaTrackSupportedConstraints represents the list of constraints
+    /// recognized by a User Agent for controlling the Capabilities of a
+    /// MediaStreamTrack object.This dictionary is used as a function return
+    /// value, and never as an operation argument.
+    /// </summary>
+    [dictionary]
+    struct MediaTrackSupportedConstraints
+    {
+      /// <summary>
+      /// The width or width range, in pixels. As a capability, the range should span the
+      /// video source's pre-set width values with min being the smallest width and max
+      /// being the largest width.
+      /// </summary>
+      bool width;
+      /// <summary>
+      /// The height or height range, in pixels. As a capability, the range should span
+      /// the video source's pre-set height values with min being the smallest height and
+      /// max being the largest height.
+      /// </summary>
+      bool height;
+      /// <summary>
+      /// The exact aspect ratio (width in pixels divided by height in pixels, represented
+      /// as a double rounded to the tenth decimal place) or aspect ratio range.
+      /// </summary>
+      bool aspectRatio;
+      /// <summary>
+      /// The exact frame rate (frames per second) or frame rate range. If this frame
+      /// rate cannot be determined (e.g. the source does not natively provide a frame rate,
+      /// or the frame rate cannot be determined from the source stream), then this value
+      /// must refer to the User Agent's vsync display rate.
+      /// </summary>
+      bool frameRate;
+      /// <summary>
+      /// This string (or each string, when a list) should be one of the members of
+      /// VideoFacingMode. The members describe the directions that the camera can
+      /// face, as seen from the user's perspective. Note that getConstraints may
+      /// not return exactly the same string for strings not in this enum. This
+      /// preserves the possibility of using a future version of enum for
+      /// this property.
+      /// </summary>
+      bool facingMode;
+      /// <summary>
+      /// The volume or volume range, as a multiplier of the linear audio sample
+      /// values. A volume of 0.0 is silence, while a volume of 1.0 is the maximum
+      /// supported volume. A volume of 0.5 will result in an approximately 6 dBSPL
+      /// change in the sound pressure level from the maximum volume. Note that any
+      /// ConstraintSet that specifies values outside of this range of 0 to 1 can
+      /// never be satisfied.
+      /// </summary>
+      bool volume;
+      /// <summary>
+      /// The sample rate in samples per second for the audio data.
+      /// </summary>
+      bool sampleRate;
+      /// <summary>
+      /// The linear sample size in bits. This constraint can only be satisfied for
+      /// audio devices that produce linear samples.
+      /// </summary>
+      bool sampleSize;
+      /// <summary>
+      /// When one or more audio streams is being played in the processes of
+      /// various microphones, it is often desirable to attempt to remove the
+      /// sound being played from the input signals recorded by the microphones.
+      /// This is referred to as echo cancellation. There are cases where it is
+      /// not needed and it is desirable to turn it off so that no audio artifacts
+      /// are introduced. This allows applications to control this behavior.
+      /// </summary>
+      bool echoCancellation;
+      /// <summary>
+      /// The latency or latency range, in seconds. The latency is the time
+      /// between start of processing (for instance, when sound occurs in
+      /// the real world) to the data being available to the next step in
+      /// the process. Low latency is critical for some applications; high
+      /// latency may be acceptable for other applications because it helps
+      /// with power constraints. The number is expected to be the target
+      /// latency of the configuration; the actual latency may show some
+      /// variation from that.
+      /// </summary>
+      bool latency;
+      /// <summary>
+      /// The number of independent channels of sound that the audio data contains,
+      /// i.e. the number of audio samples per sample frame.
+      /// </summary>
+      bool channelCount;
+      /// <summary>
+      /// The origin-unique identifier for the source of the MediaStreamTrack.
+      /// </summary>
+      bool deviceId;
+      /// <summary>
+      /// The browsing session-unique group identifier for the source of the MediaStreamTrack.
+      /// </summary>
+      bool groupId;
+
+      /// <summary>
+      /// Constructs an empty instance of a MediaTrackSupportedConstraints object.
+      /// </summary>
+      [constructor, default]
+      void MediaTrackSupportedConstraints();
+      /// <summary>
+      /// Constructs an instance of a MediaTrackSupportedConstraints object by cloning an existing object.
+      /// </summary>
+      [constructor, altname(MediaTrackSupportedConstraintsClone)]
+      void MediaTrackSupportedConstraints(MediaTrackSupportedConstraints  source);
+      /// <summary>
+      /// Constructs an instance of a MediaTrackSupportedConstraints object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(MediaTrackSupportedConstraintsWithJson)]
+      void MediaTrackSupportedConstraints(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// Media device information representing the User Agent's available
+    /// media input and output devices.
+    /// </summary>
+    [dictionary]
+    struct MediaDeviceInfo
+    {
+      /// <summary>
+      /// Describes the kind of the represented device.
+      /// </summary>
+      MediaDeviceKind kind = audioInput;
+      /// <summary>
+      /// A label describing this device (for example "External USB Webcam").
+      /// If the device has no associated label, then this attribute must
+      /// return the empty string.
+      /// </summary>
+      string label;
+      /// <summary>
+      /// A unique identifier for the represented device.
+      /// </summary>
+      string deviceId;
+      /// <summary>
+      /// Returns the group identifier of the represented device. Two devices
+      /// have the same group identifier if they belong to the same physical
+      /// device; for example a monitor with a built-in camera and microphone.
+      /// </summary>
+      string groupId;
+
+      /// <summary>
+      /// Constructs an empty instance of a MediaDeviceInfo object.
+      /// </summary>
+      [constructor, default]
+      void MediaDeviceInfo();
+      /// <summary>
+      /// Constructs an instance of a MediaDeviceInfo object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(MediaDeviceInfoClone)]
+      void MediaDeviceInfo(MediaDeviceInfo source);
+      /// <summary>
+      /// Constructs an instance of a MediaDeviceInfo object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(MediaDeviceInfoWithJson)]
+      void MediaDeviceInfo(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    interface MediaDevices
+    {
+      typedef std::list<MediaDeviceInfo> DeviceList;
+      typedef std::list<MediaStreamTrack> TrackList;
+      typedef zs::PromiseWith<DeviceList> PromiseWithDeviceList;
+      typedef zs::PromiseWith<TrackList> PromiseWithTrackList;
+
+      [constructor, delete]
+      void MediaDevices();
+
+      /// <summary>
+      /// Gets the media devices singleton object.
+      /// </summary>
+      [static, getter]
+      MediaDevices singleton;
+
+      /// <summary>
+      /// Returns a dictionary whose members are the constrainable properties
+      /// known to the User Agent. A supported constrainable property must be
+      /// represented and any constrainable properties not supported by the
+      /// User Agent must not be present in the returned dictionary. The
+      /// values returned represent what the browser implements and will not
+      /// change during a browsing session.
+      /// </summary>
+      /// <returns>MediaTrackSupportedConstraints</returns>
+      [static]
+      MediaTrackSupportedConstraints getSupportedConstraints();
+
+      /// <summary>
+      /// Collects information about the User Agent's available media input
+      /// and output devices.
+      /// </summary>
+      /// <returns>IAsyncOperation vector list of MediaDeviceInfo</returns>
+      [static]
+      PromiseWithDeviceList enumerateDevices();
+
+      /// <summary>
+      /// Grant access to the user for permission to use their Web cam or
+      /// other video or audio input.
+      /// </summary>
+      [static]
+      PromiseWithTrackList getUserMedia(MediaStreamConstraints constraints);
+
+      /// <summary>
+      /// The set of media devices, available to the User Agent, has changed.
+      /// The current list devices can be retrieved with the
+      /// EnumerateDevices() method.
+      /// </summary>
+      /// <see cref="EnumerateDevices" />
+      [event]
+      void onDeviceChange();
+    };
+
+    /// <summary>
+    /// Interface for controlling the behaviour of media.
+    /// </summary>
+    [special, static]
+    interface MediaControl
+    {
+      /// <summary>
+      /// Gets or sets the media engine the application orientation has changed.
+      /// </summary>
+      [static, getter, setter]
+      Any displayOrientation;
+    };
+
+  }
+}
diff --git a/ortc/idl/MediaStreamTrack.idl b/ortc/idl/MediaStreamTrack.idl
new file mode 100644
index 00000000..72623d12
--- /dev/null
+++ b/ortc/idl/MediaStreamTrack.idl
@@ -0,0 +1,780 @@
+/*
+ 
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+ 
+ 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.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ 
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// Capabilities is a dictionary containing one or more key-value pairs,
+    /// where each key must be a constrainable property, and each value must
+    /// be a subset of the set of values allowed for that property. The exact
+    /// type of the value expression depends on the type of the property.
+    /// The Capabilities dictionary specifies which constrainable properties
+    /// that can be applied, as constraints, to the constrainable object. 
+    /// </summary>
+    [dictionary]
+    struct MediaTrackCapabilities
+    {
+      typedef std::list<bool> BoolList;
+
+      /// <summary>
+      /// The width or width range, in pixels. As a capability, the range should span the
+      /// video source's pre-set width values with min being the smallest width and max
+      /// being the largest width.
+      /// </summary>
+      [optional]
+      LongRange     width;
+      /// <summary>
+      /// The height or height range, in pixels. As a capability, the range should span
+      /// the video source's pre-set height values with min being the smallest height and
+      /// max being the largest height.
+      /// </summary>
+      [optional]
+      LongRange     height;
+      /// <summary>
+      /// The exact aspect ratio (width in pixels divided by height in pixels, represented
+      /// as a double rounded to the tenth decimal place) or aspect ratio range.
+      /// </summary>
+      [optional]
+      DoubleRange   aspectRatio;
+      /// <summary>
+      /// The exact frame rate (frames per second) or frame rate range. If this frame
+      /// rate cannot be determined (e.g. the source does not natively provide a frame rate,
+      /// or the frame rate cannot be determined from the source stream), then this value
+      /// must refer to the User Agent's vsync display rate.
+      /// </summary>
+      [optional]
+      DoubleRange   frameRate;
+      /// <summary>
+      /// This string (or each string, when a list) should be one of the members of
+      /// VideoFacingMode. The members describe the directions that the camera can
+      /// face, as seen from the user's perspective. Note that getConstraints may
+      /// not return exactly the same string for strings not in this enum. This
+      /// preserves the possibility of using a future version of enum for
+      /// this property.
+      /// </summary>
+      StringList    facingMode;
+      /// <summary>
+      /// The volume or volume range, as a multiplier of the linear audio sample
+      /// values. A volume of 0.0 is silence, while a volume of 1.0 is the maximum
+      /// supported volume. A volume of 0.5 will result in an approximately 6 dBSPL
+      /// change in the sound pressure level from the maximum volume. Note that any
+      /// ConstraintSet that specifies values outside of this range of 0 to 1 can
+      /// never be satisfied.
+      /// </summary>
+      [optional]
+      DoubleRange   volume;
+      /// <summary>
+      /// The sample rate in samples per second for the audio data.
+      /// </summary>
+      [optional]
+      LongRange     sampleRate;
+      /// <summary>
+      /// The linear sample size in bits. This constraint can only be satisfied for
+      /// audio devices that produce linear samples.
+      /// </summary>
+      [optional]
+      LongRange     sampleSize;
+      /// <summary>
+      /// When one or more audio streams is being played in the processes of
+      /// various microphones, it is often desirable to attempt to remove the
+      /// sound being played from the input signals recorded by the microphones.
+      /// This is referred to as echo cancellation. There are cases where it is
+      /// not needed and it is desirable to turn it off so that no audio artifacts
+      /// are introduced. This allows applications to control this behavior.
+      /// </summary>
+      BoolList      echoCancellation;
+      /// <summary>
+      /// The latency or latency range, in seconds. The latency is the time
+      /// between start of processing (for instance, when sound occurs in
+      /// the real world) to the data being available to the next step in
+      /// the process. Low latency is critical for some applications; high
+      /// latency may be acceptable for other applications because it helps
+      /// with power constraints. The number is expected to be the target
+      /// latency of the configuration; the actual latency may show some
+      /// variation from that.
+      /// </summary>
+      [optional]
+      DoubleRange   latency;
+      /// <summary>
+      /// The number of independent channels of sound that the audio data contains,
+      /// i.e. the number of audio samples per sample frame.
+      /// </summary>
+      [optional]
+      LongRange     channelCount;
+
+      /// <summary>
+      /// The origin-unique identifier for the source of the MediaStreamTrack.
+      /// </summary>
+      string        deviceId;
+      /// <summary>
+      /// The browsing session-unique group identifier for the source of the MediaStreamTrack.
+      /// </summary>
+      string        groupId;
+
+      /// <summary>
+      /// Constructs an empty instance of a MediaTrackCapabilities object.
+      /// </summary>
+      [constructor, default]
+      void MediaTrackCapabilities();
+      /// <summary>
+      /// Constructs an instance of a MediaTrackCapabilities object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(MediaTrackCapabilitiesClone)]
+      void MediaTrackCapabilities(MediaTrackCapabilities source);
+      /// <summary>
+      /// Constructs an instance of a MediaTrackCapabilities object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(MediaTrackCapabilitiesWithJson)]
+      void MediaTrackCapabilities(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// Settings is a dictionary containing one or more key-value pairs.
+    /// It must contain each key returned in GetCapabilities(). There must be
+    /// a single value for each key and the value must be a member of the set
+    /// defined for that property by getCapabilities(). The Settings
+    /// dictionary contains the actual values that the User Agent has chosen
+    /// for the object's constrainable properties. The exact syntax of the
+    /// value depends on the type of the property.
+    /// </summary>
+    [dictionary]
+    struct MediaTrackSettings
+    {
+      /// <summary>
+      /// The width or width range, in pixels. As a capability, the range should span the
+      /// video source's pre-set width values with min being the smallest width and max
+      /// being the largest width.
+      /// </summary>
+      [optional]
+      long     width;
+      /// <summary>
+      /// The height or height range, in pixels. As a capability, the range should span
+      /// the video source's pre-set height values with min being the smallest height and
+      /// max being the largest height.
+      /// </summary>
+      [optional]
+      long     height;
+      /// <summary>
+      /// The exact aspect ratio (width in pixels divided by height in pixels, represented
+      /// as a double rounded to the tenth decimal place) or aspect ratio range.
+      /// </summary>
+      [optional]
+      double   aspectRatio;
+      /// <summary>
+      /// The exact frame rate (frames per second) or frame rate range. If this frame
+      /// rate cannot be determined (e.g. the source does not natively provide a frame rate,
+      /// or the frame rate cannot be determined from the source stream), then this value
+      /// must refer to the User Agent's vsync display rate.
+      /// </summary>
+      [optional]
+      double   frameRate;
+      /// <summary>
+      /// This string (or each string, when a list) should be one of the members of
+      /// VideoFacingMode. The members describe the directions that the camera can
+      /// face, as seen from the user's perspective. Note that getConstraints may
+      /// not return exactly the same string for strings not in this enum. This
+      /// preserves the possibility of using a future version of enum for
+      /// this property.
+      /// </summary>
+      [optional]
+      string   facingMode;
+      /// <summary>
+      /// The volume or volume range, as a multiplier of the linear audio sample
+      /// values. A volume of 0.0 is silence, while a volume of 1.0 is the maximum
+      /// supported volume. A volume of 0.5 will result in an approximately 6 dBSPL
+      /// change in the sound pressure level from the maximum volume. Note that any
+      /// ConstraintSet that specifies values outside of this range of 0 to 1 can
+      /// never be satisfied.
+      /// </summary>
+      [optional]
+      double   volume;
+      /// <summary>
+      /// The sample rate in samples per second for the audio data.
+      /// </summary>
+      [optional]
+      long     sampleRate;
+      /// <summary>
+      /// The linear sample size in bits. This constraint can only be satisfied for
+      /// audio devices that produce linear samples.
+      /// </summary>
+      [optional]
+      long     sampleSize;
+      /// <summary>
+      /// When one or more audio streams is being played in the processes of
+      /// various microphones, it is often desirable to attempt to remove the
+      /// sound being played from the input signals recorded by the microphones.
+      /// This is referred to as echo cancellation. There are cases where it is
+      /// not needed and it is desirable to turn it off so that no audio artifacts
+      /// are introduced. This allows applications to control this behavior.
+      /// </summary>
+      [optional]
+      bool     echoCancellation;
+      /// <summary>
+      /// The latency or latency range, in seconds. The latency is the time
+      /// between start of processing (for instance, when sound occurs in
+      /// the real world) to the data being available to the next step in
+      /// the process. Low latency is critical for some applications; high
+      /// latency may be acceptable for other applications because it helps
+      /// with power constraints. The number is expected to be the target
+      /// latency of the configuration; the actual latency may show some
+      /// variation from that.
+      /// </summary>
+      [optional]
+      double   latency;
+      /// <summary>
+      /// The number of independent channels of sound that the audio data contains,
+      /// i.e. the number of audio samples per sample frame.
+      /// </summary>
+      [optional]
+      long     channelCount;
+      /// <summary>
+      /// The origin-unique identifier for the source of the MediaStreamTrack.
+      /// </summary>
+
+      [optional]
+      string   deviceId;
+      /// <summary>
+      /// The browsing session-unique group identifier for the source of the MediaStreamTrack.
+      /// </summary>
+      [optional]
+      string   groupId;
+
+      /// <summary>
+      /// Constructs an empty MediaTrackSettings object instance.
+      /// </summary>
+      [constructor, default]
+      void MediaTrackSettings();
+      /// <summary>
+      /// Constructs an MediaTrackSettings object instance by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(MediaTrackSettingsClone)]
+      void MediaTrackSettings(MediaTrackSettings source);
+      /// <summary>
+      /// Constructs an MediaTrackSettings object instance by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(MediaTrackSettingsWithJson)]
+      void MediaTrackSettings(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// Each member of a ConstraintSet corresponds to a constrainable property
+    /// and specifies a subset of the property's legal Capability values.
+    /// Applying a ConstraintSet instructs the User Agent to restrict the
+    /// settings of the corresponding constrainable properties to the
+    /// specified values or ranges of values. A given property may occur both
+    /// in the basic Constraints set and in the advanced ConstraintSets list,
+    /// and may occur at most once in each ConstraintSet in the advanced list.
+    /// </summary>
+    [dictionary]
+    struct MediaTrackConstraintSet
+    {
+      /// <summary>
+      /// The width or width range, in pixels. As a capability, the range
+      /// should span the video source's pre-set width values with min being
+      /// the smallest width and max being the largest width.
+      /// </summary>
+      ConstrainLong     width;
+      /// <summary>
+      /// The height or height range, in pixels. As a capability, the range
+      /// should span the video source's pre-set height values with min being
+      /// the smallest height and max being the largest height.
+      /// </summary>
+      ConstrainLong     height;
+      /// <summary>
+      /// The exact aspect ratio (width in pixels divided by height in pixels,
+      /// represented as a double rounded to the tenth decimal place) or
+      /// aspect ratio range.
+      /// </summary>
+      ConstrainDouble   aspectRatio;
+      /// <summary>
+      /// The exact frame rate (frames per second) or frame rate range. If
+      /// this frame rate cannot be determined (e.g. the source does not
+      /// natively provide a frame rate, or the frame rate cannot be
+      /// determined from the source stream), then this value must refer to
+      /// the User Agent's vsync display rate.
+      /// </summary>
+      ConstrainDouble   frameRate;
+      /// <summary>
+      /// This string (or each string, when a list) should be one of the
+      /// members of VideoFacingModeEnum. The members describe the directions
+      /// that the camera can face, as seen from the user's perspective. Note
+      /// that getConstraints may not return exactly the same string for
+      /// strings not in this enum. This preserves the possibility of using a
+      /// future version of WebIDL enum for this property.
+      /// </summary>
+      ConstrainString   facingMode;
+      /// <summary>
+      /// The volume or volume range, as a multiplier of the linear audio
+      /// sample values. A volume of 0.0 is silence, while a volume of 1.0 is
+      /// the maximum supported volume. A volume of 0.5 will result in an
+      /// approximately 6 dBSPL change in the sound pressure level from the
+      /// maximum volume. Note that any ConstraintSet that specifies values
+      /// outside of this range of 0 to 1 can never be satisfied.
+      /// </summary>
+      ConstrainDouble   volume;
+      /// <summary>
+      /// The sample rate in samples per second for the audio data.
+      /// </summary>
+      ConstrainLong     sampleRate;
+      /// <summary>
+      /// The linear sample size in bits. This constraint can only be
+      /// satisfied for audio devices that produce linear samples.
+      /// </summary>
+      ConstrainLong     sampleSize;
+      /// <summary>
+      /// When one or more audio streams is being played in the processes of
+      /// various microphones, it is often desirable to attempt to remove the
+      /// sound being played from the input signals recorded by the
+      /// microphones. This is referred to as echo cancellation. There are
+      /// cases where it is not needed and it is desirable to turn it off so
+      /// that no audio artifacts are introduced. This allows applications to
+      /// control this behavior.
+      /// </summary>
+      ConstrainBoolean  echoCancellation;
+      /// <summary>
+      /// The latency or latency range, in seconds. The latency is the time
+      /// between start of processing (for instance, when sound occurs in the
+      /// real world) to the data being available to the next step in the
+      /// process. Low latency is critical for some applications; high latency
+      /// may be acceptable for other applications because it helps with power
+      /// constraints. The number is expected to be the target latency of the
+      /// configuration; the actual latency may show some variation from that.
+      /// </summary>
+      ConstrainDouble   latency;
+      /// <summary>
+      /// The number of independent channels of sound that the audio data
+      /// contains, i.e. the number of audio samples per sample frame.
+      /// </summary>
+      ConstrainLong     channelCount;
+      /// <summary>
+      /// The origin-unique identifier for the source of the MediaStreamTrack.
+      /// The same identifier must be valid between browsing sessions of this
+      /// origin, but must also be different for other origins. Some sort of
+      /// GUID is recommended for the identifier. Note that the setting of
+      /// this property is uniquely determined by the source that is attached
+      /// to the MediaStreamTrack. In particular, getCapabilities() will
+      /// return only a single value for deviceId. This property can therefore
+      /// be used for initial media selection with getUserMedia(). However,
+      /// it is not useful for subsequent media control with
+      /// applyConstraints(), since any attempt to set a different value will
+      /// result in an unsatisfiable ConstraintSet.
+      /// </summary>
+      ConstrainString   deviceId;
+      /// <summary>
+      /// The browsing session-unique group identifier for the source of the
+      /// MediaStreamTrack. Two devices have the same group identifier if they
+      /// belong to the same physical device; for example, the audio input and
+      /// output devices representing the speaker and microphone of the same
+      /// headset would have the same groupId. Note that the setting of this
+      /// property is uniquely determined by the source that is attached to
+      /// the MediaStreamTrack. In particular, getCapabilities() will return
+      /// only a single value for groupId. Since this property is not stable 
+      /// between browsing sessions its usefulness for initial media selection
+      /// with getUserMedia() is limited. It is not useful for subsequent
+      /// media control with applyConstraints(), since any attempt to set a
+      /// different value will result in an unsatisfiable ConstraintSet.
+      /// </summary>
+      ConstrainString   groupId;
+
+      /// <summary>
+      /// Constructs an empty MediaTrackConstraintSet object instance.
+      /// </summary>
+      [constructor, default]
+      void MediaTrackConstraintSet();
+      /// <summary>
+      /// Constructs an MediaTrackConstraintSet object instance by cloning object data an existing object.
+      /// </summary>
+      [constructor, altname(MediaTrackConstraintSetClone)]
+      void MediaTrackConstraintSet(MediaTrackConstraintSet source);
+      /// <summary>
+      /// Constructs an MediaTrackConstraintSet object instance by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(MediaTrackConstraintSetWithJson)]
+      void MediaTrackConstraintSet(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// MediaTrackConstraints represents a set of media stream track constraints to be applied to a MediaStreamTrack.
+    /// </summary>
+    [dictionary]
+    struct MediaTrackConstraints : MediaTrackConstraintSet
+    {
+      typedef std::list<MediaTrackConstraintSet> ConstraintSetList;
+
+      /// <summary>
+      /// Gets or sets the advanced list of ConstraintSets that the User Agent
+      /// must attempt to satisfy, in order, skipping only those that cannot
+      /// be satisfied. The order of these ConstraintSets is significant. In
+      /// particular, when they are passed as an argument to applyConstraints,
+      /// the User Agent must try to satisfy them in the order that is
+      /// specified. Thus if optional ConstraintSets C1 and C2 can be
+      /// satisfied individually, but not together, then whichever of C1 and
+      /// C2 is first in this list will be satisfied, and the other will not.
+      /// The User Agent must attempt to satisfy all optional ConstraintSets
+      /// in the list, even if some cannot be satisfied. Thus, in the
+      /// preceding example, if optional constraint C3 is specified after C1
+      /// and C2, the User Agent will attempt to satisfy C3 even though C2
+      /// cannot be satisfied. Note that a given property name may occur only
+      /// once in each ConstraintSet but may occur in more than one
+      /// ConstraintSet.
+      /// </summary>
+      ConstraintSetList advanced;
+
+      /// <summary>
+      /// Constructs an empty instance of the MediaTrackConstraints object.
+      /// </summary>
+      [constructor, default]
+      void MediaTrackConstraints();
+      /// <summary>
+      /// Constructs an instance of the MediaTrackConstraints object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(MediaTrackConstraintsClone)]
+      void MediaTrackConstraints(MediaTrackConstraints source);
+      /// <summary>
+      /// Constructs an instance of the MediaTrackConstraints object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(MediaTrackConstraintsWithJson)]
+      void MediaTrackConstraints(Json json);
+    };
+
+    /// <summary>
+    /// The MediaStreamConstraints dictionary is used to instruct the User
+    /// Agent what sort of MediaStreamTracks to include in the MediaStream
+    /// returned by GetUserMedia().
+    /// </summary>
+    [dictionary]
+    struct MediaStreamConstraints
+    {
+      /// <summary>
+      /// If set, it requests that the returned MediaStream contain an audio
+      /// track. If a Constraints structure is provided, it further specifies
+      /// the nature and settings of the audio Track. If not set, the
+      /// MediaStream must not contain an audio Track.
+      /// </summary>
+      [optional, nullable]
+      MediaTrackConstraints audio;
+      /// <summary>
+      /// If set, it requests that the returned MediaStream contain a video
+      /// track. If a Constraints structure is provided, it further specifies
+      /// the nature and settings of the video Track. If not set, the
+      /// MediaStream must not contain a video Track.
+      /// </summary>
+      [optional, nullable]
+      MediaTrackConstraints video;
+
+      /// <summary>
+      /// Constructs an empty instance of the MediaStreamConstraints object.
+      /// </summary>
+      [constructor, default]
+      void MediaStreamConstraints();
+      /// <summary>
+      /// Constructs an instance of the MediaStreamConstraints object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(MediaStreamConstraintsClone)]
+      void MediaStreamConstraints(MediaStreamConstraints source);
+      /// <summary>
+      /// Constructs an instance of the MediaStreamConstraints object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(MediaStreamConstraintsWithJson)]
+      void MediaStreamConstraints(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The constraint attribute is set to the name of any one of the
+    /// constraints that caused the error, if any.
+    /// </summary>
+    [dictionary]
+    struct OverconstrainedError
+    {
+      /// <summary>
+      /// Gets a string representing one of the error type names.
+      /// </summary>
+      string name;
+      /// <summary>
+      /// The constraint property name where the error originated.
+      /// </summary>
+      string constraint;
+      /// <summary>
+      /// A message describing the error condition for the constraint.
+      /// </summary>
+      string message;
+    };
+    typedef PromiseRejectionReason<OverconstrainedError> PromiseRejectionReasonOverconstrainedError;
+
+    /// <summary>
+    /// This error event fires for each affected track (when multiple tracks
+    /// share the same source) after the User Agent has evaluated the current
+    /// constraints against a given source and is not able to configure the
+    /// source within the limitations established by the intersection of
+    /// imposed constraints.
+    ///
+    /// Due to being over - constrained, the User Agent must mute each
+    /// affected track.
+    ///
+    /// The affected track(s) will remain muted until the application adjusts
+    /// the constraints to accommodate the source's current effective
+    /// capabilities.
+    /// </summary>
+    struct OverconstrainedErrorEvent
+    {
+      /// <summary>
+      /// Gets the OverconstrainedError describing the error associated with
+      /// the event (if any).
+      /// </summary>
+      [getter]
+      OverconstrainedError error;
+    };
+
+    /// <summary>
+    /// MediaSource represents an object holder for a platform specific media source.
+    /// </summary>
+    [special]
+    struct MediaSource
+    {
+      /// <summary>
+      /// Gets or sets the platform specific media source.
+      /// </summary>
+      [getter, setter]
+      zs::Any source;
+
+      /// <summary>
+      /// Gets or sets the media track associated to the media source.
+      /// </summary>
+      [getter]
+      zs::Any track;
+    };
+
+    /// <summary>
+    /// A MediaStreamTrack object represents a media source in the User Agent.
+    /// An example source is a device connected to the User Agent. Other
+    /// specifications may define sources for MediaStreamTrack that override
+    //// the behavior specified here. Several MediaStreamTrack objects can
+    //// represent the same media source, e.g., when the user chooses the same
+    //// camera in the UI shown by two consecutive calls to getUserMedia() .
+    /// </summary>
+    interface MediaStreamTrack
+    {
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets a kind attribute that must return the string "Audio" if this
+      /// object represents an audio track or "Video" if this object
+      /// represents a video track.
+      /// </summary>
+      [getter]
+      MediaStreamTrackKind kind;
+
+      /// <summary>
+      /// Gets a User Agent generated an identifier string.
+      /// </summary>
+      [getter]
+      string id;
+
+      /// <summary>
+      /// Gets a unique identifier for the represented device.
+      /// </summary>
+      [getter]
+      string deviceId;
+
+      /// <summary>
+      /// Gets the label of the object's corresponding source, if any. If
+      /// the corresponding source has or had no label, the attribute must
+      /// instead return the empty string..
+      /// User Agents may label audio and video sources (e.g., "Internal
+      /// microphone" or "External USB Webcam").
+      /// </summary>
+      [getter]
+      string label;
+
+      /// <summary>
+      /// Gets or sets the enabled state for the object. On getting, the
+      /// attribute must return the value to which it was last set. On
+      /// setting, it must be set to the new value.
+      /// </summary>
+      [getter, setter]
+      bool enabled;
+
+      /// <summary>
+      /// Gets or sets the muted state of the object.
+      /// </summary>
+      /// <returns>true if the track is muted, and false otherwise.</returns>
+      [getter, setter]
+      bool muted;
+
+      /// <summary>
+      /// Gets if the track source origin is local or remote.
+      /// </summary>
+      /// <returns>true if the source origin is remote, otherwise false</returns>
+      [getter]
+      bool remote;
+
+      /// <summary>
+      /// Gets the state of the track.
+      /// </summary>
+      /// <returns>The value as most recently set by the User Agent.</returns>
+      [getter]
+      MediaStreamTrackState readyState;
+
+      /// <summary>
+      /// Gets or sets a MediaSource capable of being rendered to an output
+      /// window based upon the current track.
+      /// </summary>
+      [getter]
+      MediaSource source;
+
+      [constructor, delete]
+      void MediaStreamTrack();
+
+      /// <summary>
+      /// Clones this MediaStreamTrack.
+      /// </summary>
+      MediaStreamTrack clone();
+
+      /// When a MediaStreamTrack object's stop() method is invoked, the User Agent must run following steps:
+      /// 1. Let track be the current MediaStreamTrack object.
+      /// 2. Notify track's source that track is ended.
+      ///    A source that is notified of a track ending will be stopped,
+      ///    unless other MediaStreamTrack objects depend on it
+      /// 3. Set track's readyState attribute to ended.
+      void stop();
+
+      /// <summary>
+      /// Returns the dictionary of the names of the constrainable propertie
+      /// that the object supports.
+      MediaTrackCapabilities getCapabilities();
+      /// <summary>
+      /// Returns the Constraints that were the argument to the most recent
+      /// successful call of ApplyConstraints(), maintaining the order in
+      /// which they were specified. Note that some of the optional
+      /// ConstraintSets returned may not be currently satisfied. To check
+      /// which ConstraintSets are currently in effect, the application should
+      /// use GetSettings.
+      /// </summary>
+      MediaTrackConstraints getConstraints();
+      /// <summary>
+      /// Returns the current settings of all the constrainable properties of
+      /// the object, whether they are platform defaults or have been set by
+      /// ApplyConstraints(). Note that the actual setting of a property must
+      /// be a single value.
+      /// </summary>
+      MediaTrackSettings getSettings();
+
+      /// <summary>
+      /// The User Agent may choose new settings for the constrainable
+      /// properties of the object at any time. When it does so it must
+      /// attempt to satisfy the current Constraints
+      /// </summary>
+      zs::Promise applyConstraints(MediaTrackConstraints constraints) throws(InvalidParameters);
+
+      /// <summary>
+      /// The MediaStreamTrack object's source is temporarily unable to
+      /// provide data.
+      /// </summary>
+      [event]
+      void onMute();
+
+      /// <summary>
+      /// The MediaStreamTrack object's source is live again after having been
+      /// temporarily unable to provide data.
+      /// </summary>
+      [event]
+      void onUnmute();
+
+      /// <summary>
+      /// The MediaStreamTrack object's source will no longer provide any
+      /// data, either because the user revoked the permissions, or because
+      /// the source device has been ejected, or because the remote peer
+      /// permanently stopped sending data.
+      /// </summary>
+      [event]
+      void onEnded();
+
+      /// <summary>
+      /// This error event fires for each affected track(when multiple tracks
+      /// share the same source) after the User Agent has evaluated the
+      /// current constraints against a given source and is not able to
+      /// configure the source within the limitations established by the
+      /// intersection of imposed constraints.
+      ///
+      /// Due to being over - constrained, the User Agent must mute each
+      /// affected track.
+      ///
+      /// The affected track(s) will remain muted until the application
+      /// adjusts the constraints to accommodate the source's current
+      /// effective capabilities.
+      /// </summary>
+      [event]
+      void onOverConstrained(OverconstrainedErrorEvent event);
+    };
+  }
+}
diff --git a/ortc/idl/Ortc.idl b/ortc/idl/Ortc.idl
new file mode 100644
index 00000000..7f79dc21
--- /dev/null
+++ b/ortc/idl/Ortc.idl
@@ -0,0 +1,188 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    using namespace zs;
+
+    typedef zs::exceptions::InvalidArgument InvalidParameters;
+    typedef zs::exceptions::BadState InvalidStateError;
+    typedef zs::exceptions::NotSupported NotSupported;
+    typedef zs::exceptions::NotImplemented NotImplemented;
+    typedef zs::exceptions::UnexpectedError Unexpected;
+
+    /// <summary>
+    /// A message queue for receiving delegate events.
+    /// </summary>
+    interface MessageQueue
+    {
+      [constructor, delete]
+      void MessageQueue();
+
+      /// <summary>
+      /// The default windows message queue for the system GUI thread.
+      /// </summary>
+      [static]
+      MessageQueue getDefaultForUi();
+    };
+
+    /// <summary>
+    /// An object representation of a JSON blob.
+    /// </summary>
+    interface Json
+    {
+      /// <summary>
+      /// Construct an object representation of a JSON blob from a string.
+      /// </summary>
+      [constructor]
+      void Json(string jsonString);
+
+      /// <summary>
+      /// Convert the JSON object into a string.
+      /// </summary>
+      string toString();
+    };
+
+    //!EXCLUSIVE WINUWP
+    /// <summary>
+    /// An reference holder to the system dispatcher object.
+    /// </summary>
+    [special, platform(webhidden)]
+    interface Dispatcher
+    {
+      /// <summary>
+      /// Construct an object reference holder to the system dispatcher object.
+      /// </summary>
+      [constructor]
+      void Dispatcher(Any source);
+
+      /// <summary>
+      /// Gets or sets the default system dispatcher object.
+      /// </summary>
+      [static]
+      Any source;
+    };
+    //!EXCLUSIVE x
+
+    /// <summary>
+    /// Setup methods for the ORTC Lib stack.
+    /// </summary>
+    [static]
+    interface OrtcLib
+    {
+      /// <summary>
+      /// Initialize the ORTC stack.
+      /// </summary>
+      [static, default]
+      void setup();
+
+      /// <summary>
+      /// Initialize the ORTC stack with a target event queue for delegate events.
+      /// </summary>
+      [static, altname(setupWithQueue)]
+      void setup(MessageQueue queue);
+
+      /// <summary>
+      /// Gets or sets the NTP server time discovered in milliseconds since
+      /// NTP epoch. This property must only be set at the actual moment when
+      /// the server time was discovered to ensure the NTP clock is as closed
+      /// to accurate as possible.
+      /// </summary>
+      [static]
+      Milliseconds ntpServerTime;
+
+      /// <summary>
+      /// Starts media engine trancing system. The collected traces can be
+      /// saved to file or sent to TCP listener. Traces can be visualised
+      /// further by importing the data into Chrome browser tool that can be
+      /// accessed using following option - chrome://tracing.
+      /// This method starts the tracing engine.
+      /// </summary>
+      [static]
+      void startMediaTracing();
+      /// <summary>
+      /// Stops media tracing process.
+      /// </summary>
+      [static]
+      void stopMediaTracing();
+      /// <summary>
+      /// Indiceates whether tracing system is activated.
+      /// </summary>
+      [static]
+      bool isMediaTracing();
+      /// <summary>
+      /// Saves media trace data to the file specified by filename.
+      /// </summary>
+      [static]
+      bool saveMediaTrace(string filename);
+      /// <summary>
+      /// Sends all traced data to TCP listener specified by host name and port.
+      /// </summary>
+      [static, altname(saveMediaTraceWithHostPort)]
+      bool saveMediaTrace(string host, int port);
+
+      /// <summary>
+      /// Notify the application is going to the background.
+      /// </summary>
+      [static]
+      zs::Promise notifyGoingToBackground();
+
+      /// <summary>
+      /// Notify the application is going to the background immediately.
+      /// </summary>
+      [static]
+      void notifyGoingToBackgroundNow();
+
+      /// <summary>
+      /// Notify the application is returning from the background.
+      /// </summary>
+      [static]
+      void notifyReturningFromBackground();
+    };
+
+    //!EXCLUSIVE WINUWP
+    /// <summary>
+    /// Setup methods for the ORTC Lib stack when using dispatcher.
+    /// </summary>
+    [static, platform(webhidden)]
+    interface OrtcLibWithDispatcher
+    {
+      /// <summary>
+      /// Initialize the ORTC stack with a target dispatcher for delegate events.
+      /// </summary>
+      [static, default, altname(SetupWithDispatcher)]
+      void setup(Dispatcher dispatcher);
+    };
+    //!EXCLUSIVE x
+  }
+}
diff --git a/ortc/idl/RtpListener.idl b/ortc/idl/RtpListener.idl
new file mode 100644
index 00000000..cfb334c2
--- /dev/null
+++ b/ortc/idl/RtpListener.idl
@@ -0,0 +1,127 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// This object is fired when the RTCRtpListener detects an RTP stream
+    /// that is not configured to be processed by an existing RTCRtpReceiver
+    /// object.
+    /// </summary>
+    struct RTCRtpUnhandledEvent
+    {
+      /// <summary>
+      /// Gets the SSRC in the RTP stream triggering the OnUnhandledRtp event.
+      /// </summary>
+      [getter]
+      SsrcType ssrc;
+      /// <summary>
+      /// Gets the Payload Type value in the RTP stream triggering the
+      /// OnUnhandledRtp event.
+      /// </summary>
+      [getter]
+      PayloadType payloadType;
+      /// <summary>
+      /// Gets the value of the MID RTP header extension [BUNDLE] in
+      /// the RTP stream triggering the OnUnhandledRtp event if present.
+      /// </summary>
+      [getter]
+      string muxId;
+      /// <summary>
+      /// Gets the value of the RID RTP header extension [RID] in the
+      /// RTP stream triggering the OnUnhandledRtp event if present.
+      /// </summary>
+      [getter]
+      string rid;
+    };
+
+    /// <summary>
+    /// The RTCRtpListener listens to RTP packets received from the
+    /// RTCDtlsTransport, determining whether an incoming RTP stream is
+    /// configured to be processed by an existing RTCRtpReceiver object. If no
+    /// match is found, the unhandledrtp event is fired. This can be due to
+    /// packets having an unknown SSRC, payload type or any other error that
+    /// makes it impossible to attribute an RTP packet to a specific
+    /// RTCRtpReceiver object. The event is not fired once for each arriving
+    /// packet; multiple discarded packets for the same SSRC should result in
+    /// a single event.
+    /// </summary>
+    interface RTCRtpListener : RTCStatsProvider
+    {
+      typedef std::list<RTCRtpHeaderExtensionParameters> HeaderExtensionParametersList;
+
+      /// <summary>
+      /// Construct an instance of RTCRtpListener from an RTCDtlsTransport
+      /// object.
+      /// </summary>
+      [constructor]
+      void RTCRtpListener(RTCRtpTransport transport);
+      [constructor, altname(RTCRtpListenerWithHeaderExtensions)]
+      /// <summary>
+      /// Construct an instance of RTCRtpListener from an RTCDtlsTransport
+      /// object and the mapped header extensions to properly intepret
+      /// RTP header extensions.
+      /// </summary>
+      void RTCRtpListener(
+                          RTCRtpTransport transport,
+                          HeaderExtensionParametersList headerExtensions
+                          );
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets the RTP RTPDtlsTransport or RTPSrtpSdesTransport instance.
+      /// </summary>
+      [getter]
+      RTCRtpTransport transport;
+
+      /// <summary>
+      /// Set a list of header extensions that can be interpreted by the listener
+      /// on incoming RTP packets.
+      /// </summary>
+      void setHeaderExtensions(HeaderExtensionParametersList headerExtensions);
+
+      /// <summary>
+      /// The event handler emits the RTCRtpUnhandledEvent, which is fired
+      /// when the RTCRtpListener detects an RTP stream that is not configured
+      /// to be processed by an existing RTCRtpReceiver object.
+      /// </summary>
+      [event]
+      void onUnhandled(RTCRtpUnhandledEvent event);
+    }; 
+  }
+}
diff --git a/ortc/idl/RtpReceiver.idl b/ortc/idl/RtpReceiver.idl
new file mode 100644
index 00000000..e48aea94
--- /dev/null
+++ b/ortc/idl/RtpReceiver.idl
@@ -0,0 +1,232 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// The RTCRtpContributingSource object contains information about a
+    /// contributing source. Each time an RTP packet is received, the
+    /// RTCRtpContributingSource objects are updated. If the RTP packet
+    /// contains CSRCs, then the RTCRtpContributingSource objects
+    /// corresponding to those CSRCs are updated, and the level values for
+    /// those CSRCs are updated based on the mixer-client header extension
+    /// [RFC6464] if present. If the RTP packet contains no CSRCs, then the
+    /// RTCRtpContributingSource object corresponding to the SSRC is updated,
+    /// and the level value for the SSRC is updated based on the client-mixer
+    /// header extension [RFC6464] if present.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpContributingSource
+    {
+      /// <summary>
+      /// Gets the timestamp indicating the time of reception of the most
+      /// recent RTP packet containing the source. The timestamp corresponds
+      /// to a local clock.
+      /// </summary>
+      Time            timestamp;
+      /// <summary>
+      /// Gets the CSRC or SSRC value of the contributing source.
+      /// </summary>
+      SsrcType        csrc;
+      /// <summary>
+      /// The audio level contained in the last RTP packet received from this
+      /// source. If the source was set from an SSRC, this will be the level
+      /// value in [RFC6464]. If the source was set from a CSRC, this will be
+      /// the level value in [RFC6465]. Both [RFC6464] and [RFC6465] define
+      /// the level as a integral value from 0 to 127 representing the audio
+      /// level in negative decibels relative to the loudest signal that they
+      /// system could possibly encode. Thus, 0 represents the loudest signal
+      /// the system could possibly encode, and 127 represents silence.
+      /// </summary>
+      uint8           audioLevel;
+      /// <summary>
+      /// Gets whether the last RTP packet received from this source contains
+      /// voice activity ("true") or not ("false"). Since the "V" bit is
+      /// supported in [RFC6464] but not [RFC6465], the voiceActivityFlag
+      /// attribute will only be set when receivers enable the client-mixer
+      /// header extension (setting the vad attribute to "true"), and when RTP
+      /// packets are received from senders enabling the client-mixer header
+      /// extension (setting the vad attribute to "true").
+      /// </summary>
+      [optional]
+      bool            voiceActivityFlag;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpContributingSource.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpContributingSource();
+
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCRtpReceiver includes information relating to the RTP receiver.
+    /// </summary>
+    interaction RTCRtpReceiver : RTCStatsProvider
+    {
+      typedef std::list<RTCRtpContributingSource> ContributingSourceList;
+
+      /// <summary>
+      /// Constructs an instance of RTCRtpReceiver from a value of kind and an
+      /// RTCDtlsTransport object. If an attempt is made to construct an
+      /// RTCRtpReceiver object with transport.State  "closed", throw an
+      /// InvalidStateError exception. Upon construction, Track is set, and
+      /// the value of track.Kind is determined based on the value of kind
+      /// passed in the constructor.      
+      /// </summary>
+      [constructor]
+      void RTCRtpReceiver(
+                          MediaStreamTrackKind kind,
+                          RTCRtpTransport transport,
+                          ) throws (InvalidParameters, InvalidStateError);
+      /// <summary>
+      /// Constructs an instance of RTCRtpReceiver from a value of kind and an
+      /// RTCDtlsTransport object. If an attempt is made to construct an
+      /// RTCRtpReceiver object with transport.State or rtcpTransport.State
+      /// "closed", throw an InvalidStateError exception. Upon construction,
+      /// Track is set, and the value of track.Kind is determined based on
+      /// the value of kind passed in the constructor.      
+      /// </summary>
+      [constructor, altname(RTCRtpReceiverWithRtcpTransport)]
+      void RTCRtpReceiver(
+                          MediaStreamTrackKind kind,
+                          RTCRtpTransport transport,
+                          RTCRtcpTransport rtcpTransport
+                          ) throws(InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets the associated MediaStreamTrack instance. Upon construction, Track
+      /// is set. The value of track.kind is determined based on the value of
+      /// kind passed in the constructor.
+      /// </summary>
+      [getter]
+      MediaStreamTrack track;
+
+      /// <summary>
+      /// Gets the associated RTP RTCDtlsTransport instance.
+      /// </summary>
+      [getter]
+      RTCRtpTransport transport;
+
+      /// <summary>
+      /// Gets the RTCDtlsTransport instance over which RTCP is sent and
+      /// received. When BUNDLE is used, many RTCRtpReceiver objects will
+      /// share one rtcpTransport and will all send and receive RTCP over the
+      /// same RTCDtlsTransport. When RTCP mux is used, rtcpTransport will be
+      /// null, and both RTP and RTCP traffic will flow over the
+      /// RTCDtlsTransport transport.
+      /// </summary>
+      [getter, nullable]
+      RTCRtcpTransport rtcpTransport;
+
+      /// <summary>
+      /// Set the RTP RTCDtlsTransport. If the last call to
+      /// receive(parameters) had parameters.Rtcp.Mux set to false, throw an
+      /// InvalidParameters exception. If SetTransport() is called and
+      /// transport.State is "closed", throw an InvalidParameters exception.
+      /// </summary>
+      void setTransport(RTCRtpTransport transport) throws (InvalidParameters, InvalidStateError);
+      /// <summary>
+      /// Set the RTP RTCSrtpSdesTransport. If the last call to
+      /// receive(parameters) had parameters.Rtcp.Mux set to false, throw an
+      /// InvalidParameters exception.
+      /// </summary>
+      [altname(setTransportWithRtcpTransport)]
+      void setTransport(
+                        RTCRtpTransport transport,
+                        RTCRtcpTransport rtcpTransport
+                        ) throws(InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Obtain the receiver capabilities, based on kind. Capabilities such
+      /// as retransmission [RFC4588], redundancy [RFC2198], and Forward Error
+      /// Correction that do not have an associated value of kind are always
+      /// included, regardless of the value of kind passed to
+      /// GetCapabilities().
+      /// </summary>
+      [static]
+      RTCRtpCapabilities getCapabilities([optional] MediaStreamTrackKind kind);
+
+      /// <summary>
+      /// Media to be received is controlled by parameters. If
+      /// Receive(parameters) is called with invalid parameters, throw an
+      /// InvalidParameters exception. If rtcpTransport is not set and
+      /// Receive(parameters) is called with parameters.rtcp.mux set to false,
+      /// throw an InvalidParameters exception. The Receive() method does not
+      /// update parameters based on what is currently being received, so that
+      /// the value of parameters remains that last passed to the Receive()
+      /// method. The RTCRtpReceiver object starts receiving when Receive() is
+      /// called for the first time, and changes the receiving parameters when
+      /// Receive() is called again. The RTCRtpReceiver object stops receiving
+      /// when Stop() is called. For each value of i from 0 to the number of
+      /// codecs, check that each value of parameters.codecs[i].name not equal
+      /// to "red", "rtx" or a forward error correction codec is included in
+      /// GetCapabilities(kind).codecs[j].name, where j goes from 0 to the
+      /// number of codecs, and kind takes the value passed in the
+      /// RTCRtpReceiver constructor. If no match is found for any value of i,
+      /// throw an InvalidParameters exception. SSRC misusage also results in
+      /// an InvalidParameters exception.
+      /// </summary>
+      zs::Promise receive(RTCRtpParameters parameters) throws (InvalidParameters, InvalidStateError);
+      /// <summary>
+      /// Stops receiving the track on the wire. Stop is final like
+      /// MediaStreamTrack.
+      /// </summary>
+      void stop();
+
+      /// <summary>
+      /// Returns an RTCRtpContributingSource object for each unique CSRC or
+      /// SSRC received by this RTCRtpReceiver. The browser must keep
+      /// information from RTP packets received in the last 10 seconds. If no
+      /// contributing sources are available, an empty list is returned.
+      /// </summary>
+      ContributingSourceList getContributingSources();
+
+      /// <summary>
+      /// Solely used by the H.264/UC codec; for a receiver to request an SSRC from a sender (and not implemented by this client).
+      /// </summary>
+      void requestSendCsrc(SsrcType csrc);
+    };
+
+  }
+}
diff --git a/ortc/idl/RtpSender.idl b/ortc/idl/RtpSender.idl
new file mode 100644
index 00000000..2a0b5ec3
--- /dev/null
+++ b/ortc/idl/RtpSender.idl
@@ -0,0 +1,205 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// This object is fired if an SSRC conflict is detected within the RTP
+    /// session or an SSRC misconfiguration is detected after Send() or
+    /// Receive() returns or when SetTransport() is called.
+    /// </summary>
+    struct RTCSsrcConflictEvent
+    {
+      [constructor, delete]
+      void RTCSsrcConflictEvent();
+
+      /// <summary>
+      /// Gets the ssrc attribute represents the conflicting SSRC that caused
+      /// the event.
+      /// </summary>
+      [getter]
+      SsrcType ssrc;
+    };
+  
+    /// <summary>
+    /// The RTCRtpSender includes information relating to the RTP sender.
+    /// </summary>
+    interface RTCRtpSender : RTCStatsProvider
+    {
+      /// <summary>
+      /// Constructs an instance of an RTCRtpSender from an MediaStreamTrack
+      /// object and associated to an RTCDtlsTransport. If an attempt is made
+      /// to construct an RTCRtpSender object with transport.State 
+      /// "closed", or if track.readyState is "ended", throw an
+      /// InvalidStateError exception.
+      /// </summary>
+      [constructor]
+      void RTCRtpSender(
+                        MediaStreamTrack track,
+                        RTCRtpTransport transport,
+                        ) throws (InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Constructs an instance of an RTCRtpSender from an MediaStreamTrack
+      /// object and associated to an RTCDtlsTransport. If an attempt is made
+      /// to construct an RTCRtpSender object with transport.State or
+      /// rtcpTransport.State "closed", or if track.readyState is "ended",
+      /// throw an InvalidStateError exception.
+      /// </summary>
+      [constructor, altname(RTCRtpSenderWithRtcpTransport)]
+      void RTCRtpSender(
+                        MediaStreamTrack track,
+                        RTCRtpTransport transport,
+                        RTCRtcpTransport rtcpTransport
+                        ) throws(InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Get the associated MediaStreamTrack instance.
+      /// </summary>
+      [getter]
+      MediaStreamTrack track;
+
+      /// <summary>
+      /// Gets the RTCDtlsTransport instance over which RTCP is sent and
+      /// received. When BUNDLE is used, many RTCRtpSender objects will share
+      /// one rtcpTransport and will all send and receive RTCP over the same
+      // RTCDtlsTransport. When RTCP mux is used, rtcpTransport will be null,
+      /// and both RTP and RTCP traffic will flow over the RTCDtlsTransport
+      /// transport.
+      /// </summary>
+      [getter]
+      RTCRtpTransport transport;
+
+      /// <summary>
+      /// Gets the associated RTCP RTCDtlsTransport instance if one was
+      /// provided in the constructor. When RTCP mux is used, rtcpTransport
+      /// will be null, and both RTP and RTCP traffic will flow over the
+      /// RTCDtlsTransport transport.
+      /// </summary>
+      [getter, nullable]
+      RTCRtcpTransport rtcpTransport;
+
+      /// <summary>
+      /// Set the RTP RTCDtlsTransport. If the last call to
+      /// sender.Send(parameters) had parameters.rtcp.mux set to false,
+      /// throw an InvalidParameters exception. If SetTransport() is called
+      /// when transport.State is "closed", throw an InvalidStateError
+      /// exception.
+      /// </summary>
+      void setTransport(
+                        RTCRtpTransport transport,
+                        ) throws (InvalidParameters, InvalidStateError);
+      /// <summary>
+      /// Set the RTP RTCDtlsTransport and RTCP RTCDtlsTransport. If
+      /// SetTransport() is called when transport.State or rtcpTransport.State
+      /// is "closed", throw an InvalidStateError exception.
+      /// </summary>
+      [altname(setTransportWithRtcpTransport)]
+      void setTransport(
+                        RTCRtpTransport transport,
+                        RTCRtcpTransport rtcpTransport
+                        ) throws(InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Attempts to replace the track being sent with another track provided.
+      /// </summary>
+      zs::Promise setTrack(MediaStreamTrack track) throws(InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Obtain the sender capabilities, based on kind. Capabilities such as
+      /// retransmission [RFC4588], redundancy [RFC2198], and Forward Error
+      /// Correction that do not have an associated value of kind are always
+      /// included, regardless of the value of kind passed to
+      /// GetCapabilities().
+      /// </summary>
+      [static]
+      RTCRtpCapabilities getCapabilities([optional] MediaStreamTrackKind kind);
+
+      /// <summary>
+      /// Media to be sent is controlled by parameters. If Send() is called
+      /// with invalid parameters, throw an InvalidParameters exception. If
+      /// rtcpTransport is not set and Send(parameters) is called with
+      /// parameters.rtcp.mux set to "false", throw an InvalidParameters
+      /// exception. For each value of i from 0 to the number of encodings,
+      /// check whether parameters.encodings[i].codecPayloadType corresponds
+      /// to a value of parameters.codecs[j].payloadType where j goes from 0
+      /// to the number of codecs. If parameters.codecs[j].name is equal to
+      /// "red", "cn", "dtmf", "rtx" or a forward error correction codec,
+      /// throw an InvalidParameters exception. For each value of i from 0 to
+      /// the number of codecs, check that each value of
+      /// parameters.codecs[i].name not equal to "red", "rtx" or a forward
+      /// error correction codec is included in
+      /// GetCapabilities(track.kind).codecs[j].name, where j goes from 0 to
+      /// the number of codecs. If a match is not found for any value of i,
+      /// throw an InvalidParameters exception. If parameters.encodings is
+      /// unset, the browser behaves as though a single encodings[0] entry was
+      /// provided, with encodings[0].ssrc set to a browser-determined value,
+      /// encodings[0].active set to "true", encodings[0].codecPayloadType set
+      /// to codecs[j].payloadType where j is the index of the first codec
+      /// that is not "cn", "dtmf", "red", "rtx" or a forward error correction
+      /// codec, and all the other parameters.encodings[0] attributes (e.g.
+      /// fec, rtx, priority, maxBitrate, minQuality, resolutionScale,etc.)
+      /// unset. Calling Send(parameters) does not update parameters based on
+      /// what is currently being sent. The RTCRtpSender object starts sending
+      /// when Send() is called for the first time, and changes the sending
+      /// parameters when send() is called again. The RTCRtpSender object
+      /// stops sending when stop() is called. SSRC misusage results in an
+      /// InvalidParameters exception.
+      /// </summary>
+      zs::Promise send(RTCRtpParameters parameters) throws (InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Stops sending the track on the wire, and sends an RTCP BYE. Stop is
+      /// final as in
+      /// </summary>
+      void stop();
+
+      /// <summary>
+      /// The OnSsrcConflict event handler, of event handler type
+      /// RTCSsrcConflictEvent, is fired if an SSRC conflict is detected
+      /// within the RTP session or an SSRC misconfiguration is detected
+      /// after Send() or Receive() returns or when SetTransport() is called.
+      /// In this situation, the RTCRtpSender automatically sends an RTCP BYE
+      /// on the conflicted SSRC, if RTP packets were sent using that SSRC.
+      /// </summary>
+      [event]
+      void onSsrcConflict(RTCSsrcConflictEvent conflict);
+    };
+  }
+}
diff --git a/ortc/idl/RtpTypes.idl b/ortc/idl/RtpTypes.idl
new file mode 100644
index 00000000..13f8a89a
--- /dev/null
+++ b/ortc/idl/RtpTypes.idl
@@ -0,0 +1,1424 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// A base object type representing codec capability objects available for a given codec.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpCodecCapabilityOptions
+    {
+      [constructor, delete]
+      void RTCRtpCodecCapabilityOptions();
+    };
+
+    /// <summary>
+    /// A base object type representing codec capability parameters for a given object.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpCodecCapabilityParameters
+    {
+      [constructor, delete]
+      void RTCRtpCodecCapabilityParameters();
+    };
+
+    [dictionary]
+    struct RTCRtpCodecParameterSettings
+    {
+      [constructor, delete]
+      void RTCRtpCodecParameterSettings();
+    };
+
+    /// <summary>
+    /// RTCRtcpFeedback provides information on RTCP feedback messages.
+    /// </summary>
+    [dictionary]
+    struct RTCRtcpFeedback
+    {
+      /// <summary>
+      /// Gets or sets valid values for type are the "RTCP Feedback" Attribute
+      /// Values enumerated in [iana.org/assignments/sdp-parameters/sdp-parameters.xhtml#sdp-parameters-14]
+      /// ("ack", "ccm", "nack", etc.), as well as "goog-remb"
+      /// [draft-alvestrand-rmcat-remb] and "transport-cc"
+      /// [draft-holmer-rmcat-transport-wide-cc-extensions].
+      /// </summary>
+      string type;
+      /// <summary>
+      /// Gets or sets the parameters associated with the Type. For a type of
+      /// "ack" or "nack", valid values for parameter are the "ack" and "nack"
+      /// Attribute Values enumerated in
+      /// [iana.org/assignments/sdp-parameters/sdp-parameters.xhtml#sdp-parameters-15]
+      /// ("sli", "rpsi", etc.). For the Generic NACK feedback message defined
+      /// in [RFC4585] Section 6.2.1, the type attribute is set to "nack" and
+      /// the parameter attribute is unset. For a type of "ccm", valid values
+      /// for parameter are the "Codec Control Messages" enumerated in
+      /// [iana.org/assignments/sdp-parameters/sdp-parameters.xhtml#sdp-parameters-19]
+      /// ("fir", "tmmbr" (includes "tmmbn"), etc.).
+      /// </summary>
+      string parameter;
+
+      /// <summary>
+      /// Constructs an empty instance of a RTCRtcpFeedback object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtcpFeedback();
+      /// <summary>
+      /// Constructs an instance of a RTCRtcpFeedback object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtcpFeedbackClone)]
+      void RTCRtcpFeedback(RTCRtcpFeedback source);
+      /// <summary>
+      /// Constructs an instance of a RTCRtcpFeedback object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtcpFeedbackWithJson)]
+      void RTCRtcpFeedback(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// RTCRtpCodecCapability provides information on the capabilities of a
+    /// codec.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpCodecCapability
+    {
+      typedef std::list<RTCRtcpFeedback> RtcpFeedbackList;
+
+      /// <summary>
+      /// Gets or sets the MIME media type. Valid types are listed in
+      /// [iana.org/assignments/rtp-parameters/rtp-parameters.xhtml#rtp-parameters-2].
+      /// </summary>
+      string                          name;
+      /// <summary>
+      /// Gets or sets the media supported by the codec: "audio", "video" or
+      /// "" for both.
+      /// </summary>
+      string                          kind;
+      /// <summary>
+      /// Gets or sets the codec clock rate expressed in Hertz. If unset, the
+      /// codec is applicable to any clock rate.
+      /// </summary>
+      [optional]
+      unsigned long                   clockRate;
+      /// <summary>
+      /// Gets or sets the preferred RTP payload type for the codec denoted by
+      /// RTCRtpCodecCapability.name. This attribute was added to make it
+      /// possible for the sender and receiver to pick a matching payload type
+      /// when creating sender and receiver parameters. When returned by
+      /// RTCRtpSender.GetCapabilities(),
+      /// RTCRtpCapabilities.Codecs.PreferredPayloadtype represents the
+      /// preferred RTP payload type for sending. When returned by
+      /// RTCRtpReceiver.GetCapabilities(),
+      /// RTCRtpCapabilities.Codecs.PreferredPayloadtype represents the
+      /// preferred RTP payload type for receiving. To avoid payload type
+      /// conflicts, each value of preferredPayloadType must be unique.
+      /// </summary>
+      PayloadType                     preferredPayloadType;
+      /// <summary>
+      /// Gets or sets the preferred duration of media represented by a packet
+      /// in milliseconds for the RTCRtpSender or RTCRtpReceiver.
+      /// </summary>
+      Milliseconds                    pTime;
+      /// <summary>
+      /// Gets or sets the maximum packetization time supported by the
+      /// RTCRtpReceiver.
+      /// </summary>
+      Milliseconds                    maxPTime;
+      /// <summary>
+      /// Gets or sets the number of channels supported (e.g. two for stereo).
+      /// For video, this attribute is unset.
+      /// </summary>
+      [optional]
+      unsigned long                   numChannels;
+      /// <summary>
+      /// Gets or sets the transport layer and codec-specific feedback
+      /// messages for this codec.
+      /// </summary>
+      RtcpFeedbackList                rtcpFeedback;
+      /// <summary>
+      /// Gets or sets the codec-specific parameters that must be signaled to
+      /// the remote party.
+      /// </summary>
+      [dynamic]
+      RTCRtpCodecCapabilityParameters parameters;        // OpusCodecCapabilityParameters, VP8CodecCapabilityParameters, H264CodecCapabilityParameters, RTXCodecCapabilityParameters, FlexFECCodecCapabilityParameters
+      /// <summary>
+      /// Gets or sets the codec-specific parameters available for signaling.
+      /// </summary>
+      [dynamic]
+      RTCRtpCodecCapabilityOptions    options;                 // OpusCodecCapabilityOptions
+      /// <summary>
+      /// Gets or sets the maximum number of temporal layer extensions
+      /// supported by this codec (e.g. a value of 1 indicates support for up
+      /// to 2 temporal layers). A value of 0 indicates no support for
+      /// temporal scalability.
+      /// </summary>
+      unsigned short                  maxTemporalLayers;
+      /// <summary>
+      /// Gets or sets the maximum number of spatial layer extensions
+      /// supported by this codec (e.g. a value of 1 indicates support for up
+      /// to 2 spatial layers). A value of 0 indicates no support for spatial
+      /// scalability.
+      /// </summary>
+      unsigned short                  maxSpatialLayers;
+      /// <summary>
+      /// Gets or sets whether the implementation can send SVC layers
+      /// utilizing distinct SSRCs. Unset for audio codecs. For video codecs,
+      /// only set if the codec supports scalable video coding with multiple
+      /// streams.
+      /// </summary>
+      bool                            svcMultiStreamSupport;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpCodecCapability object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpCodecCapability();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpCodecCapability object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpCodecCapabilityClone)]
+      void RTCRtpCodecCapability(RTCRtpCodecCapability source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpCodecCapability object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpCodecCapabilityWithJson)]
+      void RTCRtpCodecCapability(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCRtpHeaderExtension dictionary enables a header extension to be
+    /// configured for use within an RTCRtpSender or RTCRtpReceiver.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpHeaderExtension
+    {
+      /// <summary>
+      /// Gets or sets the media supported by the header extension: "audio"
+      /// for an audio codec, "video" for a video codec, and "" for both.
+      /// </summary>
+      string kind;
+      /// <summary>
+      /// Gets or sets the URI of the RTP header extension, as defined in
+      /// [RFC5285].
+      /// </summary>
+      string uri;
+      /// <summary>
+      /// Gets or sets the preferred ID value that goes in the packet.
+      /// </summary>
+      uint16 preferredId;
+      /// <summary>
+      /// Gets or sets if it is preferred that the value in the header be
+      /// encrypted as per [RFC6904] if true. Default is to prefer
+      /// unencrypted.
+      /// </summary>
+      bool   preferredEncrypt;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpHeaderExtension object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpHeaderExtension();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpHeaderExtension object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpHeaderExtensionClone)]
+      void RTCRtpHeaderExtension(RTCRtpHeaderExtension source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpHeaderExtension object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpHeaderExtensionWithJson)]
+      void RTCRtpHeaderExtension(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+
+    /// <summary>
+    /// The RTCRtpCapabilities object expresses the capabilities of
+    /// RTCRtpSender and RTCRtpReceiver objects. 
+    /// </summary>
+    [dictionary]
+    struct RTCRtpCapabilities
+    {
+      typedef string FecMechanism;
+      typedef std::list<RTCRtpCodecCapability> CodecCapabilityList;
+      typedef std::list<RTCRtpHeaderExtension> HeaderExtensionsList;
+      typedef std::list<FecMechanism> FecMechanismList;
+
+      /// <summary>
+      /// Gets or sets the supported codecs.
+      /// </summary>
+      CodecCapabilityList   codecs;
+      /// <summary>
+      /// </summary>
+      HeaderExtensionsList  headerExtensions;
+      /// <summary>
+      /// Gets or sets the supported Forward Error Correction (FEC)
+      /// mechanisms. Values include "red", "red+ulpfec" and "flexfec".
+      /// [draft-ietf-rtcweb-fec] summarizes requirements relating to FEC
+      /// mechanisms.
+      /// </summary>
+      FecMechanismList      fecMechanisms;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpCapabilities object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpCapabilities();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpCapabilities object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpCapabilitiesClone)]
+      void RTCRtpCapabilities(RTCRtpCapabilities source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpCapabilities object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpCapabilitiesWithJson)]
+      void RTCRtpCapabilities(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The following capability options are defined for Opus:
+    /// </summary>
+    [dictionary]
+    struct RTCRtpOpusCodecCapabilityOptions : RTCRtpCodecCapabilityOptions
+    {
+      // sender capabilities
+      /// <summary>
+      /// Gets or sets the default value for the encoder's computational
+      /// complexity. The supported range is 0-10 with 10 representing the
+      /// highest complexity.
+      /// </summary>
+      [optional]
+      unsigned long complexity;
+      /// <summary>
+      /// Gets or sets the default value for the type of signal being encoded.
+      /// Possible values are string version of enum OpusCodecSignal.
+      /// </summary>
+      [optional]
+      RTCRtpOpusCodecCapabilityOptionsSignal signal;
+      /// <summary>
+      /// Gets or sets the default value for the encoder's intended
+      /// application. Possible values are string version of enum
+      /// OpusCodecApplication.
+      /// </summary>
+      [optional]
+      RTCRtpOpusCodecCapabilityOptionsApplication application;
+      /// <summary>
+      /// Gets or sets the default value for the encoder's expected packet
+      /// loss percentage. Possible values are 0-100.
+      /// </summary>
+      [optional]
+      unsigned long packetLossPerc;
+      /// <summary>
+      /// Gets or sets the default value for whether prediction is disabled,
+      /// making frames almost complete independent (if true) or not (if false).
+      /// </summary>
+      [optional]
+      bool predictionDisabled;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpOpusCodecCapabilityOptions object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpOpusCodecCapabilityOptions();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpOpusCodecCapabilityOptions object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpOpusCodecCapabilityOptionsClone)]
+      void RTCRtpOpusCodecCapabilityOptions(RTCRtpOpusCodecCapabilityOptions source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpOpusCodecCapabilityOptions object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpOpusCodecCapabilityOptionsWithJson)]
+      void RTCRtpOpusCodecCapabilityOptions(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    // https://tools.ietf.org/html/rfc7587#section-6.1
+    /// <summary>
+    /// The following optional capability parameters are defined for "opus",
+    /// as noted in [RFC7587] Section 6.1:
+    /// </summary>
+    [dictionary]
+    struct RTCRtpOpusCodecCapabilityParameters : RTCRtpCodecCapabilityParameters
+    {
+      /// <summary>
+      /// Gets or sets a hint about the maximum output sampling rate that the
+      /// receiver is capable of rendering in Hz.
+      /// </summary>
+      [optional]
+      unsigned long maxPlaybackRate;
+      /// <summary>
+      /// Gets or sets the maximum average receive bitrate of a session in
+      /// bits per second (bits/s).
+      /// </summary>
+      [optional]
+      unsigned long maxAverageBitrate;
+      /// <summary>
+      /// Gets or sets of whether the decoder prefers receiving stereo or
+      /// mono signals.
+      /// </summary>
+      [optional]
+      bool stereo;
+      /// <summary>
+      /// Gets or sets if the decoder prefers the use of constant bitrate (if
+      /// true) or variable bitrate (if false).
+      /// </summary>
+      [optional]
+      bool cbr;
+      /// <summary>
+      /// Gets or sets if the decoder has the capability to take advantage of
+      /// Opus in-band fec (if true) or not (if false).
+      /// </summary>
+      [optional]
+      bool useInbandFec;
+      /// <summary>
+      /// Gets or sets if the decoder prefers the use of DTX (if true) or not
+      /// (if false).
+      /// </summary>
+      [optional]
+      bool useDtx;
+
+      // sender capability parameters
+
+      /// <summary>
+      /// A hint about the maximum input sampling rate that the sender is
+      /// likely to produce.
+      /// </summary>
+      [optional]
+      unsigned long sPropMaxCaptureRate;
+      /// <summary>
+      /// Gets or sets whether the sender is likely to produce stereo audio.
+      /// </summary>
+      [optional]
+      bool sPropStereo;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpOpusCodecCapabilityParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpOpusCodecCapabilityParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpOpusCodecCapabilityParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpOpusCodecCapabilityParametersSource)]
+      void RTCRtpOpusCodecCapabilityParameters(RTCRtpOpusCodecCapabilityParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpOpusCodecCapabilityParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpOpusCodecCapabilityParametersWithJson)]
+      void RTCRtpOpusCodecCapabilityParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    // https://tools.ietf.org/html/rfc7741#section-6.1
+    /// <summary>
+    /// The following receiver capability parameters are defined for "vp8", as
+    /// noted in [RFC7741] Section 6.1:
+    /// </summary>
+    [dictionary]
+    struct RTCRtpVp8CodecCapabilityParameters : RTCRtpCodecCapabilityParameters,
+                                                RTCRtpCodecParameterSettings
+    {
+      /// <summary>
+      /// Gets or sets the maximum frame rate in frames per second that the
+      /// decoder is capable of decoding.
+      /// </summary>
+      [optional]
+      unsigned long maxFr;
+      /// <summary>
+      /// Gets or sets the maximum frame size in macroblocks that the decoder
+      /// is capable of decoding.
+      /// </summary>
+      [optional]
+      unsigned long long maxFs;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpVp8CodecCapabilityParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpVp8CodecCapabilityParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpVp8CodecCapabilityParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpVp8CodecCapabilityParametersClone)]
+      void RTCRtpVp8CodecCapabilityParameters(RTCRtpVp8CodecCapabilityParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpVp8CodecCapabilityParameters object by extrating object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpVp8CodecCapabilityParametersWithJson)]
+      void RTCRtpVp8CodecCapabilityParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    // https://tools.ietf.org/html/rfc7742#section-6.2
+    /// <summary>
+    /// The following capability parameters are defined for "h264", as noted
+    /// in [RFC6184] Section 8.1, and [draft-ietf-rtcweb-video] Section 6.2.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpH264CodecCapabilityParameters : RTCRtpCodecCapabilityParameters,
+                                                 RTCRtpCodecParameterSettings
+    {
+      typedef std::list<unsigned short>  PacketizationModeList;
+
+      /// <summary>
+      /// Gets or sets the maximum capability of the decoder (for an
+      /// RTCRtpReceiver) or the encoder (for an RTCRtpSender). It must be
+      /// supported, as noted in [draft-ietf-rtcweb-video] Section 6.2.
+      /// </summary>
+      [optional]
+      unsigned long profileLevelId;
+      /// <summary>
+      /// A sequence of unsigned shorts, each ranging from 0 to 2, indicating
+      /// supported packetizationMode values. As noted in
+      /// [draft-ietf-rtcweb-video] Section 6.2, support for packetization
+      /// mode 1 is mandatory.
+      /// </summary>
+      PacketizationModeList packetizationModes;
+
+      /// <summary>
+      /// Gets or sets an integer indicating the maximum macroblock processing
+      /// rate in units of macroblocks per second.
+      /// </summary>
+      [optional]
+      unsigned long long maxMbps;
+      /// <summary>
+      /// Gets or sets an integer indicating the maximum static macroblock
+      /// processing rate in units of static macroblocks per second, under the
+      /// hypothetical assumption that all macroblocks are static macroblocks.
+      /// </summary>
+      [optional]
+      unsigned long long maxSMbps;
+      /// <summary>
+      /// Gets or sets an integer indicating the maximum frame size in units
+      /// of macroblocks.
+      /// </summary>
+      [optional]
+      unsigned long long maxFs;
+      /// <summary>
+      /// Gets or sets an integer indicating the maximum coded picture buffer
+      /// size in units of 1000 bits for the VCL HRD parameters and in units
+      /// of 1200 bits for the NAL HRD parameters.
+      /// </summary>
+      [optional]
+      unsigned long long maxCpb;
+      /// <summary>
+      /// Gets or sets an integer indicating the maximum decoded picture
+      /// buffer size in units of 8 / 3 macroblocks.
+      /// </summary>
+      [optional]
+      unsigned long long maxDpb;
+      /// <summary>
+      /// Gets or sets an integer indicating the maximum video bitrate in
+      /// units of 1000 bits per second for the VCL HRD parameters and in
+      /// units of 1200 bits per second for the NAL HRD parameters.
+      /// </summary>
+      [optional]
+      unsigned long long maxBr;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpH264CodecCapabilityParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpH264CodecCapabilityParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpH264CodecCapabilityParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpH264CodecCapabilityParametersClone)]
+      void RTCRtpH264CodecCapabilityParameters(RTCRtpH264CodecCapabilityParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpH264CodecCapabilityParameters object by extrating object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpH264CodecCapabilityParametersWithJson)]
+      void RTCRtpH264CodecCapabilityParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+    
+    // https://tools.ietf.org/html/rfc4588#section-8.1
+    /// <summary>
+    /// The following capability is defined for "rtx", as noted in [RFC4588]
+    /// Section 8.6:
+    /// </summary>
+    [dictionary]
+    struct RTCRtpRtxCodecCapabilityParameters : RTCRtpCodecCapabilityParameters,
+                                                RTCRtpCodecParameterSettings
+    {
+      /// <summary>
+      /// Gets or sets the associated payload type of the original stream
+      /// being retransmitted, as defined in [RFC4588].
+      /// </summary>
+      PayloadType apt;
+      /// <summary>
+      /// Gets or sets the default time in milliseconds (measured from the
+      /// time a packet was first sent) that the sender keeps an RTP packet
+      /// in its buffers available for retransmission, as defined in
+      /// [RFC4588].
+      /// </summary>
+      Milliseconds rtxTime;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpRtxCodecCapabilityParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpRtxCodecCapabilityParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpRtxCodecCapabilityParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpRtxCodecCapabilityParametersClone)]
+      void RTCRtpRtxCodecCapabilityParameters(RTCRtpRtxCodecCapabilityParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpRtxCodecCapabilityParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpRtxCodecCapabilityParametersWithJson)]
+      void RTCRtpRtxCodecCapabilityParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The following capabilities are defined for "flexfec", as noted in
+    /// [draft-ietf-rtcweb-fec] Section 5.1.1:
+    /// </summary>
+    [dictionary]
+    struct RTCRtpFlexFecCodecCapabilityParameters : RTCRtpCodecCapabilityParameters,
+                                                    RTCRtpCodecParameterSettings
+    {
+      /// <summary>
+      /// Gets or sets the default time that spans the source packets and the
+      /// corresponding repair packets, in microseconds.
+      /// </summary>
+      Microseconds repairWindow;
+
+      /// <summary>
+      /// Gets or sets the default number of columns of the source block that
+      /// are protected by this FEC block.
+      /// </summary>
+      [optional]
+      unsigned long l;
+      /// <summary>
+      /// Gets or sets the default number of rows of the source block that are
+      /// protected by this FEC block.
+      /// </summary>
+      [optional]
+      unsigned long d;
+      /// <summary>
+      /// Gets or sets the default type of protection for the sender: 0 for
+      /// 1-D interleaved FEC protection, 1 for 1-D non-interleaved FEC
+      /// protection, and 2 for 2-D parity FEC protection. The value of 3 is
+      /// reserved for future use.
+      /// </summary>
+      [optional]
+      RTCRtpFlexFecCodecCapabilityParametersToP toP;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpFlexFecCodecCapabilityParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpFlexFecCodecCapabilityParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpFlexFecCodecCapabilityParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpFlexFecCodecCapabilityParametersClone)]
+      void RTCRtpFlexFecCodecCapabilityParameters(RTCRtpFlexFecCodecCapabilityParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpFlexFecCodecCapabilityParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpFlexFecCodecCapabilityParametersWithJson)]
+      void RTCRtpFlexFecCodecCapabilityParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// RTCRtcpParameters provides information on RTCP settings.
+    /// </summary>
+    [dictionary]
+    struct RTCRtcpParameters {
+      /// <summary>
+      /// Gets or sets the SSRC to be used in the "SSRC of packet sender"
+      /// field defined in [RFC3550] Section 6.4.2 (Receiver Report) and
+      /// [RFC4585] Section 6.1 (Feedback Messages), as well as the "SSRC"
+      /// field defined in [RFC3611] Section 2 (Extended Reports). It can only
+      /// be set for an RTCRtpReceiver.
+      /// </summary>
+      SsrcType  ssrc;
+      /// <summary>
+      /// Gets or sets the Canonical Name (CNAME) used by RTCP (e.g. in SDES
+      /// messages). Guidelines for CNAME generation are provided in
+      /// [draft-ietf-rtcweb-rtp-usage] Section 4.9 and [RFC7022].
+      /// </summary>
+      string    cName;
+      /// <summary>
+      /// Gets or sets whether reduced size RTCP [RFC5506] is configured
+      /// (if true) or compound RTCP as specified in [RFC3550] (if false).
+      /// </summary>
+      bool      reducedSize;
+      /// <summary>
+      /// Gets or sets whether RTP and RTCP are multiplexed, as specified in
+      /// [RFC5761]. The default is true. If set to false, the RTCIceTransport
+      /// must have an associated RTCIceTransport object with a component of
+      /// "RTCP", in which case RTCP will be sent on the associated
+      /// RTCIceTransport.
+      /// </summary>
+      bool      mux = true;
+
+      /// <summary>
+      /// Creates an empty instance of an RTCRtcpParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtcpParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtcpParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtcpParametersClone)]
+      void RTCRtcpParameters(RTCRtcpParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtcpParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtcpParametersWithJson)]
+      void RTCRtcpParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// RTCRtpCodecParameters provides information on codec settings.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpCodecParameters
+    {
+      typedef std::list<RTCRtcpFeedback> RtcpFeedbackList;
+
+      [constructor, delete]
+      void RTCRtpCodecParameters();
+
+      /// <summary>
+      /// Gets or sets the MIME media type. Valid types are listed in
+      /// [www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml#rtp-parameters-2].
+      /// The name must always be provided.
+      /// </summary>
+      string                        name;
+      /// <summary>
+      /// Gets or sets the value that goes in the RTP Payload Type Field
+      /// [RFC3550]. The payloadType must always be provided, and must be
+      /// unique.
+      /// </summary>
+      PayloadType                   payloadType;
+      /// <summary>
+      /// Gets or sets the codec clock rate expressed in Hertz, null if unset.
+      /// </summary>
+      [optional]
+      unsigned long                 clockRate;
+      /// <summary>
+      /// Gets or sets the duration of media represented by a packet in
+      /// milliseconds for the RTCRtpSender. If unset, the RTCRtpSender may
+      /// select any value up to maxptime.
+      /// </summary>
+      Milliseconds                  pTime;
+      /// <summary>
+      /// Gets or sets the maximum packetization time set on the RTCRtpSender.
+      /// Not specified if unset. If Ptime is also set, Maxptime is ignored.
+      /// </summary>
+      Milliseconds                  maxPTime;
+      /// <summary>
+      /// Gets or sets the number of channels supported (e.g. two for stereo).
+      /// If unset for audio, use the codec default. For video, this can be
+      /// left unset.
+      /// </summary>
+      [optional]
+      unsigned long                 numChannels;
+      /// <summary>
+      /// </summary>
+      RtcpFeedbackList              rtcpFeedback;
+      /// <summary>
+      /// Gets or sets the codec-specific parameters available for signaling.
+      /// </summary>
+      [dynamic]
+      RTCRtpCodecParameterSettings  parameters;  // see OpusCodecParameters, RTXCodecParameters, REDCodecParameters, FlexFECCodecParameters for definitions
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpCodecParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpCodecParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpCodecParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpCodecParametersClone)]
+      void RTCRtpCodecParameters(RTCRtpCodecParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpCodecParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpCodecParametersWithJson)]
+      void RTCRtpCodecParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCRtpHeaderExtension dictionary configers the header extensions
+    /// for use within an RTCRtpSender or RTCRtpReceiver.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpHeaderExtensionParameters
+    {
+      /// <summary>
+      /// Gets or sets the URI of the RTP header extension, as defined in
+      /// [RFC5285].
+      /// </summary>
+      string  uri;
+      /// <summary>
+      /// Gets or sets the value that goes in the packet.
+      /// </summary>
+      uint16  id;
+      /// <summary>
+      /// Gets or sets the value in the header is encrypted as per [RFC6904],
+      /// if true. Default is unencrypted.
+      /// </summary>
+      bool    encrypt;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpHeaderExtensionParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpHeaderExtensionParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpHeaderExtensionParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpHeaderExtensionParametersClone)]
+      void RTCRtpHeaderExtensionParameters(RTCRtpHeaderExtensionParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpHeaderExtensionParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpHeaderExtensionParametersWithJson)]
+      void RTCRtpHeaderExtensionParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCRtpFecParameters represents the FEC sets for a particular
+    /// encoding.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpFecParameters
+    {
+      /// <summary>
+      /// Gets or sets the SSRC to use for FEC. If unset in an RTCRtpSender
+      /// object, the ORTC engine will choose.
+      /// </summary>
+      [optional]
+      SsrcType  ssrc;
+      /// <summary>
+      /// Gets or sets the Forward Error Correction (FEC) mechanism to use:
+      /// "red", "red+ulpfec" or "flexfec".
+      /// </summary>
+      string    mechanism;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpFecParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpFecParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpFecParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpFecParametersClone)]
+      void RTCRtpFecParameters(RTCRtpFecParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpFecParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpFecParametersWithJson)]
+      void RTCRtpFecParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCRtpRtxParameters represents the RTX sets for a particular
+    /// encoding.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpRtxParameters
+    {
+      /// <summary>
+      /// Gets or sets the SSRC to use for retransmission, as specified in
+      /// [RFC4588]. If unset when passed to RTCRtpSender.Send(), the
+      /// ORTC engine will choose.
+      /// </summary>
+      [optional]
+      SsrcType ssrc;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpRtxParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpRtxParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpRtxParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpRtxParametersClone)]
+      void RTCRtpRtxParameters(RTCRtpRtxParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpRtxParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpRtxParametersWithJson)]
+      void RTCRtpRtxParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// RTCRtpEncodingParameters provides information relating to the
+    /// encoding.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpEncodingParameters
+    {
+      typedef string EncodingId;
+      typedef std::list<EncodingId> EncodingIdList;
+
+      /// <summary>
+      /// Gets or sets the SSRC for this layering/encoding.
+      /// </summary>
+      [optional]
+      SsrcType                ssrc;
+      /// <summary>
+      /// Gets or sets the codec payload type per-encoding. If unset, the
+      /// ORTC engine will choose the first codec in parameters.Codecs[] of
+      /// the appropriate kind.
+      /// </summary>
+      [optional]
+      PayloadType             codecPayloadType;
+      /// <summary>
+      /// Gets or sets the FEC mechanism.
+      /// </summary>
+      [optional]
+      RTCRtpFecParameters     fec;
+      /// <summary>
+      /// Gets or sets the RTX [RFC4588] parameters.
+      /// </summary>
+      [optional]
+      RTCRtpRtxParameters     rtx;
+      /// <summary>
+      /// Gets or sets the priority of this encoding.
+      /// </summary>
+      [optional]
+      RTCRtpPriorityType      priority;
+      /// <summary>
+      /// Gets or sets the maximum bitrate ramp up for resolution/quality/
+      /// framerate, if set.
+      /// </summary>
+      [optional]
+      unsigned long long      maxBitrate;
+      /// <summary>
+      /// Gets or sets the minimum quality to never send less than.
+      /// </summary>
+      [optional]
+      double                  minQuality;
+      /// <summary>
+      /// Gets or sets the video's resolution will be scaled down in each
+      /// dimension by the given value before sending, if the sender's kind is
+      /// "video".
+      /// </summary>
+      [optional]
+      double                  resolutionScale;
+      /// <summary>
+      /// Gets or sets the inverse of the input framerate fraction to be
+      /// encoded.
+      /// </summary>
+      [optional]
+      double                  framerateScale;
+      /// <summary>
+      /// Gets or sets an indicates whether this encoding is actively being
+      /// sent for the RTCRtpSender. Setting it to false causes this
+      /// encoding to no longer be sent.
+      /// </summary>
+      bool                    active = true;
+      /// <summary>
+      /// Gets or sets an identifier for the encoding object.
+      /// </summary>
+      EncodingId              encodingId;
+      /// <summary>
+      /// Gets or sets the EncodingIds on which this layer depends.
+      /// </summary>
+      EncodingIdList          dependencyEncodingIds;
+
+      /// <summary>
+      /// Constructs an empty instance of the RTCRtpEncodingParameters.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpEncodingParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpEncodingParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpEncodingParametersClone)]
+      void RTCRtpEncodingParameters(RTCRtpEncodingParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpEncodingParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpEncodingParametersWithJson)]
+      void RTCRtpEncodingParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// RTCRtpParameters contains the RTP stack settings.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpParameters
+    {
+      typedef std::list<RTCRtpCodecParameters> CodecParametersList;
+      typedef std::list<RTCRtpHeaderExtensionParameters> HeaderExtensionParametersList;
+      typedef std::list<RTCRtpEncodingParameters> EncodingParametersList;
+
+      /// <summary>
+      /// Gets or sets the muxId assigned to the RTP stream, if any.
+      /// </summary>
+      string                        muxId;
+      /// <summary>
+      /// Gets or sets the codecs to send or receive (could include RED
+      /// [RFC2198], RTX [RFC4588] and CN [RFC3389]). codecs must be set for
+      /// an RTCRtpParameters object to be a valid argument passed to Send()
+      /// or Receive().
+      /// </summary>
+      CodecParametersList           codecs;
+      /// <summary>
+      /// Gets or sets the header extensions. If unset, no header extensions
+      /// are configured.
+      /// </summary>
+      HeaderExtensionParametersList headerExtensions;
+      /// <summary>
+      /// Gets or sets the "encodings" or "layers" to be used for things like
+      /// simulcast, Scalable Video Coding, RTX, FEC, etc. 
+      /// </summary>
+      EncodingParametersList        encodings;
+      /// <summary>
+      /// Gets or sets the parameters to configure RTCP. 
+      /// </summary>
+      RTCRtcpParameters             rtcp;
+      /// <summary>
+      /// Gets or sets the degradation preference when bandwidth is
+      /// constrained and the RTCRtpSender needs to choose between degrading
+      /// resolution or degrading framerate.
+      /// </summary>
+      RTCRtpDegradationPreference   degredationPreference = balanced;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpParametersClone)]
+      void RTCRtpParameters(RTCRtpParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpParametersWithJson)]
+      void RTCRtpParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The following settings are defined for "opus".
+    /// </summary>
+    [dictionary]
+    struct RTCRtpOpusCodecParameterSettings : RTCRtpCodecParameterSettings
+    {
+      // sender parameters
+
+      /// <summary>
+      /// Gets or sets the maximum output sampling rate of the encoder in Hz.
+      /// </summary>
+      [optional]
+      unsigned long maxPlaybackRate;
+      /// <summary>
+      /// Gets or sets the maximum average receive bitrate of a session in bits
+      /// per second (bits/s).
+      /// </summary>
+      [optional]
+      unsigned long maxAverageBitrate;
+      /// <summary>
+      /// </summary>
+      [optional]
+      bool stereo;
+      /// <summary>
+      /// Gets or sets if the encoder is configured to generate constant
+      /// bitrate (if true) or variable bitrate (if false).
+      /// </summary>
+      [optional]
+      bool cbr;
+      /// <summary>
+      /// Gets or sets if the encoder is configured to generate Opus in-band
+      /// fec (if true) or not (if false).
+      /// </summary>
+      [optional]
+      bool useInbandFec;
+      /// <summary>
+      /// Gets or sets if the encoder is configured to use DTX (if true) or
+      /// not (if false).
+      /// </summary>
+      [optional]
+      bool useDtx;
+
+      /// <summary>
+      /// Gets or sets the encoder's computational complexity. The supported
+      // range is 0-10 with 10 representing the highest complexity.
+      /// </summary>
+      [optional]
+      unsigned long complexity;
+      /// <summary>
+      /// Gets or sets the type of signal being encoded. Possible values are
+      /// the string form of the enum OpusCodecSignal.
+      /// </summary>
+      [optional]
+      RTCRtpOpusCodecCapabilityOptionsSignal signal;
+      /// <summary>
+      /// Gets or sets the encoder's intended application. Possible values are
+      /// the string form of the enum OpusCodecApplication.
+      /// </summary>
+      [optional]
+      RTCRtpOpusCodecCapabilityOptionsApplication application;
+      /// <summary>
+      /// Gets or sets the encoder's expected packet loss percentage. Possible
+      /// values are 0-100.
+      /// </summary>
+      [optional]
+      unsigned long packetLossPerc;
+      /// <summary>
+      /// Gets or sests whether prediction is disabled, making frames almost
+      /// complete independent (if true) or not (if false).
+      /// </summary>
+      [optional]
+      bool predictionDisabled;
+
+      // receiver parameters
+
+      /// <summary>
+      /// Gets or sets the maximum input sampling rate produced by the sender.
+      /// </summary>
+      [optional]
+      unsigned long sPropMaxCaptureRate;
+      /// <summary>
+      /// Gets or sets whether the sender is likely to produce stereo audio.
+      /// </summary>
+      [optional]
+      bool sPropStereo;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpOpusCodecParameterSettings object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpOpusCodecParameterSettings();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpOpusCodecParameterSettings object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpOpusCodecParameterSettingsClone)]
+      void RTCRtpOpusCodecParameterSettings(RTCRtpOpusCodecParameterSettings source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpOpusCodecParameterSettings object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpOpusCodecParameterSettingsWithJson)]
+      void RTCRtpOpusCodecParameterSettings(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    [dictionary]
+    struct RTCRtpVp8CodecParameterSettings : RTCRtpVp8CodecCapabilityParameters
+    {
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpVp8CodecParameterSettings object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpVp8CodecParameterSettings();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpVp8CodecParameterSettings object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpVp8CodecParameterSettingsClone)]
+      void RTCRtpVp8CodecParameterSettings(RTCRtpVp8CodecParameterSettings source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpVp8CodecParameterSettings object by extrating object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpVp8CodecParameterSettingsWithJson)]
+      void RTCRtpVp8CodecParameterSettings(Json json);
+    };
+
+    [dictionary]
+    struct RTCRtpH264CodecParameterSettings : RTCRtpH264CodecCapabilityParameters
+    {
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpH264CodecParameterSettings object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpH264CodecParameterSettings();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpH264CodecParameterSettings object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpH264CodecParameterSettingsClone)]
+      void RTCRtpH264CodecParameterSettings(RTCRtpH264CodecParameterSettings source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpH264CodecParameterSettings object by extrating object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpH264CodecParameterSettingsWithJson)]
+      void RTCRtpH264CodecParameterSettings(Json json);
+    };
+
+    [dictionary]
+    struct RTCRtpRtxCodecParameterSettings : RTCRtpRtxCodecCapabilityParameters
+    {
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpRtxCodecParameterSettings object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpRtxCodecParameterSettings();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpRtxCodecParameterSettings object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpRtxCodecParameterSettingsClone)]
+      void RTCRtpRtxCodecParameterSettings(RTCRtpRtxCodecParameterSettings source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpRtxCodecParameterSettings object by extrating object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpRtxCodecParameterSettingsWithJson)]
+      void RTCRtpRtxCodecParameterSettings(Json json);
+    };
+
+    [dictionary]
+    struct RTCRtpFlexFecCodecParameterSettings : RTCRtpFlexFecCodecCapabilityParameters
+    {
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpFlexFecCodecParameterSettings object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpFlexFecCodecParameterSettings();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpFlexFecCodecParameterSettings object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpFlexFecCodecParameterSettingsClone)]
+      void RTCRtpFlexFecCodecParameterSettings(RTCRtpFlexFecCodecParameterSettings source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpFlexFecCodecParameterSettings object by extrating object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpFlexFecCodecParameterSettingsWithJson)]
+      void RTCRtpFlexFecCodecParameterSettings(Json json);
+    };
+
+    /// <summary>
+    /// The following setting is defined for "red", as noted in [RFC2198]
+    /// Section 5.
+    /// </summary>
+    [dictionary]
+    struct RTCRtpRedCodecParameterSettings : RTCRtpCodecParameterSettings
+    {
+      typedef std::list<PayloadType> PayloadTypeList;
+
+      /// <summary>
+      /// Gets or sets sequence of payload types to be encapsulated in RED,
+      /// each of which must be unique. If payloadTypes is unset, this means
+      /// that any codec other than "red" or "rtx" can be encapsulsated in
+      /// RED.
+      /// </summary>
+      PayloadTypeList payloadTypes;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpRedCodecParameterSettings object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpRedCodecParameterSettings();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpRedCodecParameterSettings object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpRedCodecParameterSettingsClone)]
+      void RTCRtpRedCodecParameterSettings(RTCRtpRedCodecParameterSettings source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpRedCodecParameterSettings object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpRedCodecParameterSettingsWithJson)]
+      void RTCRtpRedCodecParameterSettings(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+  }
+}
diff --git a/ortc/idl/SctpTransport.idl b/ortc/idl/SctpTransport.idl
new file mode 100644
index 00000000..639799b9
--- /dev/null
+++ b/ortc/idl/SctpTransport.idl
@@ -0,0 +1,268 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    interface RTCSctpTransport;
+
+    /// <summary>
+    /// Event indicating a new incoming SCTP transport.
+    /// </summary>
+    struct RTCSctpTransportListenerEvent
+    {
+      [constructor, delete]
+      void RTCSctpTransportListenerEvent();
+
+      /// <summary>
+      /// Gets the new incoming SCTP transport.
+      /// </summary>
+      [getter]
+      RTCSctpTransport transport;
+    };
+
+    interface RTCSctpTransportListener
+    {
+      [constructor, delete]
+      void RTCSctpTransportListener();
+
+      /// <summary>
+      /// Events when the a new SCTP transport has arrived.
+      /// </summary>
+      [event]
+      void onTransport(RTCSctpTransportListenerEvent event);
+    };
+
+    /// <summary>
+    /// The RTCSctpCapabilities represents object represents the capabilities
+    /// of SCTP transport.
+    /// </summary>
+    [dictionary]
+    struct RTCSctpCapabilities
+    {
+      /// <summary>
+      /// Gets or sets the maximum message size.
+      /// </summary>
+      size_t maxMessageSize;
+
+      /// <summary>
+      /// Gets or sets the minimum SCTP port.
+      /// </summary>
+      uint16 minPort;
+      /// <summary>
+      /// Gets or sets the maximum SCTP port.
+      /// </summary>
+      uint16 maxPort;
+      /// <summary>
+      /// Gets or sets the maximum SCTP ports that can be used simultaneously.
+      /// </summary>
+      uint16 maxUsablePorts;
+      /// <summary>
+      /// Gets or sets the maximum sessions allowed per port.
+      /// </summary>
+      uint16 maxSessionsPerPort;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCSctpCapabilities object.
+      /// </summary>
+      [constructor, default]
+      void RTCSctpCapabilities();
+      /// <summary>
+      /// Constructs an instance of an RTCSctpCapabilities object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCSctpCapabilitiesClone)]
+      void RTCSctpCapabilities(RTCSctpCapabilities source);
+      /// <summary>
+      /// Constructs an instance of an RTCSctpCapabilities object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCSctpCapabilitiesWithJson)]
+      void RTCSctpCapabilities(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// RTCSctpTransportStateChangeEvent represents the state event
+    /// fired when the RTCSctpTransport state is changed.
+    /// </summary>
+    struct RTCSctpTransportStateChangeEvent
+    {
+      [constructor, delete]
+      void RTCSctpTransportStateChangeEvent();
+
+      /// <summary>
+      /// The RTCSctpTransportState that cased the event to fire.
+      /// </summary>
+      [getter]
+      RTCSctpTransportState state;
+    };
+
+    /// <summary>
+    /// If the remote peers sets RTCDataChannelParameters.Negotiated to false,
+    /// then the event will fire indicating a new RTCDataChannel object has
+    /// been constructed to connect with the RTCDataChannel constructed by the
+    /// remote peer.
+    /// </summary>
+    struct RTCDataChannelEvent
+    {
+      [constructor, delete]
+      void RTCDataChannelEvent();
+
+      /// <summary>
+      /// Gets the RTCDataChannel that was constructed when upon receiving a
+      /// new RTCDataChannel from a remote peer.
+      /// </summary>
+      [getter]
+      RTCDataChannel dataChannel;
+    };
+
+    /// <summary>
+    /// The RTCSctpTransport includes information relating to Stream Control
+    /// Transmission Protocol (SCTP) transport.
+    /// </summary>
+    interface RTCSctpTransport : RTCStatsProvider,
+                                 RTCDataTransport
+    {
+      /// <summary>
+      /// Constructs an instance of RTCSctpTransport from an RTCDtlsTransport
+      /// object (with a default of 5000, or the next unused port).
+      /// </summary>
+      [constructor]
+      void RTCSctpTransport(RTCDtlsTransport transport) throws (InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Constructs an instance of RTCSctpTransport from an RTCDtlsTransport
+      /// object, and a port number.
+      /// </summary>
+      [constructor, altname(RTCSctpTransportWithLocalPort)]
+      void RTCSctpTransport(
+                            RTCDtlsTransport transport,
+                            uint16 localPort
+                            ) throws (InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Listen for incoming RTCSctpTransport objects port mappings for new SCTP transports.
+      /// </summary>
+      [static]
+      RTCSctpTransportListener listen(
+                                      RTCDtlsTransport transport,
+                                      RTCSctpCapabilities remoteCapabilities
+                                      ) throws(InvalidParameters);
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Retrieves the RTCSctpCapabilities of the RTCSctpTransport instance.
+      /// </summary>
+      [static]
+      RTCSctpCapabilities getCapabilities();
+
+      /// <summary>
+      /// Gets the RTCDtlsTransport instance the RTCSctpTransport object is
+      /// sending over.
+      /// </summary>
+      [getter]
+      RTCDtlsTransport transport;
+
+      /// <summary>
+      /// Gets the current state of the RTCSctpTransport object.
+      /// </summary>
+      [getter]
+      RTCSctpTransportState state;
+
+      /// <summary>
+      /// Gets the SCTP local port number used by the data channel.
+      /// </summary>
+      [getter]
+      uint16 port;
+
+      /// <summary>
+      /// Gets the SCTP local port number used by the data channel.
+      /// </summary>
+      [getter]
+      uint16 localPort;
+
+      /// <summary>
+      /// Gets the SCTP remote port number used by the data channel if available.
+      /// </summary>
+      [getter, optional]
+      uint16 remotePort;
+
+      /// <summary>
+      /// Starts the SCTP transport providing the capabilities of remote
+      /// SCTP transport.
+      /// </summary>
+      [default]
+      void start(RTCSctpCapabilities remoteCapabilities) throws (InvalidStateError, InvalidParameters);
+      /// <summary>
+      /// Starts the SCTP transport providing the capabilities of remote
+      /// SCTP transport and remote port.
+      /// </summary>
+      [altname(startWithPort)]
+      void start(
+                 RTCSctpCapabilities remoteCapabilities,
+                 uint16 remotePort
+                 ) throws (InvalidStateError, InvalidParameters);
+
+      /// <summary>
+      /// Stops the RTCSctpTransport instance.
+      /// </summary>
+      void stop();
+
+      /// <summary>
+      /// Events when the state of the RTCSctpTransport state changes.
+      /// </summary>
+      [event]
+      void onStateChange(RTCSctpTransportStateChangeEvent state);
+
+      /// <summary>
+      /// If the remote peers sets RTCDataChannelParameters.negotiated to
+      /// false, then this event will fire indicating a new RTCDataChannel
+      /// object has been constructed to connect with the RTCDataChannel
+      /// constructed by the remote peer.
+      /// </summary>
+      [event]
+      void onDataChannel(RTCDataChannelEvent dataChannel);
+    };
+  }
+}
diff --git a/ortc/idl/Settings.idl b/ortc/idl/Settings.idl
new file mode 100644
index 00000000..08178802
--- /dev/null
+++ b/ortc/idl/Settings.idl
@@ -0,0 +1,105 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// Controls the detailed settings of how the ORTC engine operates.
+    /// </summary>
+    [static]
+    interface Settings
+    {
+      /// <summary>
+      /// Apply all the default settings for how the ORTC engine should
+      /// behave.
+      /// </summary>
+      [static]
+      void applyDefaults();
+
+      /// <summary>
+      /// Apply a collection of json based settings.
+      /// </summary>
+      [static]
+      bool apply(Json jsonSettings);
+
+      /// <summary>
+      /// Apply a specific string setting with a key and value.
+      /// </summary>
+      [static]
+      void setString(string key, string value);
+
+      /// <summary>
+      /// Apply a specific integer setting with a key and value.
+      /// </summary>
+      [static]
+      void setInt(string key, int64 value);
+
+      /// <summary>
+      /// Apply a specific unsigned integer setting with a key and value.
+      /// </summary>
+      [static]
+      void setUInt(string key, uint64 value);
+
+      /// <summary>
+      /// Apply a specific boolean setting with a key and value.
+      /// </summary>
+      [static]
+      void setBool(string key, bool value);
+
+      /// <summary>
+      /// Apply a specific floating point setting with a key and value.
+      /// </summary>
+      [static]
+      void setFloat(string key, float value);
+
+      /// <summary>
+      /// Apply a specific double floating point setting with a key and value.
+      /// </summary>
+      [static]
+      void setDouble(string key, double value);
+
+      /// <summary>
+      /// Clear a specific setting by its key.
+      /// </summary>
+      [static]
+      void clear(string key);
+
+      /// <summary>
+      /// Clear all known settings.
+      /// </summary>
+      [static]
+      void clearAll();
+    };
+
+  }
+}
diff --git a/ortc/idl/SrtpSdesTransport.idl b/ortc/idl/SrtpSdesTransport.idl
new file mode 100644
index 00000000..11f3b4cb
--- /dev/null
+++ b/ortc/idl/SrtpSdesTransport.idl
@@ -0,0 +1,278 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// The RTCSrtpKeyParam objects defines the keying material needed for a
+    /// SRTP SDES session.
+    /// </summary>
+    [dictionary]
+    struct RTCSrtpSdesKeyParameters
+    {    // see RFC 4568 sect 9.2
+      /// <summary>
+      /// Gets or sets the key method to be utilized, in the syntax defined
+      /// for 'srtp-key-method' in [RFC4568] Section 9.2.
+      /// </summary>
+      string  keyMethod;     // must be "inline"
+      /// <summary>
+      /// Gets or sets the key and salt to be utilized, in the syntax defined
+      /// for 'key-salt' in [RFC4568] Sections 9.2.
+      /// </summary>
+      string  keySalt;       // key + salt, base 64 encoded e.g. base64(16 bytes + 14 bytes)
+      /// <summary>
+      /// Gets or sets the key lifetime to be utilized, in the syntax defined
+      /// for 'lifetime' in [RFC4568] Section 9.2.
+      /// </summary>
+      string  lifetime;      // must be "2^n" where n is the max number of packets to flow throw the transport
+      /// <summary>
+      /// Gets or sets the master key index to be utilized, in the syntax
+      /// defined for 'mki-value' in [RFC4568] Section 9.2.
+      /// </summary>
+      string  mkiValue;      // base 10 expressed value of Master Key Identifier (MKI) converted to string
+      /// <summary>
+      /// Gets or sets the master key index length to be utilized, in the
+      /// syntax defined for 'mki-length' in [RFC4568] Section 9.2.
+      /// </summary>
+      uint16  mkiLength;     // number of bytes allocated on each SRTP packet for Master Key Identifier (MKI) [max = 128 bytes]
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCSrtpSdesKeyParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCSrtpSdesKeyParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCSrtpSdesKeyParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCSrtpSdesKeyParametersClone)]
+      void RTCSrtpSdesKeyParameters(RTCSrtpSdesKeyParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCSrtpSdesKeyParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCSrtpSdesKeyParametersWithJson)]
+      void RTCSrtpSdesKeyParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCSrtpSdesCryptoParameters object includes information relating
+    /// to SRTP/SDES cryptographic configuration.
+    /// </summary>
+    [dictionary]
+    struct RTCSrtpSdesCryptoParameters
+    { // see RFC 4568 sect 9.2
+      typedef std::list<RTCSrtpSdesKeyParameters> KeyParametersList;
+      typedef StringList SessionParamList;
+
+      /// <summary>
+      /// Gets or sets the tag identifying the parameters set, in the syntax
+      /// defined for 'tag' in [RFC4568] Section 9.1.
+      /// </summary>
+      uint16            tag;
+      /// <summary>
+      /// Gets or sets the the ciphersuite to be utilized, in the syntax
+      /// defined for 'srtp-crypto-suite' in [RFC4568] Section 9.2;
+      /// </summary>
+      string            cryptoSuite;
+      /// <summary>
+      /// Gets or sets the key parameters to be utilized, as described in
+      /// [RFC4568] Section 6.1. Calls to
+      /// RTCSrtpSdesTransport.GetLocalParameters should return only a single
+      /// RTCSrtpKeyParam dictionary entry.
+      /// </summary>
+      KeyParametersList keyParams;
+      /// <summary>
+      /// Gets or sets a sequence of session parameters to be utilized, each
+      /// in the syntax defined for 'session-param' in [RFC4568] Section 9.1;
+      /// </summary>
+      SessionParamList  sessionParams;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCSrtpSdesCryptoParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCSrtpSdesCryptoParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCSrtpSdesCryptoParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCSrtpSdesCryptoParametersClone)]
+      void RTCSrtpSdesCryptoParameters(RTCSrtpSdesCryptoParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCSrtpSdesCryptoParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCSrtpSdesCryptoParametersWithJson)]
+      void RTCSrtpSdesCryptoParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// The RTCSrtpSdesParameters object includes information relating to
+    /// SRTP/SDES configuration.
+    /// </summary>
+    [dictionary]
+    struct RTCSrtpSdesParameters
+    {
+      typedef std::list<RTCSrtpSdesCryptoParameters> CryptoParametersList;
+
+      /// <summary>
+      /// Gets or sets a sequence of cryptographic parameters.
+      /// </summary>
+      CryptoParametersList cryptoParams;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCSrtpSdesParameters object.
+      /// </summary>
+      [constructor, default]
+      void RTCSrtpSdesParameters();
+      /// <summary>
+      /// Constructs an instance of an RTCSrtpSdesParameters object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCSrtpSdesParametersClone)]
+      void RTCSrtpSdesParameters(RTCSrtpSdesParameters source);
+      /// <summary>
+      /// Constructs an instance of an RTCSrtpSdesParameters object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCSrtpSdesParametersWithJson)]
+      void RTCSrtpSdesParameters(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+    /// <summary>
+    /// This is the event data associated with the
+    /// transport.OnLifetimeRemaining event handler.
+    /// </summary>
+    struct RTCSrtpSdesTransportLifetimeRemainingEvent
+    {
+      [constructor, delete]
+      void RTCSrtpSdesTransportLifetimeRemainingEvent();
+
+      /// <summary>
+      /// Gets the least percentage remaining of all the keys in the
+      /// SDES/SRTP transport.
+      /// </summary>
+      [getter]
+      unsigned long leastLifetimeRemainingPercentageForAllKeys;
+      /// <summary>
+      /// Gets the overall percentage of life remaining of all the keys in the
+      /// SDES/SRTP transport.
+      /// </summary>
+      [getter]
+      unsigned long overallLifetimeRemainingPercentage;
+    };
+
+    /// <summary>
+    /// The RTCSrtpSdesTransport includes information relating to SRTP/SDES
+    /// transport.
+    /// </summary>
+    interface RTCSrtpSdesTransport : RTCRtpTransport,
+                                     RTCStatsProvider
+    {
+      /// <summary>
+      /// Constructs an instance of an RTCSrtpSdesTransport object using the specified ICE transport and cryptographic parameters.
+      /// </summary>
+      [constructor]
+      void RTCSrtpSdesTransport(
+                                RTCIceTransport iceTransport,
+                                RTCSrtpSdesCryptoParameters encryptParameters,
+                                RTCSrtpSdesCryptoParameters decryptParameters
+                                ) throws (InvalidParameters, InvalidStateError);
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets the associated RTP RTCIceTransport as passed into the constructor.
+      /// </summary>
+      [getter]
+      RTCIceTransport transport;
+      /// <summary>
+      /// Gets the associated RTCP RTCIceTransport as passed into the constructor.
+      /// </summary>
+      [getter]
+      RTCIceTransport rtcpTransport;
+
+      /// <summary>
+      /// Obtain the local SRTP/SDES parameter sets.
+      /// </summary>
+      [static]
+      RTCSrtpSdesParameters getLocalParameters();
+
+      /// <summary>
+      /// Stops sending or receiving any further encrypted RTP/RTCP data over the associated ICE transport.
+      /// </summary>
+      void stop();
+
+      /// <summary>
+      /// This event is fired when the lifetime of the keying material
+      /// percentage remaining has changed.
+      /// </summary>
+      [event]
+      void onLifetimeRemaining(RTCSrtpSdesTransportLifetimeRemainingEvent event);
+
+      /// <summary>
+      /// This event is fired on reception of an error.
+      /// </summary>
+      [event]
+      void onError(ErrorEvent event);
+    };
+
+  }
+}
diff --git a/ortc/idl/StatsProvider.idl b/ortc/idl/StatsProvider.idl
new file mode 100644
index 00000000..e257fe36
--- /dev/null
+++ b/ortc/idl/StatsProvider.idl
@@ -0,0 +1,57 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// The RTCStatsProvider interface enables the retrieval of statistics.
+    /// </summary>
+    interface RTCStatsProvider
+    {
+      typedef zs::PromiseWith<RTCStatsReport> PromiseWithStatsReport;
+
+      [constructor, delete]
+      void RTCStatsProvider();
+
+      /// <summary>
+      /// Gets an awaitable RTCStatsReport object that will contain a set of
+      /// statistics objects for the inspected object. A null RTCStatsReport
+      /// return is possible if the object declined the request to inspect
+      /// statistics at this time. An RTCStatsReport containing no statistics
+      /// objects indicates that no inspectable statistics are available at
+      /// this time.
+      /// </summary>
+      PromiseWithStatsReport getStats(RTCStatsTypeSet statTypes) throws (InvalidParameters, InvalidStateError);
+    };
+  }
+}
diff --git a/ortc/idl/StatsReport.idl b/ortc/idl/StatsReport.idl
new file mode 100644
index 00000000..e393f725
--- /dev/null
+++ b/ortc/idl/StatsReport.idl
@@ -0,0 +1,1031 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    typedef uint32 SsrcType;
+    typedef uint8 PayloadType;
+    typedef std::list<SsrcType> SsrcTypeList;
+
+    /// <summary>
+    /// The RTCStatsTypeSet contains a list of stats types to be collected.
+    /// </summary>
+    struct RTCStatsTypeSet
+    {
+      typedef std::set<RTCStatsType> EnumSet;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCStatsTypeSet object.
+      /// </summary>
+      [constructor, default]
+      void RTCStatsTypeSet();
+      /// <summary>
+      /// Constructs an instance of an RTCStatsTypeSet object given a set of types types to collect.
+      /// </summary>
+      [constructor, altname(RTCStatsTypeSetWithValues)]
+      void RTCStatsTypeSet(EnumSet values);
+
+      bool hasStatType(RTCStatsType type);
+    };
+
+    /// <summary>
+    /// The RTCStats contains statistics information related to an inspected
+    /// object.
+    /// </summary>
+    struct RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the timestamp when this statistic object was generated.
+      /// </summary>
+      [getter]
+      Time                timestamp;
+      /// <summary>
+      /// Gets or sets the type of statistics object contained within this
+      /// RTCStats object.
+      /// </summary>
+      [optional, getter]
+      RTCStatsType        statsType;
+      /// <summary>
+      /// Gets or sets the type of statistics object when the type is not a
+      /// pre-known type.
+      /// </summary>
+      [getter]
+      string              statsTypeOther;
+      /// <summary>
+      /// Gets or sets the identifer for the RTCStats object. The identifer
+      /// is unique within a RTCStatsReport but is not guarenteed to be unique
+      /// across RTCStatsReports.
+      /// </summary>
+      [getter]
+      string              id;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCStats();
+      /// <summary>
+      /// Constructs an instance of an RTCStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCStatsClone)]
+      void RTCStats(RTCStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCStatsWithJson)]
+      void RTCStats(Json json);
+
+      /// <summary>
+      /// A helper routine to convert the object's data to structured JSON object data.
+      /// </summary>
+      Json toJson();
+      /// <summary>
+      /// Return a hash of the data contained within the object.
+      /// </summary>
+      string hash();
+    };
+
+
+    struct RTCRtpStreamStats : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the SSRC for the RTP stream.
+      /// </summary>
+      [optional, getter]
+      SsrcType            ssrc;
+      /// <summary>
+      /// Gets or sets the associated stats identifier for looking up the
+      /// corresponding (local/remote) RTCStats object for a given SSRC.
+      /// </summary>
+      [getter]
+      string              associatedStatId;
+      /// <summary>
+      /// Gets or sets if the measurements are calculated locally ore
+      /// remotely. false indicates that the statistics are measured
+      /// locally, while true indicates that the measurements were done
+      /// at the remote endpoint and reported in an RTCP RR/XR.
+      /// </summary>
+      [getter]
+      bool                isRemote;
+      /// <summary>
+      /// Gets or sets the media type, either "audio" or "video". This must
+      /// match the media type part of the information in the corresponding
+      /// codec member of RTCCodec.
+      /// </summary>
+      [getter]
+      string              mediaType;
+      /// <summary>
+      /// Gets or sets the media stream tracks ID associated with this RTP
+      /// stream stats object.
+      /// </summary>
+      [getter]
+      string              mediaTrackId;
+      /// <summary>
+      /// Gets or sets the transport ID associated with this RTP media
+      /// stream stats object. It is a unique identifier that is associated
+      /// to the object that was inspected to produce the RTCTransportStats
+      /// associated with this RTP stream.
+      /// </summary>
+      [getter]
+      string              transportId;
+      /// <summary>
+      /// Gets or set the codec ID associated with this RTP media stream stats
+      /// object.
+      /// </summary>
+      [getter]
+      string              codecId;
+      /// <summary>
+      /// Gets or sets the total number of Full Intra Request (FIR) packets
+      /// received by the sender. This metric is only valid for video and is
+      /// sent by receiver. Calculated as defined in [RFC5104] section 4.3.1.
+      /// and does not use the metric indicated in [RFC2032], because it was
+      /// deprecated by [RFC4587].
+      /// </summary>
+      [getter]
+      unsigned long       firCount;
+      /// <summary>
+      /// Gets or sets the total number of Packet Loss Indication (PLI)
+      /// packets received by the sender and is sent by receiver. Calculated
+      /// as defined in [RFC4585] section 6.3.1.
+      /// </summary>
+      [getter]
+      unsigned long       pliCount;
+      /// <summary>
+      /// Gets or sets the total number of Negative ACKnowledgement (NACK)
+      /// packets received by the sender and is sent by receiver. Calculated
+      /// as defined in [RFC4585] section 6.2.1.
+      /// </summary>
+      [getter]
+      unsigned long       nackCount;
+      /// <summary>
+      /// Gets or sets the total number of Slice Loss Indication (SLI) packets
+      /// received by the sender. This metric is only valid for video and is
+      /// sent by receiver. Calculated as defined in [RFC4585] section 6.3.2.
+      /// </summary>
+      [getter]
+      unsigned long       sliCount;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCRtpStreamStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCRtpStreamStats();
+      /// <summary>
+      /// Constructs an instance of an RTCRtpStreamStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCRtpStreamStatsClone)]
+      void RTCRtpStreamStats(RTCRtpStreamStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCRtpStreamStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCRtpStreamStatsWithJson)]
+      void RTCRtpStreamStats(Json json);
+    };
+
+    /// <summary>
+    /// The RTCCodec object contains information about the codec associated
+    /// with an RTP stream.
+    /// </summary>
+    struct RTCCodec : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the payload type as used in RTP encoding.
+      /// </summary>
+      [optional, getter]
+      PayloadType      payloadType;
+      /// <summary>
+      /// Gets or sets the IANA name of the codec associated with the RTP
+      /// stream. For example, "vp8" for "video/vp8" or equivalent.
+      /// </summary>
+      [getter]
+      string           codec;
+      /// <summary>
+      /// Gets or sets the media sampling rate.
+      /// </summary>
+      [getter]
+      unsigned long    clockRate;
+      /// <summary>
+      /// Gets or sets the number of audio channels used by the codec. For
+      /// example, 2 for stereo, 1 for mono, and missing for non-audio codecs.
+      /// </summary>
+      [optional, getter]
+      unsigned long    channels;
+      /// <summary>
+      /// Gets or sets the SDP description line.
+      /// </summary>
+      [getter]
+      string           parameters;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCCodec object.
+      /// </summary>
+      [constructor, default]
+      void RTCCodec();
+      /// <summary>
+      /// Constructs an instance of an RTCCodec object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCCodecClone)]
+      void RTCCodec(RTCCodec source);
+      /// <summary>
+      /// Constructs an instance of an RTCCodec object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCCodecWithJson)]
+      void RTCCodec(Json json);
+    };
+
+    /// <summary>
+    /// The RTCInboundRTPStreamStats object represents the measurement metrics
+    /// for the incoming RTP media stream.
+    /// </summary>
+    struct RTCInboundRtpStreamStats : RTCRtpStreamStats
+    {
+      /// <summary>
+      /// Gets or sets the total number of RTP packets received for this SSRC.
+      /// Calculated as defined in [RFC3550] section 6.4.1.
+      /// </summary>
+      [getter]
+      unsigned long       packetsReceived;
+      [getter]
+      /// <summary>
+      /// Gets or sets the total number of bytes received for this SSRC.
+      /// Calculated as defined in [RFC3550] section 6.4.1.
+      /// </summary>
+      unsigned long long  bytesReceived;
+      /// <summary>
+      /// Gets or sets the total number of RTP packets lost for this SSRC.
+      /// Calculated as defined in [RFC3550] section 6.4.1.
+      /// </summary>
+      [getter]
+      unsigned long       packetsLost;
+      /// <summary>
+      /// Gets or sets the packet jitter measured in seconds for this SSRC.
+      /// Calculated as defined in [RFC3550] section 6.4.1.
+      /// </summary>
+      [getter]
+      double              jitter;
+      /// <summary>
+      /// Gets or sets the fraction packet loss reported for this SSRC.
+      /// Calculated as defined in [RFC3550] section 6.4.1 and Appendix A.3.
+      /// </summary>
+      [getter]
+      double              fractionLost;
+      /// <summary>
+      /// Gets or sets the end to end media delay in milliseconds. This value
+      /// represents the total duration between the time the media sampling was
+      /// captured to the time the media sampling was rendered.
+      /// </summary>
+      [getter]
+      Milliseconds        endToEndDelay;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCInboundRtpStreamStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCInboundRtpStreamStats();
+      /// <summary>
+      /// Constructs an instance of an RTCInboundRtpStreamStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCInboundRtpStreamStatsClone)]
+      void RTCInboundRtpStreamStats(RTCInboundRtpStreamStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCInboundRtpStreamStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCInboundRtpStreamStatsWithJson)]
+      void RTCInboundRtpStreamStats(Json json);
+    };
+
+    /// <summary>
+    /// The RTCOutboundRTPStreamStats object represents the measurement
+    /// metrics for the outgoing media stream.
+    /// </summary>
+    struct RTCOutboundRtpStreamStats : RTCRtpStreamStats
+    {
+      /// <summary>
+      /// Gets or sets the total number of RTP packets sent for this SSRC.
+      /// Calculated as defined in [RFC3550] section 6.4.1.
+      /// </summary>
+      [getter]
+      unsigned long       packetsSent;
+      /// <summary>
+      /// Gets or sets the total number of bytes sent for this SSRC.
+      /// Calculated as defined in [RFC3550] section 6.4.1.
+      /// </summary>
+      [getter]
+      unsigned long long  bytesSent;
+      /// <summary>
+      /// Gets or sets the presently configured bitrate target of this SSRC,
+      /// in bits per second. Typically this is a configuration parameter
+      /// provided to the codec's encoder.
+      /// </summary>
+      [getter]
+      double              targetBitrate;
+      /// <summary>
+      /// Gets or sets the estimated round trip time (seconds) for this SSRC
+      /// based on the RTCP timestamp. Calculated as defined in [RFC3550]
+      /// section 6.4.1.
+      /// </summary>
+      [getter]
+      double              roundTripTime;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCOutboundRtpStreamStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCOutboundRtpStreamStats();
+      /// <summary>
+      /// Constructs an instance of an RTCOutboundRtpStreamStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCOutboundRtpStreamStatsClone)]
+      void RTCOutboundRtpStreamStats(RTCOutboundRtpStreamStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCOutboundRtpStreamStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCOutboundRtpStreamStatsWithJson)]
+      void RTCOutboundRtpStreamStats(Json json);
+    };
+
+    struct RTCSctpTransportStats : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the number of unique datachannels opened.
+      /// </summary>
+      [getter]
+      unsigned long dataChannelsOpened;
+      /// <summary>
+      /// Gets or sets the number of unique datachannels closed.
+      /// </summary>
+      [getter]
+      unsigned long dataChannelsClosed;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCSctpTransportStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCSctpTransportStats();
+      /// <summary>
+      /// Constructs an instance of an RTCSctpTransportStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCSctpTransportStatsClone)]
+      void RTCSctpTransportStats(RTCSctpTransportStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCSctpTransportStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCSctpTransportStatsWithJson)]
+      void RTCSctpTransportStats(Json json);
+    };
+
+    /// <summary>
+    /// The RTCMediaStreamStats object contains the stastics for the
+    /// RTCMediaStream object.
+    /// </summary>
+    struct RTCMediaStreamStats : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the stream.id property.
+      /// </summary>
+      [getter]
+      string      streamId;
+      /// <summary>
+      /// Gets or sets the the id of the media stream track stats object, not
+      /// the track.id.
+      /// </summary>
+      [getter]
+      StringList  trackIds;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCMediaStreamStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCMediaStreamStats();
+      /// <summary>
+      /// Constructs an instance of an RTCMediaStreamStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCMediaStreamStatsClone)]
+      void RTCMediaStreamStats(RTCMediaStreamStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCMediaStreamStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCMediaStreamStatsWithJson)]
+      void RTCMediaStreamStats(Json json);
+    };
+
+
+    /// <summary>
+    /// The RTCMediaStreamTrackStats object contains the stastics for the
+    /// RTCMediaStreamTrack object.
+    /// </summary>
+    struct RTCMediaStreamTrackStats : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the track.id property.
+      /// </summary>
+      [getter]
+      string          trackId;
+      /// <summary>
+      /// Gets or sets if this source represents a local or remote media
+      /// stream track source. The value is true for remote, false for local.
+      /// </summary>
+      [getter]
+      bool            remoteSource;
+      /// <summary>
+      /// Gets or sets the SSRCs associated with this media stream track stats
+      /// object.
+      /// </summary>
+      [getter]
+      SsrcTypeList    ssrcIds;
+      /// <summary>
+      /// Gets or sets the width value for video. The property only makes
+      /// sense for video media streams and represents the width of the video
+      /// frame for this SSRC.
+      /// </summary>
+      [getter]
+      unsigned long   frameWidth;
+      /// <summary>
+      /// Gets or sets the height value for video. The property only makes
+      /// sense for video media streams and represents the height of the video
+      /// frame for this SSRC.
+      /// </summary>
+      [getter]
+      unsigned long   frameHeight;
+      /// <summary>
+      /// Gets or sets the video frames per second. Only valid for video.
+      /// </summary>
+      [getter]
+      double          framesPerSecond;
+      /// <summary>
+      /// Gets or sets the total number of frames sent for this SSRC. Only
+      /// valid for video. 
+      /// </summary>
+      [getter]
+      unsigned long   framesSent;
+      /// <summary>
+      /// Gets or sets the total number of frames received for this SSRC. Only
+      /// valid for video and when RemoteSource is set to true.
+      /// </summary>
+      [getter]
+      unsigned long   framesReceived;
+      /// <summary>
+      /// Gets or sets the total number of frames correctly decoded for this
+      /// SSRC. Only valid for video. Same definition as totalVideoFrames in
+      /// Section 5 of [http://www.w3.org/TR/media-source/].
+      /// </summary>
+      [getter]
+      unsigned long   framesDecoded;
+      /// <summary>
+      /// Gets or sets the total number of frames dropped. Only valid for
+      /// video. Same definition as droppedVideoFrames in Section 5 of
+      /// [http://www.w3.org/TR/media-source/].
+      /// </summary>
+      [getter]
+      unsigned long   framesDropped;
+      /// <summary>
+      /// Gets or sets the total number of frames determined to be corrupted.
+      /// Only valid for video. Same definition as corruptedVideoFrames in
+      /// Section 5 of [http://www.w3.org/TR/media-source/].
+      /// </summary>
+      [getter]
+      unsigned long   framesCorrupted;
+      /// <summary>
+      /// Gets or sets the audio level. Only valid for audio, and the value is
+      /// between 0..1 (linear), where 1.0 represents 0 dBov. Calculated as
+      /// defined in [RFC6464].
+      /// </summary>
+      [getter]
+      double          audioLevel;
+      /// <summary>
+      /// Gets or sets the echo return loss calculated in decibels, as defined
+      /// in [https://www.itu.int/rec/T-REC-G.168/en] (2012) section 3.14.
+      /// Only present on audio tracks sourced from a microphone where echo
+      /// cancellation is applied. 
+      /// </summary>
+      [getter]
+      double          echoReturnLoss;
+      /// <summary>
+      /// Gets or sets the echo return loss enhancement as calculated in
+      /// decibels, as defined in [https://www.itu.int/rec/T-REC-G.168/en]
+      /// (2012) section 3.15.Only present on audio tracks sourced from a
+      /// microphone where echo cancellation is applied. 
+      /// </summary>
+      [getter]
+      double          echoReturnLossEnhancement;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCMediaStreamTrackStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCMediaStreamTrackStats();
+      /// <summary>
+      /// Constructs an instance of an RTCMediaStreamTrackStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCMediaStreamTrackStatsClone)]
+      void RTCMediaStreamTrackStats(RTCMediaStreamTrackStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCMediaStreamTrackStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCMediaStreamTrackStatsWithJson)]
+      void RTCMediaStreamTrackStats(Json json);
+    };
+
+    /// <summary>
+    /// The RTCDataChannelStats object contains the statistics related to the
+    /// associated RTCDataChannel object.
+    /// </summary>
+    struct RTCDataChannelStats : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the data channle label.
+      /// </summary>
+      [getter]
+      string                    label;
+      /// <summary>
+      /// Gets or sets the data channel protocol.
+      /// </summary>
+      [getter]
+      string                    protocol;
+      /// <summary>
+      /// Gets or sets the "id" of the RTCDataChannel object.
+      /// </summary>
+      [getter]
+      long                      dataChannelId;
+      /// <summary>
+      /// Gets or sets the RTCDataChannelState for the RTCDataChannel object.
+      /// </summary>
+      [getter]
+      RTCDataChannelState       state;
+      /// <summary>
+      /// Gets or sets the total number of API "message" events sent.
+      /// </summary>
+      [getter]
+      unsigned long             messagesSent;
+      /// <summary>
+      /// Gets or sets the total number of payload bytes sent on this
+      /// RTCDatachannel, i.e., not including headers or padding.
+      /// </summary>
+      [getter]
+      unsigned long long        bytesSent;
+      /// <summary>
+      /// Gets or sets the total number of bytes received on this
+      /// RTCDatachannel, i.e., not including headers or padding.
+      /// </summary>
+      [getter]
+      unsigned long             messagesReceived;
+      /// <summary>
+      /// Gets or sets the total number of bytes received on this
+      /// RTCDatachannel, i.e., not including headers or padding.
+      /// </summary>
+      [getter]
+      unsigned long long        bytesReceived;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCDataChannelStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCDataChannelStats();
+      /// <summary>
+      /// Constructs an instance of an RTCDataChannelStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCDataChannelStatsClone)]
+      void RTCDataChannelStats(RTCDataChannelStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCDataChannelStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCDataChannelStatsWithJson)]
+      void RTCDataChannelStats(Json json);
+    };
+
+    /// <summary>
+    /// The RTCIceGathererStats object contains the stastics information
+    /// related to the RTCIceGatherer object.
+    /// </summary>
+    struct RTCIceGathererStats : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the total number of bytes received on this
+      /// RTCIceGatherer, i.e., not including headers or padding.
+      /// </summary>
+      [getter]
+      unsigned long long  bytesSent;
+      /// <summary>
+      /// Gets or sets the total number of payload bytes sent on this
+      /// RTCIceGatherer, i.e., not including headers or padding.
+      /// </summary>
+      [getter]
+      unsigned long long  bytesReceived;
+      /// <summary>
+      /// Gets or sets the RTCIceGathererStats identifier for the associated
+      /// RTCP RTCIceGatherer (if applicable).
+      /// </summary>
+      [getter]
+      string              rtcpGathererStatsId;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCIceGathererStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceGathererStats();
+      /// <summary>
+      /// Constructs an instance of an RTCIceGathererStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCIceGathererStatsClone)]
+      void RTCIceGathererStats(RTCIceGathererStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCIceGathererStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCIceGathererStatsWithJson)]
+      void RTCIceGathererStats(Json json);
+    };
+
+    /// <summary>
+    /// The RTCIceTransportStats object contains the statistics related to the
+    /// RTCIceTransport object.
+    /// </summary>
+    struct RTCIceTransportStats : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the total number of bytes received on this
+      /// RTCIceTransport, i.e., not including headers or padding.
+      /// </summary>
+      [getter]
+      unsigned long long  bytesSent;
+      /// <summary>
+      /// Gets or sets the total number of payload bytes sent on this
+      /// RTCIceTransport, i.e., not including headers or padding.
+      /// </summary>
+      [getter]
+      unsigned long long  bytesReceived;
+      /// <summary>
+      /// Gets or sets the RTCIceGathererStats identifier for the associated
+      /// RTCP RTCIceTransport (if applicable).
+      /// </summary>
+      [getter]
+      string              rtcpTransportStatsId;
+      /// <summary>
+      /// Gets or sets if the connection is active. Set to true when transport
+      /// is active.
+      /// </summary>
+      [getter]
+      bool                activeConnection;
+      /// <summary>
+      /// Gets or sets a unique identifier that is associated to the object
+      /// that was inspected to produce the RTCIceCandidatePairStats
+      /// associated with this transport.
+      /// </summary>
+      [getter]
+      string              selectedCandidatePairId;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCIceTransportStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceTransportStats();
+      /// <summary>
+      /// Constructs an instance of an RTCIceTransportStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCIceTransportStatsClone)]
+      void RTCIceTransportStats(RTCIceTransportStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCIceTransportStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCIceTransportStatsWithJson)]
+      void RTCIceTransportStats(Json json);
+    };
+
+    /// <summary>
+    /// The RTCDtlsTransportStats object contains the statistics related to the
+    /// RTCDtlsTransport object.
+    /// </summary>
+    struct RTCDtlsTransportStats : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the local certificate stats object identifier.
+      /// </summary>
+      [getter]
+      string localCertificateId;
+      /// <summary>
+      /// Gets or sets the remote certificate stats object identifier.
+      /// </summary>
+      [getter]
+      string remoteCertificateId;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCDtlsTransportStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCDtlsTransportStats();
+      /// <summary>
+      /// Constructs an instance of an RTCDtlsTransportStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCDtlsTransportStatsClone)]
+      void RTCDtlsTransportStats(RTCDtlsTransportStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCDtlsTransportStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCDtlsTransportStatsWithJson)]
+      void RTCDtlsTransportStats(Json json);
+    };
+
+    /// <summary>
+    /// The RTCSrtpTransportStats object contains the statistics related to the
+    /// RTCSrtpSdesTransport object.
+    /// </summary>
+    struct RTCSrtpTransportStats : RTCStats
+    {
+      /// <summary>
+      /// Constructs an empty instance of an RTCInboundRtpStreamStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCSrtpTransportStats();
+      /// <summary>
+      /// Constructs an instance of an RTCSrtpTransportStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCSrtpTransportStatsClone)]
+      void RTCSrtpTransportStats(RTCSrtpTransportStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCSrtpTransportStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCSrtpTransportStatsWithJson)]
+      void RTCSrtpTransportStats(Json json);
+    };
+
+    /// <summary>
+    /// RTCIceCandidateAttributes reflects the properties of a candidate in
+    /// Section 15.1 of [RFC5245].
+    /// </summary>
+    struct RTCIceCandidateAttributes : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets a unique identifier that is associated to the object
+      /// that was inspected to produce the RTCTransportStats associated with
+      /// this candidate.
+      /// </summary>
+      [getter]
+      string                  relatedId;
+      /// <summary>
+      /// Gets or sets the IP address of the candidate, allowing for IPv4
+      /// addresses, IPv6 addresses, and fully qualified domain names
+      /// (FQDNs). See [RFC5245] section 15.1 for details.
+      /// </summary>
+      [getter]
+      string                  ipAddress;
+      /// <summary>
+      /// Gets or sets the port number of the candidate.
+      /// </summary>
+      [getter]
+      unsigned long           portNumber;
+      /// <summary>
+      /// Gets or sets the transport type. Valid values for transport is one o
+      /// udp and tcp. Based on the "transport" defined in [RFC5245] section
+      /// 15.1.
+      /// </summary>
+      [getter]
+      string                  transport;
+      /// <summary>
+      /// Gets or sets the enumeration RTCStatsIceCandidateType based on the
+      /// cand-type defined in [RFC5245] section 15.1.
+      /// </summary>
+      [getter]
+      RTCIceCandidateType     candidateType;
+      /// <summary>
+      /// Gets or sets the candidate priority as calculated as defined in 
+      /// [RFC5245] section 15.1.
+      /// </summary>
+      [getter]
+      unsigned long           priority;
+      /// <summary>
+      /// Gets or sets the URL of the TURN or STUN server indicated in the
+      /// RTCIceServers that translated this IP address.
+      /// </summary>
+      [getter]
+      string                  addressSourceUrl;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCIceCandidateAttributes object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceCandidateAttributes();
+      /// <summary>
+      /// Constructs an instance of an RTCIceCandidateAttributes object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCIceCandidateAttributesClone)]
+      void RTCIceCandidateAttributes(RTCIceCandidateAttributes source);
+      /// <summary>
+      /// Constructs an instance of an RTCIceCandidateAttributes object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCIceCandidateAttributesWithJson)]
+      void RTCIceCandidateAttributes(Json json);
+    };
+
+    /// <summary>
+    /// </summary>
+    struct RTCIceCandidatePairStats : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets a unique identifier that is associated to the object
+      /// that was inspected to produce the RTCTransportStats associated with
+      /// this candidate pair.
+      /// </summary>
+      [getter]
+      string                          transportId;
+      /// <summary>
+      /// Gets or sets a unique identifier that is associated to the object
+      /// that was inspected to produce the RTCIceCandidateAttributes for the
+      /// local candidate associated with this candidate pair.
+      /// </summary>
+      [getter]
+      string                          localCandidateId;
+      /// <summary>
+      /// Gets or sets a unique identifier that is associated to the object
+      /// that was inspected to produce the RTCIceCandidateAttributes for the
+      /// remote candidate associated with this candidate pair.
+      /// </summary>
+      [getter]
+      string                          remoteCandidateId;
+      /// <summary>
+      /// Gets or sets the state of the checklist for the local and remote
+      /// candidates in a pair.
+      /// </summary>
+      [getter]
+      RTCIceCandidatePairState        state;
+      /// <summary>
+      /// Gets or sets the calculated candidate pair priority as as defined in
+      /// [RFC5245] section 5.7.2.
+      /// </summary>
+      [getter]
+      unsigned long long              priority;
+      /// <summary>
+      /// Gets or sets the nominated flag described in Section 7.1.3.2.4 of [RFC5245].
+      /// </summary>
+      [getter]
+      bool                            nominated;
+      /// <summary>
+      /// Gets or sets if the candidate pair has received an ACK to an ICE
+      /// request.
+      /// </summary>
+      [getter]
+      bool                            writable;
+      /// <summary>
+      /// Gets or sets if the candidate pair has received a valid incoming
+      /// ICE request.
+      /// </summary>
+      [getter]
+      bool                            readable;
+      /// <summary>
+      /// Gets or sets the total number of payload bytes sent on this
+      /// candidate pair, i.e., not including headers or padding.
+      /// </summary>
+      [getter]
+      unsigned long long              bytesSent;
+      /// <summary>
+      /// Gets or sets the total number of payload bytes received on this
+      /// candidate pair, i.e., not including headers or padding.
+      /// </summary>
+      [getter]
+      unsigned long long              bytesReceived;
+      /// <summary>
+      /// Gets or sets the RTT computed by the STUN connectivity checks
+      /// [draft-reddy-tram-stun-path-data].
+      /// </summary>
+      [getter]
+      double                          roundTripTime;
+      /// <summary>
+      /// Gets or sets the available outgoing bitrate measured in Bits per
+      /// second, and is implementation dependent. It may be calculated by the
+      /// underlying congestion control.
+      /// </summary>
+      [getter]
+      double                          availableOutgoingBitrate;
+      /// <summary>
+      /// Gets or sets the available incoming bitrate measured in Bits per
+      /// second, and is implementation dependent. It may be calculated by the
+      /// underlying congestion control.
+      /// </summary>
+      [getter]
+      double                          availableIncomingBitrate;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCIceCandidatePairStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCIceCandidatePairStats();
+      /// <summary>
+      /// Constructs an instance of an RTCIceCandidatePairStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCIceCandidatePairStatsClone)]
+      void RTCIceCandidatePairStats(RTCIceCandidatePairStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCIceCandidatePairStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCIceCandidatePairStatsWithJson)]
+      void RTCIceCandidatePairStats(Json json);
+    };
+
+
+    /// <summary>
+    /// The RTCCertificateStats contains the statistics information related
+    /// to an RTCCertificate object.
+    /// </summary>
+    struct RTCCertificateStats : RTCStats
+    {
+      /// <summary>
+      /// Gets or sets the the fingerprint value as defined in Section 5 of
+      /// [RFC4572].
+      /// </summary>
+      [getter]
+      string fingerprint;
+      /// <summary>
+      /// Gets or sets the fingerprint algorithm used with this certificate.
+      /// For instance, "sha-256".
+      /// </summary>
+      [getter]
+      string fingerprintAlgorithm;
+      /// <summary>
+      /// Gets or sets the DER-encoded, base-64 representation of a
+      /// certifiate.
+      /// </summary>
+      [getter]
+      string base64Certificate;
+      /// <summary>
+      /// Gets or sets the issuer certificate identifier associates with this
+      /// RTCCertificateStats object.
+      /// </summary>
+      [getter]
+      string issuerCertificateId;
+
+      /// <summary>
+      /// Constructs an empty instance of an RTCCertificateStats object.
+      /// </summary>
+      [constructor, default]
+      void RTCCertificateStats();
+      /// <summary>
+      /// Constructs an instance of an RTCCertificateStats object by cloning object data from an existing object.
+      /// </summary>
+      [constructor, altname(RTCCertificateStatsClone)]
+      void RTCCertificateStats(RTCCertificateStats source);
+      /// <summary>
+      /// Constructs an instance of an RTCCertificateStats object by extracting object data from a JSON object.
+      /// </summary>
+      [constructor, default, altname(RTCCertificateStatsWithJson)]
+      void RTCCertificateStats(Json json);
+    };
+
+    /// <summary>
+    /// The RTCStatsReport contains a collection of statistic object for
+    /// statistics for the inspected objects.
+    /// </summary>
+    interaction RTCStatsReport
+    {
+      typedef StringList IdList;
+
+      [constructor, delete]
+      void RTCStatsReport();
+
+      /// <summary>
+      /// Gets a unique object instance identifier for this object.
+      /// </summary>
+      [getter]
+      puid objectId;
+
+      /// <summary>
+      /// Gets the list of statistics object identifiers contained within this
+      /// stats report.
+      /// </summary>
+      [getter]
+      IdList statsIds;
+      /// <summary>
+      /// Gets an RTCStats object for the specified statistic object
+      /// identifier.
+      /// </summary>
+      RTCStats getStats(string id);
+    };
+  }
+}
diff --git a/ortc/idl/adapter/MediaStream.idl b/ortc/idl/adapter/MediaStream.idl
new file mode 100644
index 00000000..433b1cf6
--- /dev/null
+++ b/ortc/idl/adapter/MediaStream.idl
@@ -0,0 +1,156 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    namespace adapter
+    {  
+      /// <summary>
+      /// The two main components in the MediaStream API are the
+      /// MediaStreamTrack and MediaStream interfaces. The MediaStreamTrack
+      /// object represents media of a single type that originates from one
+      /// media source in the User Agent, e.g. video produced by a web camera.
+      /// A MediaStream is used to group several MediaStreamTrack objects into
+      /// one unit that can be recorded or rendered in a media element.
+      /// </summary>
+      interface MediaStream : RTCStatsProvider
+      {
+        typedef std::list<MediaStreamTrack> MediaStreamTrackList;
+
+        /// <summary>
+        /// Constructs an empty MediaStream object.
+        /// </summary>
+        [constructor, default]
+        void MediaStream();
+        /// <summary>
+        /// Constructs an instance of an MediaStream and clones the tracks
+        /// from the original MediaStream.
+        /// </summary>
+        [constructor, altname(MediaStreamClone)]
+        void MediaStream(MediaStream source);
+        /// <summary>
+        /// Constructs an instance of an MediaStream containing a list of
+        /// MediaStreamTracks supplied.
+        /// </summary>
+        [constructor, default, altname(MediaStreamWithTracks)]
+        void MediaStream(MediaStreamTrackList tracks);
+
+        /// <summary>
+        /// Gets a unique object instance identifier for this object.
+        /// </summary>
+        [getter]
+        puid objectId;
+
+        /// <summary>
+        /// Gets the media stream identifier. When a MediaStream object is
+        /// created, the engine must generate an identifier string, and must
+        /// initialize the object's id attribute to that string. A good
+        /// practice is to use a UUID [RFC4122], which is 36 characters long
+        /// in its canonical form. To avoid fingerprinting, implementations
+        /// should use the forms in section 4.4 or 4.5 of [RFC4122] when
+        /// generating UUIDs.
+        /// </summary>
+        [getter]
+        string id;
+
+        /// <summary>
+        /// Gets an indicator if this MediaStream is active.
+        /// </summary>
+        [getter]
+        bool active;
+
+        /// <summary>
+        /// Returns a sequence of MediaStreamTrack objects representing all
+        /// the tracks in this stream.
+        /// </summary>
+        [getter]
+        MediaStreamTrackList tracks;
+        /// <summary>
+        /// Gets a sequence of MediaStreamTrack objects representing the
+        /// audio tracks in this stream.
+        /// </summary>
+        [getter]
+        MediaStreamTrackList audioTracks;
+        [getter]
+        /// <summary>
+        /// Gets a sequence of MediaStreamTrack objects representing the
+        /// video tracks in this stream.
+        /// </summary>
+        MediaStreamTrackList videoTracks;
+        /// <summary>
+        /// The GetTrackById() method must return either a MediaStreamTrack
+        /// object from this stream's track set whose id is equal to trackId,
+        /// or null, if no such track exists.
+        /// </summary>
+        MediaStreamTrack getTrackById(string id);
+
+        /// <summary>
+        /// Gets the number of media stream tracks contained within the media
+        /// stream.
+        /// </summary>
+        [getter]
+        size_t count;
+
+        /// <summary>
+        /// Adds the given MediaStreamTrack to this MediaStream.
+        /// </summary>
+        void addTrack(MediaStreamTrack track) throws (InvalidParameters);
+        /// <summary>
+        /// Removes the given MediaStreamTrack object from this MediaStream.
+        /// </summary>
+        void removeTrack(MediaStreamTrack track);
+
+        /// <summary>
+        /// Clones the given MediaStream and all its tracks.
+        /// </summary>
+        MediaStream clone();
+
+        /// <summary>
+        /// This event fires when a new MediaStreamTrack has been added to
+        /// this stream. Note that this event is not fired when the script
+        /// directly modifies the tracks of a MediaStream.
+        /// </summary>
+        [event]
+        void onAddTrack(MediaStreamTrack track);
+        /// <summary>
+        /// This event fires when a MediaStreamTrack has been removed from
+        /// this stream. Note that this event is not fired when the script
+        /// directly modifies the tracks of a MediaStream.
+        /// </summary>
+        [event]
+        void onRemoveTrack(MediaStreamTrack track);
+      };
+
+    }
+  }
+}
diff --git a/ortc/idl/adapter/PeerConnection.idl b/ortc/idl/adapter/PeerConnection.idl
new file mode 100644
index 00000000..87de91a5
--- /dev/null
+++ b/ortc/idl/adapter/PeerConnection.idl
@@ -0,0 +1,621 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    namespace adapter
+    {
+      /// <summary>
+      /// The RTCConfiguration defines a set of parameters to configure how
+      /// the peer to peer communication established via RTCPeerConnection is
+      /// established or re-established.
+      /// </summary>
+      [dictionary]
+      struct RTCConfiguration
+      {
+        typedef std::list<RTCCertificate> CertificateList;
+
+        /// <summary>
+        /// Gets or sets the ice gatherer policy as well as an array of
+        /// objects describing servers available to be used by ICE, such as
+        /// STUN and TURN server.
+        /// </summary>
+        RTCIceGatherOptions gatherOptions;
+        /// <summary>
+        /// Gets or sets the signaling mode as either JSON based or SDP based.
+        /// The signaling type must be specified as Json, SdpOffer, or
+        /// SdpAnswer.
+        /// </summary>
+        RTCPeerConnectionSignalingMode signalingMode = json;
+        /// <summary>
+        /// Gets or sets if the SRTP/SDES should be used with the peer
+        /// connection.
+        /// </summary>
+        bool negotiateSrtpSdes;
+
+        /// <summary>
+        /// Gets or sets a media-bundling policy to use when gathering ICE.
+        /// candidates.
+        /// </summary>
+        RTCBundlePolicy bundlePolicy = balanced;
+        /// <summary>
+        /// Gets or sets rtcp-mux policy to use when gathering ICE candidates.
+        /// </summary>
+        RTCRtcpMuxPolicy rtcpMuxPolicy = require;
+        /// <summary>
+        /// Gets or sets a list of certificates that the RTCPeerConnection
+        /// uses to authenticate.
+        /// </summary>
+        CertificateList certificates;
+        /// <summary>
+        /// Gets or sets the size of the prefetched ICE pool as defined in
+        /// [draft-ietf-rtcweb-jsep-14] (section 3.4.4. and section 4.1.1.).
+        /// </summary>
+        size_t iceCandidatePoolSize;
+
+        /// <summary>
+        /// Consturcts an instance of an RTCConfiguration object.
+        /// authenticate.
+        /// </summary>
+        [constructor, default]
+        void RTCConfiguration();
+        /// <summary>
+        /// Constructs an instance of an RTCConfiguration object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCConfigurationClone)]
+        void RTCConfiguration(RTCConfiguration source);
+      };
+
+      /// <summary>
+      /// Base object for offer, answer and capability options during RTCPeerConnection exchanges.
+      /// </summary>
+      [dictionary]
+      struct RTCOfferAnswerOptions
+      {
+        [constructor, delete]
+        void RTCOfferAnswerOptions();
+
+        /// <summary>
+        /// Gets or sets if VAD is enabled. Many codecs and systems are
+        /// capable of detecting "silence" and changing their behavior in this
+        /// case by doing things such as not transmitting any media. In many
+        /// cases, such as when dealing with emergency calling or sounds other
+        /// than spoken voice, it is desirable to be able to turn off this
+        /// behavior. This option allows the application to provide
+        /// information about whether it wishes this type of processing
+        /// enabled or disabled.
+        /// </summary>
+        bool voiceActivityDetection = true;
+      };
+
+      /// <summary>
+      /// The RTCOfferOptions object contains configuration options related
+      /// to an offer.
+      /// </summary>
+      [dictionary]
+      struct RTCOfferOptions : RTCOfferAnswerOptions
+      {
+        /// <summary>
+        /// Gets or sets if the ice gatherer should be restarted. When the
+        /// value of this dictionary member is true, the generated description
+        /// will have ICE credentials that are different from the current
+        /// credentials(as visible in the localDescription attribute's SDP).
+        /// Applying the generated description will restart ICE.
+        /// </summary>
+        bool iceRestart;
+      };
+
+      /// <summary>
+      /// The RTCAnswerOptions object contains configuration options related
+      /// to an answer.
+      /// </summary>
+      [dictionary]
+      struct RTCAnswerOptions : RTCOfferAnswerOptions
+      {
+      };
+
+      /// <summary>
+      /// The RTCCapabilityOptions object contains configuration options related
+      /// to capability options as part of a capabilities signaling exchange.
+      /// </summary>
+      [dictionary]
+      struct RTCCapabilityOptions : RTCOfferAnswerOptions
+      {
+      };
+
+      /// <summary>
+      /// The RTCMediaStreamTrackConfiguration contains the information needed
+      /// to configure the tracks to send over the RTP transport.
+      /// </summary>
+      [dictionary]
+      struct RTCMediaStreamTrackConfiguration
+      {
+        /// <summary>
+        /// Gets or sets the RTP capabilities associated with the media
+        /// stream track configuration.
+        /// </summary>
+        RTCRtpCapabilities capabilities;
+        /// <summary>
+        /// Gets or sets the RTP parameters associated with the media
+        /// stream track configuration.
+        /// </summary>
+        RTCRtpParameters parameters;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCMediaStreamTrackConfiguration object.
+        /// </summary>
+        [constructor, default]
+        void RTCMediaStreamTrackConfiguration();
+        /// <summary>
+        /// Constructs an instance of an RTCMediaStreamTrackConfiguration object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCMediaStreamTrackConfigurationClone)]
+        void RTCMediaStreamTrackConfiguration(RTCMediaStreamTrackConfiguration source);
+      };
+
+      /// <summary>
+      /// The RTCPeerConnectionIceErrorEvent object is fired when an error
+      /// connecting to a STUN or TURN server is detected.
+      /// </summary>
+      interface RTCPeerConnectionIceErrorEvent
+      {
+        [constructor, delete]
+        void RTCPeerConnectionIceErrorEvent();
+
+        /// <summary>
+        /// Gets the local candidate used to communicate with the STUN or TURN
+        /// server.
+        /// </summary>
+        [getter]
+        RTCIceCandidate hostCandidate;
+        /// <summary>
+        /// Gets the STUN or TURN URL that identifies the STUN or TURN server
+        /// for which the failure occurred.
+        /// </summary>
+        [getter]
+        string          url;
+        /// <summary>
+        /// Gets the errorCode attribute is the numeric STUN error code
+        /// returned by the STUN or TURN server.
+        /// </summary>
+        [getter, optional]
+        uint16          errorCode;
+        /// <summary>
+        /// Gets the errorText attribute is the STUN reason text returned by
+        /// the STUN or TURN server.
+        /// </summary>
+        [getter]
+        string          errorText;
+      };
+
+      /// <summary>
+      /// This event fires whenever a new ICE candidate has been discovered.
+      /// </summary>
+      struct RTCPeerConnectionIceEvent
+      {
+        [constructor, delete]
+        void RTCPeerConnectionIceEvent();
+
+        /// <summary>
+        /// Gets the RTCIceCandidate object with the new ICE candidate that
+        /// caused the event.
+        /// </summary>
+        [getter]
+        RTCIceCandidate candidate;
+        /// <summary>
+        /// Gets the STUN or TURN URL that identifies the STUN or TURN server
+        /// used to gather this candidate. If the candidate was not gathered
+        /// from a STUN or TURN server, this parameter will be set to null.
+        /// </summary>
+        [getter]
+        string uri;
+      };
+
+      /// <summary>
+      /// The RTCTrackEvent is fired when a new remote track is detected.
+      /// </summary>
+      struct RTCTrackEvent
+      {
+        typedef std::list<MediaStream> MediaStreamList;
+
+        [constructor, delete]
+        void RTCTrackEvent();
+
+        /// <summary>
+        /// Gets the RTCRtpReceiver object associated with the event.
+        /// </summary>
+        [getter]
+        RTCRtpReceiver receiver;
+        /// <summary>
+        /// Gets the MediaStreamTrack object that is associated with the
+        /// RTCRtpReceiver identified by receiver.
+        /// </summary>
+        [getter]
+        MediaStreamTrack track;
+        /// <summary>
+        /// Gets an array of MediaStream objects representing the MediaStreams
+        /// that this event's track is a part of.
+        /// </summary>
+        [getter]
+        MediaStreamList mediaStreams;
+      };
+
+      /// <summary>
+      /// The general operation of the RTCPeerConnection is described in
+      /// [draft-ietf-rtcweb-jsep].
+      /// </summary>
+      interface RTCPeerConnection : RTCStatsProvider
+      {
+        typedef std::list<MediaStream> MediaStreamList;
+        typedef PromiseWith<RTCSessionDescription> PromiseWithDescription;
+        typedef std::list<RTCIceServer> ServerList;
+        typedef std::list<RTCRtpSender> SenderList;
+        typedef std::list<RTCRtpReceiver> ReceiverList;
+        typedef PromiseWith<RTCRtpSender> PromiseWithSender;
+        typedef PromiseWith<RTCDataChannel> PromiseWithDataChannel;
+
+        /// <summary>
+        /// Constructs an instance of an RTCPeerConnection object. 
+        /// </summary>
+        [default, constructor]
+        void RTCPeerConnection();
+
+        /// <summary>
+        /// Constructs an instance of an RTCPeerConnection object with 
+        /// configuration options specified.
+        /// </summary>
+        [constructor, altname(RTCPeerConnectionWithConfiguration)]
+        void RTCPeerConnection(RTCConfiguration configuration);
+
+        /// <summary>
+        /// Gets a unique object instance identifier for this object.
+        /// </summary>
+        [getter]
+        puid objectId;
+
+        /// <summary>
+        /// The CreateOffer method generates a blob of SDP that contains an
+        /// [RFC3264] offer with the supported configurations for the session,
+        /// including descriptions of the local MediaStreamTracks attached to
+        /// this RTCPeerConnection, the codec/RTP/RTCP options supported by
+        /// this implementation, and any candidates that have been gathered by
+        /// the ICE Agent. The options parameter may be supplied to provide
+        /// additional control over the offer generated.
+        /// </summary>
+        [default]
+        PromiseWithDescription createOffer();
+        /// <summary>
+        /// The CreateOffer method generates a blob of SDP that contains an
+        /// [RFC3264] offer with the supported configurations for the session,
+        /// including descriptions of the local MediaStreamTracks attached to
+        /// this RTCPeerConnection, the codec/RTP/RTCP options supported by
+        /// this implementation, and any candidates that have been gathered by
+        /// the ICE Agent. The options parameter may be supplied to provide
+        /// additional control over the offer generated.
+        /// </summary>
+        [altname(createOfferWithOptions)]
+        PromiseWithDescription createOffer(RTCOfferOptions options);
+        /// <summary>
+        /// The CreateAnswer method generates an [RFC3264] answer with the
+        /// supported configuration for the session that is compatible with
+        /// the parameters in the remote configuration. Like createOffer, the
+        /// returned blob contains descriptions of the local MediaStreamTracks
+        /// attached to this RTCPeerConnection, the codec/RTP/RTCP options
+        /// negotiated for this session, and any candidates that have been
+        /// gathered by the ICE Agent. The options parameter may be supplied
+        /// to provide additional control over the generated answer.
+        /// </summary>
+        [default]
+        PromiseWithDescription createAnswer();
+        /// <summary>
+        /// The CreateAnswer method generates an [RFC3264] answer with the
+        /// supported configuration for the session that is compatible with
+        /// the parameters in the remote configuration. Like createOffer, the
+        /// returned blob contains descriptions of the local MediaStreamTracks
+        /// attached to this RTCPeerConnection, the codec/RTP/RTCP options
+        /// negotiated for this session, and any candidates that have been
+        /// gathered by the ICE Agent. The options parameter may be supplied
+        /// to provide additional control over the generated answer.
+        /// </summary>
+        [altname(createAnswerWithOptions)]
+        PromiseWithDescription createAnswer(RTCAnswerOptions options);
+
+        /// <summary>
+        /// When operating in JSON signaling type, this method gets the local
+        /// description which consists of ICE transport parameters, secure
+        /// transport parameters, and RTP/RTCP capabilities without needing
+        /// shared negioated state with an offer answer exchange. In this
+        /// signaling model, each side creates it's capabilities (and
+        /// parameters) and exchanges with the remote party.
+        /// </summary>
+        [default]
+        PromiseWithDescription createCapabilities();
+        /// <summary>
+        /// When operating in JSON signaling type, this method gets the local
+        /// description which consists of ICE transport parameters, secure
+        /// transport parameters, and RTP/RTCP capabilities without needing
+        /// shared negioated state with an offer answer exchange. In this
+        /// signaling model, each side creates it's capabilities (and
+        /// parameters) and exchanges with the remote party.
+        /// </summary>
+        [altname(createCapabilitiesWithOptions)]
+        PromiseWithDescription createCapabilities(RTCCapabilityOptions options);
+
+        /// <summary>
+        /// The SetLocalDescription() method instructs the RTCPeerConnection
+        /// to apply the supplied RTCSessionDescriptionInit as the local
+        /// description.
+        /// </summary>
+        Promise setLocalDescription(RTCSessionDescription description);
+
+        /// <summary>
+        /// Gets the PendingLocalDescription if it is not null and otherwise
+        /// it must return CurrentLocalDescription.
+        /// </summary>
+        [getter]
+        RTCSessionDescription localDescription;
+        /// <summary>
+        /// Gets the local RTCSessionDescription that was successfully
+        /// negotiated the last time theRTCPeerConnection transitioned into
+        /// the stable state plus any local candidates that have been
+        /// generated by the ICE Agent since the offer or answer was created.
+        /// This attribute is updated by SetLocalDescription().
+        /// </summary>
+        [getter]
+        RTCSessionDescription currentDescription;
+        /// <summary>
+        /// Gets a local RTCSessionDescription that is in the process of being
+        /// negotiated plus any local candidates that have been generated by
+        /// the ICE Agent since the offer or answer was created. If the
+        /// RTCPeerConnection is in the stable state, the value is null. This
+        /// attribute is updated by setLocalDescription().
+        /// </summary>
+        [getter]
+        RTCSessionDescription pendingDescription;
+
+        /// <summary>
+        /// The SetRemoteDescription() method instructs the RTCPeerConnection
+        /// to apply the supplied RTCSessionDescriptionInit as the remote
+        /// offer or answer (or remote description if in JSON signalling).
+        /// This API may change the local media state.
+        /// </summary>
+        Promise setRemoteDescription(RTCSessionDescription description);
+        /// <summary>
+        /// Gets the PendingRemoteDescription if it is not null and otherwise
+        /// it must return currentRemoteDescription.
+        /// </summary>
+        [getter]
+        RTCSessionDescription remoteDescription;
+        /// <summary>
+        /// Gets the last remote RTCSessionDescription that was successfully
+        /// negotiated the last time theRTCPeerConnection transitioned into
+        /// the stable state plus any remote candidates that have been
+        /// supplied via AddIceCandidate() since the offer or answer was
+        /// created. This attribute is updated by SetRemoteDescription().
+        /// </summary>
+        [getter]
+        RTCSessionDescription currentRemoteDescription;
+        /// <summary>
+        /// Gets a remote RTCSessionDescription that is in the process of
+        /// being negotiated, completed with any remote candidates that have
+        /// been supplied via AddIceCandidate() since the offer or answer was
+        /// created. If the RTCPeerConnection is in the stable state, the
+        /// value is null. This attribute is updated by
+        /// SetRemoteDescription().
+        /// </summary>
+        [getter]
+        RTCSessionDescription pendingRemoteDescription;
+        /// <summary>
+        /// The AddIceCandidate() method provides a remote candidate to the
+        /// ICE Agent. In addition to being added to the remote description,
+        /// connectivity checks will be sent to the new candidates as long as
+        /// the ICE Transports setting is not set to none. This call will
+        /// result in a change to the ICE connection state, and may result in
+        /// a change to media state if it results in different connectivity
+        /// being established. The only members of candidate used by this
+        /// method are candidate, sdpMid and sdpMLineIndex; the rest are
+        /// ignored.
+        /// </summary>
+        void addIceCandidate(RTCIceCandidate candidate);
+
+        /// <summary>
+        /// Gets the RTCPeerConnection object's signaling state.
+        /// </summary>
+        [getter]
+        RTCSignalingState signalingState;
+        /// <summary>
+        /// Gets the ICE gathering state of the RTCPeerConnection instance.
+        /// </summary>
+        [getter]
+        RTCIceGathererState iceGatheringState;
+
+        /// <summary>
+        /// Gets the ICE connection state of the RTCPeerConnection instance.
+        /// </summary>
+        [getter]
+        RTCIceConnectionState iceConnectionState;
+        /// <summary>
+        /// Gets the aggregate of the states of the DtlsTransports and
+        /// IceTransports of the RTCPeerConnection, as describe in the values
+        /// of the RTCPeerConnectionState enum.
+        /// </summary>
+        [getter]
+        RTCPeerConnectionState connectionState;
+        /// <summary>
+        /// Gets whether the remote peer is able to accept trickled ICE
+        /// candidates [draft-ietf-ice-trickle-01].
+        /// </summary>
+        [getter]
+        bool canTrickleCandidates;
+
+        /// <summary>
+        /// Gets a list of ICE servers that are configured into the engine.
+        /// An engine/browser might be configured to use local or private
+        /// STUN or TURN servers. This method allows an application to learn
+        /// about these servers and optionally use them.
+        /// </summary>
+        ServerList getDefaultIceServers();
+
+        /// <summary>
+        /// Gets or sets an RTCConfiguration object representing the current
+        /// configuration of this RTCPeerConnection object.
+        /// </summary>
+        [getter, setter]
+        RTCConfiguration getConfiguration;
+
+        /// <summary>
+        /// Closes the RTCPeerConnection object.
+        /// </summary>
+        void close();
+
+        /// <summary>
+        /// Returns a sequence of RTCRtpSender objects representing the RTP
+        /// senders that are currently attached to this RTCPeerConnection
+        /// object.
+        /// </summary>
+        SenderList getSenders();
+        /// <summary>
+        /// Returns a sequence of RTCRtpReceiver objects representing the RTP
+        /// receivers that are currently attached to this RTCPeerConnection
+        /// object.
+        /// </summary>
+        ReceiverList getReceivers();
+
+        /// <summary>
+        /// Adds a new track to the RTCPeerConnection.
+        /// </summary>
+        [default]
+        PromiseWithSender addTrack(MediaStreamTrack track);
+        /// <summary>
+        /// Adds a new track to the RTCPeerConnection and specifies how the
+        /// track must be encoded.
+        /// </summary>
+        [altname(addTrackWithConfiguration)]
+        PromiseWithSender addTrack(
+                                   MediaStreamTrack track,
+                                   RTCMediaStreamTrackConfiguration config
+                                   );
+        /// <summary>
+        /// Adds a new track to the RTCPeerConnection, and indicates that it
+        /// is contained in the specified MediaStreams.
+        /// </summary>
+        [altname(addTrackWithStreams)]
+        PromiseWithSender addTrack(
+                                   MediaStreamTrack track,
+                                   MediaStreamList mediaStreams,
+                                   RTCMediaStreamTrackConfiguration config
+                                   );
+
+        /// <summary>
+        /// Stops sending media from sender. The RTCRtpSender will still
+        /// appear in GetSenders().
+        /// </summary>
+        void removeTrack(RTCRtpSender sender);
+
+        /// <summary>
+        /// Creates a new RTCDataChannel object with the given data channel
+        /// parameters.
+        /// </summary>
+        PromiseWithDataChannel createDataChannel(RTCDataChannelParameters parameters);
+
+        /// <summary>
+        /// The engine wishes to inform the application that session
+        /// negotiation needs to be done (e.g. a CreateOffer() call followed
+        /// by SetLocalDescription). Alternatively, CreateCapabilities() can
+        /// be called for JSON style signaling.
+        /// </summary>
+        [event]
+        void onNegotiationNeeded();
+
+        /// <summary>
+        /// A new RTCIceCandidate is made available to the script.
+        /// </summary>
+        [event]
+        void onIceCandidate(RTCPeerConnectionIceEvent event);
+
+        /// <summary>
+        /// A failure occured when gathering ICE candidates.
+        /// </summary>
+        [event]
+        void onIceCandidateError(RTCPeerConnectionIceErrorEvent event);
+
+        /// <summary>
+        /// The signaling state has changed. This state change is the result
+        /// of either setLocalDescription() or setRemoteDescription() being
+        /// invoked.
+        /// </summary>
+        [event]
+        void onSignalingStateChange();
+
+        /// <summary>
+        /// The RTCPeerConnection's ICE connection state has changed.
+        /// </summary>
+        [event]
+        void onIceConnectionStateChange();
+
+        /// <summary>
+        /// The RTCPeerConnection's ICE gathering state has changed.
+        /// </summary>
+        [event]
+        void onIceGatheringStateChange();
+
+        /// <summary>
+        /// The RTCPeerConnection ConnectionState has changed.
+        /// </summary>
+        [event]
+        void onConnectionStateChange();
+
+        /// <summary>
+        /// A new incoming MediaStreamTrack has been created, and an
+        /// associated RTCRtpReceiver has been added to the set of receivers.
+        /// </summary>
+        [event]
+        void onTrack(RTCTrackEvent event);
+
+        /// <summary>
+        /// An incoming MediaStreamTrack has disappeared, and the associated
+        /// RTCRtpReceiver is now removed.
+        /// </summary>
+        [event]
+        void onTrackGone(RTCTrackEvent event);
+
+        /// <summary>
+        /// A new RTCDataChannel is dispatched to the script in response to
+        /// the other peer creating a channel.
+        /// </summary>
+        [event]
+        void onDataChannel(RTCDataChannelEvent event);
+      };
+    }
+  }
+}
diff --git a/ortc/idl/adapter/SessionDescription.idl b/ortc/idl/adapter/SessionDescription.idl
new file mode 100644
index 00000000..13de5cef
--- /dev/null
+++ b/ortc/idl/adapter/SessionDescription.idl
@@ -0,0 +1,1136 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    namespace adapter
+    {
+      /// <summary>
+      /// The RTCSessionDescriptionConnectionDataDetails object describes the
+      /// RTP/RTCP connection data at the session or media level or the
+      /// unicast address information for the origin at the session level as
+      /// described in [RFC4566] Section 5.7 for RTP and [RFC3605] Section 2.1
+      /// for RTCP and [RFC4566] Section 5.2 for the origin's unicast address.
+      /// </summary>
+      /// <example>
+      /// <code>
+      /// o=jdoe 2890844526 2890842807 IN IP4 10.47.16.5
+      /// </code>
+      /// <code>
+      /// c=IN IP4 224.2.17.12/127
+      /// </code>
+      /// <code>
+      /// a=rtcp:53020
+      /// </code>
+      /// <code>
+      /// a=rtcp:53020 IN IP4 126.16.64.4
+      /// </code>
+      /// </example>
+      [dictionary]
+      struct RTCSessionDescriptionConnectionDataDetails
+      {
+        /// <summary>
+        /// Gets or sets the port for RTP or RTCP. For RTP at the media level
+        /// this is the media description's port as described in [RFC4566]
+        /// Section 5.14. For RTCP, the port is the RTCP port to use for the
+        /// connection as described in [RFC3605] Section 2.1. This value is
+        /// null and not used for origin unicast address or at the session
+        /// level's connection address.
+        /// </summary>
+        [optional]
+        uint16 port;
+        /// <summary>
+        /// Gets or sets the network type as described in [RFC4566] Section
+        /// 8.2.6. The value "IN" represents the Internet.
+        /// </summary>
+        string netType;
+        /// <summary>
+        /// Gets or sets the address type as described in [RFC4566] Section
+        /// 8.2.7. The value "IP4" represents the IPv4 and "IP6" represents
+        /// IPv6.
+        /// </summary>
+        string addrType;
+        /// <summary>
+        /// Gets or sets the connection address as described in [RFC4566]
+        /// Section 5.7 for session or media level connection data or the
+        /// unicast address for the session level origin as describe in 
+        /// [RFC4566] Section 5.2
+        /// </summary>
+        string connectionAddress;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCSessionDescriptionConnectionDataDetails object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionConnectionDataDetails();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionConnectionDataDetails object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionConnectionDataDetailsClone)]
+        void RTCSessionDescriptionConnectionDataDetails(RTCSessionDescriptionConnectionDataDetails source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionConnectionDataDetails object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionConnectionDataDetailsWithJson)]
+        void RTCSessionDescriptionConnectionDataDetails(Json json);
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+      /// <summary>
+      /// The RTCSessionDescriptionConnectionData object describes the
+      /// connection data information as described in [RFC4566] Section 5.7
+      /// for RTP and [RFC3605] Section 2.1 for RTCP (at either the session
+      /// level or the media level).
+      /// </summary>
+      [dictionary]
+      struct RTCSessionDescriptionConnectionData
+      {
+        /// <summary>
+        /// Gets or sets the RTP connection data information "c=" as described
+        /// in [RFC4566] Section 5.7.
+        /// </summary>
+        RTCSessionDescriptionConnectionDataDetails rtp;
+        /// <summary>
+        /// Gets or sets the RTCP connection data information "a=rtcp" as
+        /// described in [RFC3605] Section 2.1.
+        /// </summary>
+        RTCSessionDescriptionConnectionDataDetails rtcp;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCSessionDescriptionConnectionData object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionConnectionData();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionConnectionData object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionConnectionDataClone)]
+        void RTCSessionDescriptionConnectionData(RTCSessionDescriptionConnectionData source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionConnectionData object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionConnectionDataWithJson)]
+        void RTCSessionDescriptionConnectionData(Json json);
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+      /// <summary>
+      /// The RTCSessionDescriptionTransportParameters represents the ICE
+      /// and secure transport parameters for a transport as well as any
+      /// candidates that are signaled as part of the session description for
+      /// a given transport.
+      /// </summary>
+      [dictionary]
+      struct RTCSessionDescriptionTransportParameters
+      {
+        typedef std::list<RTCIceCandidate> CandidateList;
+
+        /// <summary>
+        /// Gets or sets all the ICE parameters needed to configure the ICE
+        /// ICE transport as described in [RFC5245].
+        /// </summary>
+        RTCIceParameters iceParameters;
+        /// <summary>
+        /// Gets or sets the DTLS parameters need to configure the DTLS 
+        /// transport as described in [RFC4572] and [RFC5763].
+        /// </summary>
+        RTCDtlsParameters dtlsParameters;
+        /// <summary>
+        /// Gets or sets the SRTP/SDES parameters as described in [RFC4568].
+        /// This transport is mutually exclusive with the DTLS transport and
+        /// must always be set null for RTCP transports.
+        /// </summary>
+        RTCSrtpSdesParameters srtpSdesParameters;
+        /// <summary>
+        /// Gets or sets the list of ICE candidates as described in [RFC5245].
+        /// </summary>
+        CandidateList iceCandidates;
+        /// <summary>
+        /// Gets or sets if the end-of-candidates flag as described in
+        /// [draft-ietf-ice-trickle] Section 10.
+        /// </summary>
+        bool endOfCandidates;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCSessionDescriptionTransportParameters object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionTransportParameters();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionTransportParameters object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionTransportParametersClone)]
+        void RTCSessionDescriptionTransportParameters(RTCSessionDescriptionTransportParameters source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionTransportParameters object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionTransportParametersWithJson)]
+        void RTCSessionDescriptionTransportParameters(Json json);
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+      /// <summary>
+      /// The RTCSessionDescriptionTransport object represents the ICE and
+      /// secure transport parameters for RTP and optionally RTCP if non-muxed
+      /// RTP/RTCP data is used.
+      /// </summary>
+      [dictionary]
+      struct RTCSessionDescriptionTransport
+      {
+        /// <summary>
+        /// Gets or sets a unique identifier for the transport. For SDP,
+        /// this is the mid identification tag as defined in [RFC5888] Section
+        /// 4 for the media line's transport or the primary bundled transport
+        /// transport media line identifier.
+        /// </summary>
+        /// <example>
+        /// <code>
+        /// m=audio 30000 RTP/AVP 0
+        /// a=mid:1
+        /// m=video 30002 RTP/AVP 31
+        /// a=mid:2
+        /// </code>
+        /// </example>
+        string transportId;
+        /// <summary>
+        /// Gets or sets the RTP transport information for use with RTP and
+        /// RTCP media in the case of muxed RTP/RTCP and only the RTP media
+        /// in the non-muxed scenario. This contains the information for ICE
+        /// and the secure transport.
+        /// </summary>
+        RTCSessionDescriptionTransportParameters rtp;
+        /// <summary>
+        /// Gets or sets the RTCP transport information for use with RTCP if
+        /// non-muxed RTCP data is used otherwise the value is null. This
+        /// contains the ICE transport information and secure transport
+        /// information for use with RTCP.
+        /// </summary>
+        RTCSessionDescriptionTransportParameters rtcp;
+        /// <summary>
+        /// Gets or sets the mux policy for the transport. Mux is preferred
+        /// when possible.
+        /// </summary>
+        bool useMux;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCSessionDescriptionTransport object.
+        /// object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionTransport();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionTransport object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionTransportClone)]
+        void RTCSessionDescriptionTransport(RTCSessionDescriptionTransport source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionTransport object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionTransportWithJson)]
+        void RTCSessionDescriptionTransport(Json json);
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+      /// <summary>
+      /// Gets or sets the media line detailed information associated with a
+      /// type of media and related capabilities for the media on a particular
+      /// transport as describe in [RFC4566] Section 5.14 as well as in
+      /// [draft-ietf-rtcweb-jsep-14].
+      /// </summary>
+      [dictionary]
+      struct RTCSessionDescriptionMediaLineDetails
+      {
+        /// <summary>
+        /// Gets or sets the internal index of a media line based upon its
+        /// order within the entire session. This is used only when the
+        /// media line has no identifier. This value is used internally
+        /// to coordinate matching m lines for SDP negotiation but otherwise
+        /// is not recommended.
+        /// </summary>
+        [optional]
+        size_t internalIndex;
+        /// <summary>
+        /// Gets or sets the private transport to use when the media line
+        /// cannot be bundled withinn the session. This is allows a legacy
+        /// systems that are not capable of bundling media lines together an
+        /// option of including their own private alternative non-bundled
+        /// transport as described in
+        /// [draft-ietf-mmusic-sdp-bundle-negotiation]. If the media line's
+        /// TransportId and PrivateTransportId are identical then this
+        /// transport either is part of a bundle or the transport will be used
+        /// privately and exclusively by this transport depending on what is
+        /// negotiated. If these values differ then the media line will be
+        /// either bundled into a single transport or use a private transport.
+        /// </summary>
+        string privateTransportID;
+
+        /// <summary>
+        /// Gets or sets the protocol for use with DTLS and RTP as descibed in
+        /// [RFC5764] Section 8 or for DTLS and SCTP as described in
+        /// [draft-ietf-mmusic-sctp-sdp] Section 7 and 8. The following values
+        /// match any values are are legal for RTP "RTP/[S]AVP[F]" and
+        /// "(UDP/TCP)/TLS/RTP/SAVP[F]" and for SCTP the values are
+        /// "UDP/DTLS/SCTP", "TCP/DTLS/SCTP", or "DTLS/SCTP
+        /// </summary>
+        string protocol;
+
+        /// <summary>
+        /// Gets or sets the media line connection information as described in
+        /// [RFC4566] Section 5.7 for RTP and [RFC3605] Section 2.1 for RTCP.
+        /// </summary>
+        RTCSessionDescriptionConnectionData connectionData;
+        /// <summary>
+        /// Gets or sets the media direction flow expectations for the media
+        /// line as described in [RFC4566] Section 6.
+        /// </summary>
+        RTCSessionDescriptionMediaDirection mediaDirection = sendReceive;
+
+        /// <summary>
+        /// Constructs and instance of an
+        /// RTCSessionDescriptionMediaLineDetails object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionMediaLineDetails();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionMediaLineDetails object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionMediaLineDetailsClone)]
+        void RTCSessionDescriptionMediaLineDetails(RTCSessionDescriptionMediaLineDetails source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionMediaLineDetails object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionMediaLineDetailsWithJson)]
+        void RTCSessionDescriptionMediaLineDetails(Json json);
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+      [dictionary]
+      struct RTCSessionDescriptionMediaLine
+      {
+        [constructor, delete]
+        void RTCSessionDescriptionMediaLine();
+
+        /// <summary>
+        /// Gets or sets the media identifier for the media line as described
+        /// in [RFC5888] Section 4.
+        /// </summary>
+        string id;
+        /// <summary>
+        /// Gets or sets the transport identifier for the media line. Multiple
+        /// media lines can point to the same transport id so long as the
+        /// payload type or RTP header extension IDs are not redefined within
+        /// the same transport in the same direction for JSON or any direction
+        /// for SDP. All media lines that share the same transport id are
+        /// grouped together into the same bundle as described in
+        /// [draft-ietf-mmusic-sdp-bundle-negotiation].
+        /// </summary>
+        /// <example>
+        /// <code>
+        /// v=0
+        /// o=alice 2890844526 2890844526 IN IP4 atlanta.example.com
+        /// s=
+        /// c=IN IP4 atlanta.example.com
+        /// t=0 0
+        /// a=group:BUNDLE foo bar
+        /// m=audio 10000 RTP/AVP 0 8 97
+        /// b=AS:200
+        /// a=mid:foo
+        /// a=rtpmap:0 PCMU/8000
+        /// a=rtpmap:8 PCMA/8000
+        /// a=rtpmap:97 iLBC/8000
+        /// a=extmap 1 urn:ietf:params:rtp-hdrext:sdes:mid
+        /// m=video 10002 RTP/AVP 31 32
+        /// b=AS:1000
+        /// a=mid:bar
+        /// a=rtpmap:31 H261/90000
+        /// a=rtpmap:32 MPV/90000
+        /// a=extmap 1 urn:ietf:params:rtp-hdrext:sdes:mid
+        /// </code>
+        /// </example>
+        string transportId;
+
+        /// <summary>
+        /// Gets or sets the RTP media type. This value must be either "audio"
+        /// or "video".
+        /// </summary>
+        string mediaType;
+        /// <summary>
+        /// Gets or sets the details of the media line which are required for
+        /// SDP but optional for JSON based signalling. If not usedt his value
+        /// must be null.
+        /// </summary>
+        RTCSessionDescriptionMediaLineDetails details;
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+      /// <summary>
+      /// The RTCSessionDescriptionRtpMediaLine object represents the media
+      /// capabilities and properties associated with a particular media type
+      /// on a given transport. Multiple media lines are legally allowed to
+      /// be bundled within the same transport so long as the payload type
+      /// and/or RTP header extension IDs are not remapped to mean
+      /// different codecs or header extension URIs within the same transport
+      /// for the same direction for JSOn or any direction for SDP. In SDP,
+      /// a media line is required per sender and the if the media line is
+      /// send receive the both sides should attempt to map their respective
+      /// senders to the same media line.
+      /// </summary>
+      /// <example>
+      /// <code>
+      /// m=audio 56500 UDP/TLS/RTP/SAVPF 96 0 8 97 98
+      /// c=IN IP4 192.0.2.1
+      /// a=sendrecv
+      /// a=mid:a1
+      /// m=video 56502 UDP/TLS/RTP/SAVPF 100 101
+      /// c=IN IP4 192.0.2.1
+      /// a=rtcp:56503 IN IP4 192.0.2.1
+      /// a=sendonly
+      /// a=mid:v1
+      /// m=audio 56500 TCP/DTLS/RTP/SAVPF 96 0 8 97 98
+      /// c=IN IP4 192.0.2.1
+      /// a=sendrecv
+      /// a=mid:a2
+      /// </code>
+      /// </example>      
+      [dictionary]
+      struct RTCSessionDescriptionRtpMediaLine : RTCSessionDescriptionMediaLine
+      {
+        /// <summary>
+        /// Gets or sets the sender RTP capabilities described for this media
+        /// line. The usage of each codec is optional within the parameters of
+        /// a sender within the media line but the payload type must not
+        /// be changed within the same media line. The RTP header extension
+        /// IDs specified within the capabilies do not need to be used within
+        /// the RTP parameters but the mapping between RTP header extension
+        /// ID and header extension value must not be changed within the RTP
+        /// parameters.
+        /// </summary>
+        RTCRtpCapabilities senderCapabilities;
+        /// <summary>
+        /// Gets or sets the sender RTP capabilities described for this media
+        /// line. The usage of each codec is optional within the parameters of
+        /// a sender within the media line but the payload type must not
+        /// be changed within the same media line. The RTP header extension
+        /// IDs specified within the capabilies do not need to be used within
+        /// the RTP parameters but the mapping between RTP header extension
+        /// ID and header extension value must not be changed within the RTP
+        /// parameters.
+        /// </summary>
+        RTCRtpCapabilities receiverCapabilities;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCSessionDescriptionRtpMediaLine object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionRtpMediaLine();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionRtpMediaLine object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionRtpMediaLineClone)]
+        void RTCSessionDescriptionRtpMediaLine(RTCSessionDescriptionRtpMediaLine source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionRtpMediaLine object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionRtpMediaLineWithJson)]
+        void RTCSessionDescriptionRtpMediaLine(Json json);
+      };
+
+      /// <summary>
+      /// The RTCSessionDescriptionSctpMediaLine object represents the media
+      /// lines related to an SCTP transport assoacated to an ICE/secure
+      /// transport on a given SCTP port. Multiple data channels can
+      /// operate over the same SCTP transport thus creating multiple
+      /// SCTP transports is not needed unless for application specific logic
+      /// reasons.
+      /// </summary>
+      /// <example>
+      /// <code>
+      /// m=application 0 UDP/DTLS/SCTP webrtc-datachannel
+      /// c=IN IP4 0.0.0.0
+      /// a=bundle-only
+      /// a=mid:d1
+      /// a=fmtp:webrtc-datachannel max-message-size=65536
+      /// a=sctp-port 5000
+      /// </code>
+      /// </example>      
+      [dictionary]
+      struct RTCSessionDescriptionSctpMediaLine : RTCSessionDescriptionMediaLine
+      {
+        /// <summary>
+        /// Gets or sets the SCTP transport's capabilities associated with
+        /// the SCTP transport.
+        /// </summary>
+        RTCSctpCapabilities capabilities;
+        /// <summary>
+        /// Gets or sets the SCTP transport port associated with the SCTP
+        /// transport. This is required for SDP based singaling but is
+        /// optional for JSON based signaling but requires the engine support
+        /// listening for incoming SCTP transports on any port within the
+        /// transport. Only one non-specified port (null value) is allowed per
+        /// transport and all non-signaled SCTP transport must share the same
+        /// SCTP capabilities for the transport. Setting to null implies
+        /// the SCTP transport is capable of listening for incoming SCTP
+        /// transport connections.
+        /// </summary>
+        [optional]
+        uint16 port;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCSessionDescriptionSctpMediaLine object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionSctpMediaLine();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionSctpMediaLine object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionSctpMediaLineClone)]
+        void RTCSessionDescriptionSctpMediaLine(RTCSessionDescriptionSctpMediaLine source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionSctpMediaLine object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionSctpMediaLineWithJson)]
+        void RTCSessionDescriptionSctpMediaLine(Json json);
+      };
+
+      /// <summary>
+      /// The RTCSessionDescriptionRtpSenderDetails object represents the
+      /// sender details that are typically only related to SDP properties for
+      /// a specific sender.
+      /// </summary>
+      [dictionary]
+      struct RTCSessionDescriptionRtpSenderDetails
+      {
+        /// <summary>
+        /// Gets or sets the associated internal index of a media line
+        /// associated with a sender based upon the media line order within
+        /// the entire session. This is used only when the media line has no
+        /// identifier. This value is used internally to coordinate matching
+        /// m (media) lines for SDP negotiation but otherwise is not
+        /// recommended.
+        /// </summary>
+        [optional]
+        size_t internalRtpMediaLineIndex;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCSessionDescriptionRtpSenderDetails object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionRtpSenderDetails();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionRtpSenderDetails object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionRtpSenderDetailsClone)]
+        void RTCSessionDescriptionRtpSenderDetails(RTCSessionDescriptionRtpSenderDetails source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionRtpSenderDetails object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionRtpSenderDetailsWithJson)]
+        void RTCSessionDescriptionRtpSenderDetails(Json json);
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+      /// <summary>
+      /// The RTCSessionDescriptionRtpSender object represents the sender
+      /// parameters for an encoded audio or video media stream track.
+      /// </summary>
+      [dictionary]
+      struct RTCSessionDescriptionRtpSender
+      {
+        typedef string MediaStreamId;
+        typedef std::set<MediaStreamId> MediaStreamSet;
+
+        /// <summary>
+        /// Gets or sets the sender identifier. In the case of SDP based
+        /// signaling this value must correspond to the media stream track
+        /// identifier that the remote party will adopt as it's media
+        /// stream track identification as described in
+        /// [draft-ietf-mmusic-msid] Section 2, i.e. the "msid-appdata" value.
+        /// </summary>
+        string id;
+        /// <summary>
+        /// Gets or sets the sender details associated with this sender. These
+        /// values are typically only used within the context of SDP and
+        /// thus property may be null if unused.
+        /// </summary>
+        RTCSessionDescriptionRtpSenderDetails details;
+        /// <summary>
+        /// Gets or sets the associated media line. In the case of SDP
+        /// signaling only one sender is allowed to be associated to a single
+        /// media line at a time. In the case of JSON, multiple senders are
+        /// allowed to be associated to a single media line. The sender media
+        /// type and media line media type must be identical.
+        /// </summary>
+        string rtpMediaLineId;
+        /// <summary>
+        /// Gets or sets the configuration parameters associated with the
+        /// RTCRtpSender.
+        /// </summary>
+        RTCRtpParameters parameters;
+        /// <summary>
+        /// Gets or sets the media stream track id associated with the
+        /// sender. This property should match the media stream track object
+        /// associated with the RTCRtpSender unless the RTCRtpSender's
+        /// track was chaneged without informing the associated
+        /// RTCRtpPeerConnection object.
+        /// </summary>
+        string mediaStreamTrackId;
+        /// <summary>
+        /// Gets or sets the media stream group IDs associated with the media
+        /// line [RFC5888]  Section 5. All media lines that share the same
+        /// group identification are considered part of the same group and
+        /// thus are part of the same media stream.
+        /// </summary>
+        /// <example>
+        /// <code>
+        /// v=0
+        /// o=- 6729291447651054566 1 IN IP4 0.0.0.0
+        /// s=-
+        /// t=0 0
+        /// a=group:BUNDLE a1 v1
+        /// m=audio 20000 UDP/TLS/RTP/SAVPF 96 0 8 97 98
+        /// c=IN IP4 192.0.2.2
+        /// a=mid:a1
+        /// a=rtcp:20000 IN IP4 192.0.2.2
+        /// a=msid:PI39StLS8W7ZbQl1sJsWUXkr3Zf12fJUvzQ1
+        ///        PI39StLS8W7ZbQl1sJsWUXkr3Zf12fJUvzQ1a0
+        /// a=msid:fdsafjdksajlfEjalkfjDlskajaflJakfjd1
+        ///        PI39StLS8W7ZbQl1sJsWUXkr3Zf12fJUvzQ1a0
+        /// ...
+        /// m=video 20000 UDP/TLS/RTP/SAVPF 100 101
+        /// c=IN IP4 192.0.2.2
+        /// a=rtcp 20001 IN IP4 192.0.2.2
+        /// a=mid:v1
+        /// a=msid:PI39StLS8W7ZbQl1sJsWUXkr3Zf12fJUvzQ1
+        ///        PI39StLS8W7ZbQl1sJsWUXkr3Zf12fJUvzQ1v0
+        /// </code>
+        /// </example>
+        MediaStreamSet mediaStreamIds;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCSessionDescriptionRtpSender object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionRtpSender();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionRtpSender object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionRtpSenderClone)]
+        void RTCSessionDescriptionRtpSender(RTCSessionDescriptionRtpSender source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionRtpSender object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionRtpSenderWithJson)]
+        void RTCSessionDescriptionRtpSender(Json json);
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+      /// <summary>
+      /// The Session description version of an RTCIceCandidate object
+      /// includes information relating to an ICE candidate.
+      /// </summary>
+      [dictionary]
+      struct RTCIceCandidate
+      {
+        /// <summary>
+        /// Gets or sets the identifier of the "media stream identification"
+        /// as defined in [RFC5888] for the media component this candidate is
+        /// associated with.
+        /// </summary>
+        string mid;
+        /// <summary>
+        /// Gets or sets the identifier of the "media stream identification"
+        /// as defined in [RFC5888] for the media component this candidate is
+        /// associated with.
+        /// </summary>
+        [getter, setter]
+        string sdpMid;
+        /// <summary>
+        /// Gets or sets the index (starting at zero) of the media description
+        /// in the SDP this candidate is associated with.
+        /// </summary>
+        [optional]
+        size_t sdpMLineIndex;
+        /// <summary>
+        /// Gets or sets the candidate-attribute as defined in section 15.1 of
+        /// [RFC5245].
+        /// </summary>
+        RTCIceGathererCandidate candidate;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCIceCandidate object.
+        /// </summary>
+        [constructor, default]
+        void RTCIceCandidate();
+        /// <summary>
+        /// Constructs an instance of an RTCIceCandidate object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCIceCandidateClone)]
+        void RTCIceCandidate(RTCIceCandidate source);
+        /// <summary>
+        /// Constructs an instance of an RTCIceCandidate object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, altname(RTCIceCandidateWithJson)]
+        void RTCIceCandidate(Json json) throws (InvalidParameters);
+
+        /// <summary>
+        /// A helper routine to easily converty from a SDP-candidate string to
+        /// an RTCIceCandidate object.
+        /// </summary>
+        [static, obsolete("Use FromSdpStringWithMid instead.")]
+        RTCIceCandidate fromSdpStringWithMLineIndex(
+                                                   string sdp,
+                                                   size_t mlineIndex
+                                                   ) throws (InvalidParameters);
+        /// <summary>
+        /// A helper routine to easily converty from a SDP-candidate string to
+        /// an RTCIceCandidate object.
+        /// </summary>
+        [static]
+        RTCIceCandidate fromSdpStringWithMid(
+                                             string sdp,
+                                             string mid
+                                             ) throws (InvalidParameters);
+
+        /// <summary>
+        /// A helper routine to easily convert to a SDP-candidate string.
+        /// </summary>
+        string toSdp();
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+
+      /// <summary>
+      /// The RTCSessionDescriptionDescriptionDetails represents the session
+      /// level properties typically contained within an SDP origin or
+      /// other session level properties.
+      /// </summary>
+      /// <example>
+      /// <code>
+      /// o=jdoe 2890844526 2890842807 IN IP4 10.47.16.5
+      /// t=3034423619 3042462419
+      /// s=SDP Seminar
+      /// c=IN IP4 224.2.17.12/127
+      /// a=rtcp:53020
+      /// </code>
+      /// <code>
+      /// o=jdoe 2890844526 2890842807 IN IP4 10.47.16.5
+      /// t=0 0
+      /// s=-
+      /// c=IN IP4 224.2.17.12/127
+      /// a=rtcp:53020 IN IP4 126.16.64.4
+      /// </code>
+      /// </example>
+      [dictionary]
+      struct RTCSessionDescriptionDescriptionDetails
+      {
+        /// <summary>
+        /// Gets or sets the user's login on the originating host, or it is "-"
+        /// if the originating host does not support the concept of user IDs.
+        /// This is the origin's username as described in [RFC4566] Section
+        /// 5.2.
+        /// </summary>
+        string username = "-";
+        /// <summary>
+        /// Gets or sets a numeric string such that the tuple of username,
+        /// sess - id, nettype, addrtype, and unicast - address forms a
+        /// globally unique identifier for the session. This is the origin's
+        /// sess-id as described in [RFC4566] Section 5.2.
+        /// </summary>
+        unsigned long long sessionId;
+        /// <summary>
+        /// Gets or sets a version number for this session description. This
+        /// is the origin's sess-version as described in [RFC4566] Section
+        /// 5.2.
+        /// </summary>
+        unsigned long long sessionVersion;
+        /// <summary>
+        /// Gets or sets the unicast address information for a session. This
+        /// represents the origin's nettype, addrtype, unicast-address as
+        /// described in [RFC4566] Section 5.2.
+        /// </summary>
+        RTCSessionDescriptionConnectionDataDetails unicaseAddress;
+        /// <summary>
+        /// Gets or sets the textual session name as described in [RFC4566]
+        /// Section 5.3.
+        /// </summary>
+        string sessionName;
+        /// <summary>
+        /// Gets or sets the start time of the session in NTP format as
+        /// described in [RFC4566] Section 5.9. A value of 0 has an unknown
+        /// start time.
+        /// </summary>
+        uint64 startTime;
+        /// <summary>
+        /// Gets or sets the start end of the session in NTP format as
+        /// described in [RFC4566] Section 5.9. A value of 0 has an unbounded
+        /// end time.
+        /// </summary>
+        uint64 endTime;
+        /// <summary>
+        /// Gets or sets the connection data associated with the session as 
+        /// described in [RFC4566] Section 5.7 for RTP and [RFC3605]
+        /// Section 2.1 for RTCP (at the session level).
+        /// </summary>
+        RTCSessionDescriptionConnectionData connectionData;  // optional; can be null;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCSessionDescriptionDescriptionDetails object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionDescriptionDetails();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionDescriptionDetails object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionDescriptionDetailsClone)]
+        void RTCSessionDescriptionDescriptionDetails(RTCSessionDescriptionDescriptionDetails source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionDescriptionDetails object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionDescriptionDetailsWithJson)]
+        void RTCSessionDescriptionDescriptionDetails(Json json);
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+
+      /// <summary>
+      /// The RTCSessionDescriptionDescription represents a descriptive
+      /// format capable of carrying either media SDP [RFC4566] or JSON-style
+      /// media descriptions. The media descriptions contain information about
+      /// the session, all transports, media lines with media capabilities,
+      /// and senders related to the media lines. This format can be
+      /// converted to/from SDP and JSON.
+      /// </summary>
+      /// <example>
+      /// <code>
+      /// {
+      ///  "session": {
+      ///    "transports": {
+      ///      "transport": {
+      ///        "id": "transport1",
+      ///        "rtp": {
+      ///          "ice": {
+      ///            "parameters": {
+      ///              "usernameFragment": "ufrag1",
+      ///              "password": "password1",
+      ///              "useUnfreezePriority": "true",
+      ///              "iceLite": "false"
+      ///            }
+      ///          },
+      ///          "dtls": {
+      ///            "parameters": {
+      ///              "role": "auto",
+      ///              "fingerprints": {
+      ///                "fingerprint": [
+      ///                  "AB:32:...",
+      ///                  "FF:EE:..."
+      ///                ]
+      ///              }
+      ///            }
+      ///          },
+      ///          "sdesSrtp": { "parameters": "..." },
+      ///          "iceCandidates": {
+      ///            "iceCandidate": [
+      ///              {
+      ///                "mid": "a1",
+      ///                "index": "0",
+      ///                "component": "rtp",
+      ///                "candidate": {...}
+      ///              },
+      ///              { 
+      ///                "mid": "a1",
+      ///                "index": "0",
+      ///                "component": "rtp",
+      ///                "candidateComplete": { complete: "true" }
+      ///              }
+      ///            ]
+      ///          }
+      ///        },
+      ///        "rtcp": {...}
+      ///      }
+      ///    }
+      ///  },
+      ///  "rtpMediaLines" : {
+      ///    "rtpMediaLine": {
+      ///    },
+      ///    ...
+      ///  },
+      ///  "sctpMediaLines" : {
+      ///    "sctpMediaLine": {
+      ///    },
+      ///    ...
+      ///  },
+      ///  "rtpSenders" : {
+      ///    "rtpSender": {
+      ///    },
+      ///    ...
+      ///  },
+      /// }
+      /// </code>
+      /// </example>
+      [dictionary]
+      struct RTCSessionDescriptionDescription
+      {
+        typedef std::list<RTCSessionDescriptionTransport> TransportList;
+        typedef std::list<RTCSessionDescriptionRtpMediaLine> RtpMediaList;
+        typedef std::list<RTCSessionDescriptionSctpMediaLine> SctpMediaList;
+        typedef std::list<RTCSessionDescriptionRtpSender> RtpSenderList;
+
+        /// <summary>
+        /// Gets or sets the detailed session information (which is typically
+        /// related to SDP-only [RFC4566]. This value can be null if is it
+        /// not needed.
+        /// </summary>
+        RTCSessionDescriptionDescriptionDetails details;
+
+        /// <summary>
+        /// Gets or sets a list of transports associated with the session.
+        /// These transports include the ICE and secure transport properties.
+        /// </summary>
+        TransportList transports;
+        /// <summary>
+        /// Gets or sets a list of media capabilities which are associated
+        /// with transports. These media lines describe the intention of the
+        /// media flow and the capabilities and configuration expectations of
+        /// the media.
+        /// </summary>
+        RtpMediaList rtpMediaLines;
+        /// <summary>
+        /// Gets or sets a list of SCTP data transports associated with
+        /// the wire transports.
+        /// </summary>
+        SctpMediaList sctpMediaLines;
+        /// <summary>
+        /// Gets or sets a list of RTP senders associated with a
+        /// configurated media line.
+        /// </summary>
+        RtpSenderList rtpSenders;
+
+        /// <summary>
+        /// Constructs an empty instance of an RTCSessionDescriptionDescription object.
+        /// </summary>
+        [constructor, default]
+        void RTCSessionDescriptionDescription();
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionDescription object by cloning object data from an existing object.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionDescriptionClone)]
+        void RTCSessionDescriptionDescription(RTCSessionDescriptionDescription source);
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescriptionDescription object by extracting object data from a JSON object.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionDescriptionWithJson)]
+        void RTCSessionDescriptionDescription(Json json);
+
+        /// <summary>
+        /// A helper routine to convert the object's data to structured JSON object data.
+        /// </summary>
+        Json toJson();
+        /// <summary>
+        /// Return a hash of the data contained within the object.
+        /// </summary>
+        string hash();
+      };
+
+      /// <summary>
+      /// The RTCSessionDescription class is used by RTCPeerConnection to
+      /// expose local and remote session descriptions.
+      /// </summary>
+      interface RTCSessionDescription
+      {
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescription from a string
+        /// representation of the session description.
+        /// </summary>
+        [constructor, default, altname(RTCSessionDescriptionWithString)]
+        void RTCSessionDescription(
+                                   RTCSessionDescriptionSignalingType type,
+                                   string description
+                                   ) throws (InvalidParameters, InvalidStateError);
+
+        /// <summary>
+        /// Constructs an instance of an RTCSessionDescription from a
+        /// structured session description.
+        /// </summary>
+        [constructor, altname(RTCSessionDescriptionWithDescription)]
+        void RTCSessionDescription(
+                                   RTCSessionDescriptionSignalingType type,
+                                   RTCSessionDescriptionDescription description
+                                   ) throws(InvalidParameters, InvalidStateError);
+
+        /// <summary>
+        /// Helper routine to convert RTP capabilities into the appropriate
+        /// matching RTP parameters.
+        /// </summary>
+        [static]
+        RTCRtpParameters convertCapabilitiesToParameters(RTCRtpCapabilities capabilitites);
+        /// <summary>
+        /// Helper routine to convert existing RTP parameters into the RTP
+        /// capabilities.
+        /// </summary>
+        [static]
+        RTCRtpCapabilities ConvertParametersToCapabilitites(RTCRtpParameters parameters);
+
+        /// <summary>
+        /// Gets a unique object instance identifier for this object.
+        /// </summary>
+        [getter]
+        puid objectId;
+
+        /// <summary>
+        /// Gets the SDP type of this RTCSessionDescription. This property
+        /// may only be obtained if the signaling type is SDP.
+        /// </summary>
+        [getter]
+        RTCSessionDescriptionSignalingType type;
+
+        /// <summary>
+        /// Gets the SDP type of this RTCSessionDescription. This property
+        /// may only be obtained if the signaling type is SDP.
+        /// </summary>
+        [getter, obsolete("Use Type or SignalingType instead.")]
+        RTCSdpType sdpType;
+
+        /// <summary>
+        /// Gets a indiciation if the signaling type is JSON based.
+        /// </summary>
+        [getter]
+        bool isJsonSignalling;
+
+        /// <summary>
+        /// Gets a indiciation if the signaling type is SDP based.
+        /// </summary>
+        [getter]
+        bool isSdpSignaling;
+
+        /// <summary>
+        /// Gets the structured representation of the SDP [RFC3264] or JSON
+        /// contents.
+        /// </summary>
+        [getter]
+        RTCSessionDescriptionDescription description;
+
+        /// <summary>
+        /// Gets the string representation of the SDP [RFC3264] or JSON.
+        /// </summary>
+        [getter]
+        string formattedDescription;
+
+        /// <summary>
+        /// Gets the string representation of the SDP [RFC3264] or JSON.
+        /// </summary>
+        [getter, obsolete("Use FormattedDescription instead.")]
+        string sdp;
+      };
+    }
+  }
+}
diff --git a/ortc/idl/adapter/enums.idl b/ortc/idl/adapter/enums.idl
new file mode 100644
index 00000000..c9cadb40
--- /dev/null
+++ b/ortc/idl/adapter/enums.idl
@@ -0,0 +1,360 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    namespace adapter
+    {
+      /// <summary>
+      /// The RTCSdpType enum describes the type of RTCSessionDescription
+      /// instance.
+      /// </summary>
+      enum RTCSdpType
+      {
+        /// <summary>
+        /// An RTCSdpType of offer indicates that a description must be
+        /// treated as an [RTC3264] offer.
+        /// </summary>
+        offer,
+        /// <summary>
+        /// An RTCSdpType of pranswer indicates that a description must be
+        /// treated as an [RTC3264] answer, but not a final answer. A
+        /// description used as an SDP pranswer may be applied as a response
+        /// to an SDP offer, or an update to a previously sent SDP pranswer.
+        /// </summary>
+        pranswer,
+        /// <summary>
+        /// The format of the description is that of an SDP answer.
+        /// </summary>
+        answer,
+        /// <summary>
+        /// The format of the description is that of an SDP rollback.
+        /// </summary>
+        rollback,
+      };
+  
+      /// <summary>
+      /// Defines the session description's signalling mechanism.
+      /// </summary>
+      enum RTCSessionDescriptionSignalingType
+      {
+        /// <summary>
+        /// The format of the description is that of a JSON blob.
+        /// </summary>
+        json,
+        /// <summary>
+        /// The format of the description is that of an SDP offer.
+        /// </summary>
+        sdpOffer,
+        /// <summary>
+        /// The format of the description is that of an SDP pre-answer.
+        /// </summary>
+        sdpPranswer,
+        /// <summary>
+        /// The format of the description is that of an SDP answer.
+        /// </summary>
+        sdpAnswer,
+        /// <summary>
+        /// The format of the description is that of an SDP rollback.
+        /// </summary>
+        sdpRollback,
+      };
+
+      /// <summary>
+      /// Defines the session description's media type as described in
+      /// [RFC4566] Section 5.14 for the media line.
+      /// </summary>
+      /// <example>
+      /// <code>
+      /// m=audio 49170 RTP/AVP 0
+      /// m=video 51372 RTP/AVP 99
+      /// </code>
+      /// </example>
+      enum RTCSessionDescriptionMediaType
+      {
+        /// <summary>
+        /// This object represents an unknown media type.
+        /// </summary>
+        unknown,
+        /// <summary>
+        /// This object represents an audio media type.
+        /// </summary>
+        audio,
+        /// <summary>
+        /// This object represents a video media type.
+        /// </summary>
+        video,
+        /// <summary>
+        /// This object represents a text media type.
+        /// </summary>
+        text,
+        /// <summary>
+        /// This object represents an application media type.
+        /// </summary>
+        application,
+      };
+
+      /// <summary>
+      /// Defines the session description direction in which media is flowing.
+      /// </summary>
+      /// <example>
+      /// <code>
+      /// a=sendrecv
+      /// a=sendonly
+      /// a=recvonly
+      /// a=inactive
+      /// </code>
+      /// </example>
+      enum RTCSessionDescriptionMediaDirection
+      {
+        /// <summary>
+        /// As defined in [RFC4566], media should be started in send and
+        /// receive mode.
+        /// </summary>
+        sendReceive,
+        /// <summary>
+        /// As defined in [RFC4566], media should be started in send-only mode.
+        /// </summary>
+        sendOnly,
+        /// <summary>
+        /// As defined in [RFC4566], media should be started in receive-only
+        /// mode.
+        /// </summary>
+        receiveOnly,
+        /// <summary>
+        /// As defined in [RFC4566], media should be started in inactive mode.
+        /// </summary>
+        inactive,
+      };
+
+      /// <summary>
+      /// As described in [draft-ietf-rtcweb-jsep] (section 4.1.1.), BUNDLE
+      /// policy affects which media tracks are negotiated if the remote
+      /// endpoint is not BUNDLE-aware, and what ICE candidates are gathered.
+      /// </summary>
+      enum RTCBundlePolicy
+      {
+        /// <summary>
+        /// Gather ICE candidates for each media type in use (audio, video,
+        /// and data). If the remote endpoint is not BUNDLE-aware, negotiate
+        /// only one audio and video track on separate transports.
+        /// </summary>
+        balanced,
+        /// <summary>
+        /// Gather ICE candidates for each track. If the remote endpoint is
+        /// not BUNDLE-aware, negotiate all media tracks on separate
+        /// transports.
+        /// </summary>
+        maxCompat,
+        /// <summary>
+        /// Gather ICE candidates for only one track. If the remote endpoint
+        /// is not BUNDLE-aware, negotiate only one media track.
+        /// </summary>
+        maxBundle,
+      };
+
+      /// <summary>
+      /// The RtcpMuxPolicy affects what ICE candidates are gathered to
+      /// support non-multiplexed RTCP.
+      /// </summary>
+      enum RTCRtcpMuxPolicy
+      {
+        /// <summary>
+        /// Gather ICE candidates for both RTP and RTCP candidates. If the
+        /// remote-endpoint is capable of multiplexing RTCP, multiplex RTCP on
+        /// the RTP candidates. If it is not, use both the RTP and RTCP
+        /// candidates separately.
+        /// </summary>
+        negotiated,
+        /// <summary>
+        /// Gather ICE candidates only for RTP and multiplex RTCP on the RTP
+        /// candidates. If the remote endpoint is not capable of rtcp-mux,
+        /// session negotiation will fail.
+        /// </summary>
+        require,
+      };
+
+      /// <summary>
+      /// The RTCPeerConnectionSignalingMode defines the signaling type to be
+      /// used with signaling modes.
+      /// </summary>
+      enum RTCPeerConnectionSignalingMode
+      {
+        /// <summary>
+        /// Use JSON capabilities exchange style signaling with the peer
+        /// connection.
+        /// </summary>
+        json,
+        /// <summary>
+        ///  Use SDP offer/answer exchange style signaling with the peer
+        /// connection.
+        /// </summary>
+        sdp,
+      };
+
+      /// <summary>
+      /// The RTCSignalingState describes the current state of an offer / 
+      /// answer exchanged as it relates to the SDP negotiation process. WHen
+      /// JSON style signaling is used the state is always Stable.
+      /// </summary>
+      enum RTCSignalingState
+      {
+        /// <summary>
+        /// There is no offer­answer exchange in progress. This is also the
+        /// initial state in which case the local and remote descriptions are
+        /// empty.
+        /// </summary>
+        stable,
+        /// <summary>
+        /// A local description, of type "offer", has been successfully
+        /// applied.
+        /// </summary>
+        haveLocalOffer,
+        /// <summary>
+        /// A remote description, of type "offer", has been successfully
+        /// applied.
+        /// </summary>
+        haveRemoteOffer,
+        /// <summary>
+        /// A remote description of type "offer" has been successfully
+        /// applied and a local description of type "pranswer" has been
+        /// successfully applied.
+        /// </summary>
+        haveLocalPranswer,
+        /// <summary>
+        /// A local description of type "offer" has been successfully applied
+        /// and a remote description of type "pranswer" has been successfully
+        /// applied.
+        /// </summary>
+        haveRemotePranswer,
+        /// <summary>
+        /// The connection is closed.
+        /// </summary>
+        closed,
+      };
+
+      /// <summary>
+      /// The RTCIceConnectionState indicates the combined state of all the
+      /// RTCIceTransport objects states.
+      /// </summary>
+      enum RTCIceConnectionState
+      {
+        /// <summary>
+        /// The ICE Agent is gathering addresses and/or waiting for remote
+        /// candidates to be supplied.
+        /// </summary>
+        new,
+        /// <summary>
+        /// The ICE Agent has received remote candidates on at least one
+        /// component, and is checking candidate pairs but has not yet found a
+        /// connection. In addition to checking, it may also still be
+        /// gathering.
+        /// </summary>
+        checking,
+        /// <summary>
+        /// The ICE Agent has found a usable connection for all components but
+        /// is still checking other candidate pairs to see if there is a
+        /// better connection. It may also still be gathering.
+        /// </summary>
+        connected,
+        /// <summary>
+        /// The ICE Agent has finished gathering and checking and found a
+        /// connection for all components. Details on how the completed state
+        /// in ICE is reached are covered in [RFC5245].
+        /// </summary>
+        completed,
+        /// <summary>
+        /// Liveness checks have failed for one or more components. This is
+        /// more aggressive than failed, and may trigger intermittently (and
+        /// resolve itself without action) on a flaky network.
+        /// </summary>
+        disconnected,
+        /// <summary>
+        /// The ICE Agent is finished checking all candidate pairs and failed
+        /// to find a connection for at least one component. Connections may
+        /// have been found for some components.
+        /// </summary>
+        failed,
+        /// <summary>
+        /// The ICE Agent has shut down and is no longer responding to STUN
+        /// requests.
+        /// </summary>
+        closed,
+      };
+
+      /// <summary>
+      /// The RTCPeerConnectionState indicates the combined state of all the
+      /// RTCIceTransport and RTCDtlsTransport objects states.
+      /// </summary>
+      enum RTCPeerConnectionState
+      {
+        /// <summary>
+        /// Any of the RTCIceTransports or RTCDtlsTransports are in the new
+        /// state and none of the transports are in the connecting, checking,
+        /// failed or disconnected state, or all transports are in the closed
+        /// state.
+        /// </summary>
+        new,
+        /// <summary>
+        /// Any of the RTCIceTransports or RTCDtlsTransports are in the
+        /// connecting or checking state and none of them is in the failed
+        /// state.
+        /// </summary>
+        connecting,
+        /// <summary>
+        /// All RTCIceTransports and RTCDtlsTransports are in the connected,
+        /// completed or closed state and at least of them is in the connected
+        /// or completed state.
+        /// </summary>
+        connected,
+        /// <summary>
+        /// Any of the RTCIceTransports or RTCDtlsTransports are in the
+        /// disconnected state and none of them are in the failed or
+        /// connecting or checking state.
+        /// </summary>
+        disconnected,
+        /// <summary>
+        /// Any of the RTCIceTransports or RTCDtlsTransports are in a failed
+        /// state.
+        /// </summary>
+        failed,
+        /// <summary>
+        /// The RTCPeerConnection object's IsClosed slot is true.
+        /// </summary>
+        closed,
+      };
+
+    }
+
+  }
+}
diff --git a/ortc/idl/config.json b/ortc/idl/config.json
new file mode 100644
index 00000000..c5b73ca6
--- /dev/null
+++ b/ortc/idl/config.json
@@ -0,0 +1,57 @@
+{
+  "project": {
+    "name": "ortc",
+    "aliases": {
+      "alias": [
+        {
+          "in": "bogus_ortc_test_alias",
+          "out": "bogus"
+        }
+      ]
+    },
+    "exclusives": {
+      "exclusive": [
+        "xplatform"
+      ]
+    },
+    "includes": {
+      "include": [
+        "../../../zsLib/zsLib/idl/config.json"
+      ]
+    },
+    "sources": {
+      "source": [
+        "Ortc.idl",
+        "Logger.idl",
+        "Settings.idl",
+        "error.idl",
+        "enums.idl",
+        "Capabilities.idl",
+        "Certificate.idl",
+        "Constraints.idl",
+        "StatsReport.idl",
+        "StatsProvider.idl",
+        "DataChannel.idl",
+        "IceTypes.idl",
+        "IceGatherer.idl",
+        "IceTransport.idl",
+        "IceTransportController.idl",
+        "DtlsTransport.idl",
+        "Identity.idl",
+        "MediaStreamTrack.idl",
+        "MediaDevices.idl",
+        "RtpTypes.idl",
+        "RtpListener.idl",
+        "RtpReceiver.idl",
+        "RtpSender.idl",
+        "DtmfSender.idl",
+        "SctpTransport.idl",
+        "SrtpSdesTransport.idl",
+        "adapter/enums.idl",
+        "adapter/SessionDescription.idl",
+        "adapter/MediaStream.idl",
+        "adapter/PeerConnection.idl"
+      ]
+    }
+  }
+}
diff --git a/ortc/idl/enums.idl b/ortc/idl/enums.idl
new file mode 100644
index 00000000..8c19740b
--- /dev/null
+++ b/ortc/idl/enums.idl
@@ -0,0 +1,825 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// RTCDataChannelState represents the state of the RTCDataChannel object. 
+    /// </summary>
+    enum RTCDataChannelState
+    {
+      /// <summary>
+      /// The user agent is attempting to establish the underlying data
+      /// transport. This is the initial state of an RTCDataChannel object.
+      /// </summary>
+      connecting,
+      /// <summary>
+      /// The underlying data transport is established and communication is
+      /// possible. This is the initial state of an RTCDataChannel object
+      /// dispatched as a part of an RTCDataChannelEvent.
+      /// </summary>
+      open,
+      /// <summary>
+      /// The procedure to close down the underlying data transport has
+      /// started.
+      /// </summary>
+      closing,
+      /// <summary>
+      /// The underlying data transport has been closed or could not be
+      /// established.
+      /// </summary>
+      closed,
+    };
+
+    /// <summary>
+    /// RTCSctpTransportState indicates the state of the SCTP transport.
+    /// </summary>
+    enum RTCSctpTransportState
+    {
+      /// <summary>
+      /// The RTCSctpTransport object has been created and has not started
+      /// negotiating yet.
+      /// </summary>
+      new,
+      /// <summary>
+      /// SCTP is in the process of negotiating an association.
+      /// </summary>
+      connecting,
+      /// <summary>
+      /// SCTP has completed negotiation of an association.
+      /// </summary>
+      connected,
+      /// <summary>
+      /// The SCTP association has been closed intentionally via a call to
+      /// Stop() or receipt of a SHUTDOWN or ABORT chunk.
+      /// </summary>
+      closed,
+    };
+
+    /// <summary>
+    /// RTCIceRole contains the current role of the ICE transport.
+    /// </summary>
+    enum RTCIceRole
+    {
+      /// <summary>
+      /// The controlling state, defined in [RFC5245] Section 3.
+      /// </summary>
+      controlling,
+      /// <summary>
+      /// The controlled state, defined in [RFC5245] Section 3.
+      /// </summary>
+      controlled,
+    };
+
+    /// <summary>
+    /// RTCIceComponent contains the component-id of the RTCIceTransport,
+    /// which will be "RTP" unless RTP and RTCP are not multiplexed and the
+    /// RTCIceTransport object was returned by createAssociatedTransport().
+    /// </summary>
+    enum RTCIceComponent
+    {
+      /// <summary>
+      /// The RTP component ID, defined (as '1') in [RFC5245] Section 4.1.1.1.
+      /// Protocols multiplexed with RTP (e.g. SCTP data channel) share its
+      /// component ID.
+      /// </summary>
+      rtp = 1,
+      /// <summary>
+      /// The RTCP component ID, defined (as '2') in [RFC5245] Section
+      /// 4.1.1.1.
+      /// </summary>
+      rtcp = 2,
+    };
+
+    enum RTCIceProtocol
+    {
+      /// <summary>
+      /// A UDP candidate, as described in [RFC5245].
+      /// </summary>
+      udp,
+      /// <summary>
+      /// A TCP candidate, as described in [RFC5245].
+      /// </summary>
+      tcp,
+    };
+
+    /// <summary>
+    /// The RTCIceCandidateType includes the type of the ICE candidate.
+    /// </summary>
+    enum RTCIceCandidateType
+    {
+      /// <summary>
+      /// A host candidate, defined in [RFC5245] Section 3.
+      /// </summary>
+      host,
+      /// <summary>
+      /// A server reflexive candidate, defined in [RFC5245] Section 3.
+      /// </summary>
+      srflex,
+      /// <summary>
+      /// A peer reflexive candidate, defined in [RFC5245] Section 3.
+      /// </summary>
+      prflx,
+      /// <summary>
+      /// A relay candidate, defined in [RFC5245] Section 3.
+      /// </summary>
+      relay,
+    };
+
+    /// <summary>
+    /// The RTCIceTcpCandidateType includes the type of the ICE TCP candidate,
+    /// as described in [RFC6544]. 
+    /// </summary>
+    enum RTCIceTcpCandidateType
+    {
+      /// <summary>
+      /// An active TCP candidate is one for which the transport will attempt
+      /// to open an outbound connection but will not receive incoming
+      /// connection requests.
+      /// </summary>
+      active,
+      /// <summary>
+      /// A passive TCP candidate is one for which the transport will receive
+      /// incoming connection attempts but not attempt a connection.
+      /// </summary>
+      passive,
+      /// <summary>
+      /// An so candidate is one for which the transport will attempt to open
+      /// a connection simultaneously with its peer.
+      /// </summary>
+      so,
+    };
+
+    /// <summary>
+    /// RTCIceGathererState represents the current state of the ICE gatherer.
+    /// </summary>
+    enum RTCIceGathererState
+    {
+      /// <summary>
+      /// The object has been created but Gather() has not been called.
+      /// </summary>
+      new,
+      /// <summary>
+      /// Gather() has been called, and the RTCIceGatherer is in the process
+      /// of gathering candidates (which includes adding new candidates and
+      /// removing invalidated candidates).
+      /// </summary>
+      gathering,
+      /// <summary>
+      /// The RTCIceGatherer has completed gathering. Events such as adding,
+      /// updating or removing an interface, or adding, changing or removing a
+      /// TURN server will cause the state to go back to gathering before
+      /// re-entering "complete" once all candidate changes are finalized.
+      /// </summary>
+      complete,
+      /// <summary>
+      /// The RTCIceGatherer has been closed intentionally (by calling
+      /// Close()) or as the result of an error.
+      /// </summary>
+      closed,
+    };
+
+    /// <summary>
+    /// RTCIceGatherFilterPolicy represents the detailed gatherer filter
+    /// options to restrict ICE candidate discovery.
+    /// </summary>
+    enum RTCIceGatherFilterPolicy : uint64
+    {
+      /// <summary>
+      /// No gatherer filtering is required.
+      /// </summary>
+      none = 0,
+      /// <summary>
+      /// Filter all IPv4 host candidates.
+      /// </summary>
+      noIPv4Host = 0x00000001,
+      /// <summary>
+      /// Filter all IPv4 server reflexive candidates.
+      /// </summary>
+      noIPv4Srflx = 0x00000002,
+      /// <summary>
+      /// Filter all IPv4 peer reflexive candidates.
+      /// </summary>
+      noIPv4Prflx = 0x00000004,
+      /// <summary>
+      /// Filter all IPv4 relay candidates.
+      /// </summary>
+      noIPv4Relay = 0x00000008,
+      /// <summary>
+      /// Filter all IPv4 private candidates.
+      /// See: https://en.wikipedia.org/wiki/Private_network
+      /// </summary>
+      noIPv4Private = 0x00000010,
+      /// <summary>
+      /// Filter all IPv4 candidates.
+      /// </summary>
+      noIPv4 = 0x000000FF,
+      /// <summary>
+      /// Filter all IPv6 host candidates.
+      /// </summary>
+      noIPv6Host = 0x00000100,
+      /// <summary>
+      /// Filter all IPv6 server reflexive candidates.
+      /// </summary>
+      noIPv6Srflx = 0x00000200,
+      /// <summary>
+      /// Filter all IPv6 peer reflexive candidates.
+      /// </summary>
+      noIPv6Prflx = 0x00000400,
+      /// <summary>
+      /// Filter all IPv6 relay candidates.
+      /// </summary>
+      noIPv6Relay = 0x00000800,
+      /// <summary>
+      /// Filter all IPv6 private candidates.
+      /// See: https://en.wikipedia.org/wiki/Private_network
+      /// </summary>
+      noIPv6Private = 0x00001000,
+      /// <summary>
+      /// Filter all IPv6 Teredo tunnel or other tunneled candidates.
+      /// </summary>
+      noIPv6Tunnel = 0x00002000,
+      /// <summary>
+      /// Filter all IPv6 permanent candidates.
+      /// </summary>
+      noIPv6Permanent = 0x00004000,
+      /// <summary>
+      /// Filter all IPv6 candidates.
+      /// </summary>
+      noIPv6 = 0x0000FF00,
+      /// <summary>
+      /// Filter all host candidates.
+      /// </summary>
+      noHost = 0x00000101,
+      /// <summary>
+      /// Filter all server reflexive candidates.
+      /// </summary>
+      noSrflx = 0x00000202,
+      /// <summary>
+      /// Filter all server peer reflexive candidates.
+      /// </summary>
+      noPrflx = 0x00000404,
+      /// <summary>
+      /// Filter all relay candidates.
+      /// </summary>
+      noRelay = 0x00000808,
+      /// <summary>
+      /// Filter all private candidates.
+      /// See: https://en.wikipedia.org/wiki/Private_network
+      /// </summary>
+      noPrivate = 0x00001000,
+      /// <summary>
+      /// Filter all but relay candidates.
+      /// </summary>
+      relayOnly = 0x00001707,
+      /// <summary>
+      /// Filter all candidates.
+      /// </summary>
+      noCandidates = 0x7FFFFFFF,
+    };
+
+    /// <summary>
+    /// Use the string form of these enums with the RTCIceInterfacePolicy
+    /// Interface type variable to specify per interface type policies.
+    /// </summary>
+    enum RTCIceGatherInterfaceType
+    {
+      /// <summary>
+      /// Applies to all unknown interface types.
+      /// </summary>
+      Unknown,
+      /// <summary>
+      /// Applies to all interface types where there is no specific interface
+      /// type policy was specified.
+      /// </summary>
+      Default,
+      /// <summary>
+      /// Applies to all Local Area Network interface types.
+      /// </summary>
+      Lan,
+      /// <summary>
+      /// Applies to all Tunnel interface types.
+      /// </summary>
+      Tunnel,
+      /// <summary>
+      /// Applies to all Wireless Local Area Network interface types.
+      /// </summary>
+      Wlan,
+      /// <summary>
+      /// Applies to all Wireless Wide Area Network interface types.
+      /// </summary>
+      Wwan,
+      /// <summary>
+      /// Applies to all Virtual Private Network interface types.
+      /// </summary>
+      Vpn
+    };
+
+    /// <summary>
+    /// RTCIceCredentialType represents the type of credential used by a TURN
+    /// server.
+    /// </summary>
+    enum RTCIceCredentialType
+    {
+      /// <summary>
+      /// The credential is a long-term authentication password.
+      /// </summary>
+      password,
+      /// <summary>
+      /// The credential is an access token.
+      /// </summary>
+      token,
+    };
+
+    /// <summary>
+    /// RTCIceTransportState represents the current state of the ICE
+    /// transport.
+    /// </summary>
+    enum RTCIceTransportState
+    {
+      /// <summary>
+      /// The RTCIceTransport object is waiting for remote candidates to be
+      /// supplied. In this state the object can respond to incoming
+      /// connectivity checks.
+      /// </summary>
+      new,
+      /// <summary>
+      /// The RTCIceTransport has received at least one remote candidate, and
+      /// a local and remote RTCIceCandidateComplete dictionary was not added
+      /// as the last candidate. In this state the RTCIceTransport is checking
+      /// candidate pairs but has not yet found a successful candidate pair,
+      /// or consent checks [RFC7675] have failed on a previously successful
+      /// candidate pair.
+      /// </summary>
+      checking,
+      /// <summary>
+      /// The RTCIceTransport has received a response to an outgoing
+      /// connectivity check, or has received incoming DTLS/media after a
+      /// successful response to an incoming connectivity check, but is still
+      /// checking other candidate pairs to see if there is a better
+      /// connection. In this state outgoing media is permitted.
+      /// </summary>
+      connected,
+      /// <summary>
+      /// A local and remote RTCIceCandidateComplete dictionary was added as
+      /// the last candidate to the RTCIceTransport and all appropriate
+      /// candidate pairs have been tested and at least one functioning
+      /// candidate pair has been found.
+      /// </summary>
+      completed,
+      /// <summary>
+      /// The RTCIceTransport has received at least one local and remote
+      /// candidate, and a local and remote RTCIceCandidateComplete dictionary
+      /// was not added as the last candidate, but all appropriate candidate
+      /// pairs thus far have been tested and failed (or consent checks
+      /// [RFC7675] once successful, have now failed). Other candidate pairs
+      /// may become available for testing as new candidates are trickled, and
+      /// therefore the "failed" state has not been reached.
+      /// </summary>
+      disconnected,
+      /// <summary>
+      /// A local and remote RTCIceCandidateComplete dictionary was added as
+      /// the last candidate to the RTCIceTransport and all appropriate
+      /// candidate pairs have been tested and failed.
+      /// </summary>
+      failed,
+      /// <summary>
+      /// The RTCIceTransport has shut down and is no longer responding to
+      /// STUN requests.
+      /// </summary>
+      closed,
+    };
+
+    /// <summary>
+    /// RTCDtlsTransportState indicates the state of the DTLS transport.
+    /// </summary>
+    enum RTCDtlsTransportState
+    {
+      /// <summary>
+      /// The RTCDtlsTransport object has been created and has not started
+      /// negotiating yet.
+      /// </summary>
+      new,
+      /// <summary>
+      /// DTLS is in the process of negotiating a secure connection and
+      /// verifying the remote fingerprint. Once a secure connection is
+      /// negotiated (but prior to verification of the remote fingerprint,
+      /// enabled by calling start()), incoming data can flow through (and
+      /// media, once DTLS-SRTP key derivation is completed).
+      /// </summary>
+      connecting,
+      /// <summary>
+      /// DTLS has completed negotiation of a secure connection but the
+      /// fingerprint has not been verified.
+      /// </summary>
+      connected,
+      /// <summary>
+      /// The DTLS connection has been closed intentionally via a call to
+      /// Stop() or receipt of a close_notify alert. Calling transport.Stop()
+      /// will also result in a transition to the "closed" state.
+      /// </summary>
+      closed,
+      /// <summary>
+      /// The DTLS connection has been closed as the result of an error
+      /// (such as receipt of an error alert or a failure to validate the
+      /// remote fingerprint).
+      /// </summary>
+      failed,
+    };
+
+    /// <summary>
+    /// RTCDtlsRole indicates the role of the DTLS transport.
+    /// </summary>
+    enum RTCDtlsRole
+    {
+      /// <summary>
+      /// The DTLS role is determined based on the resolved ICE role: the
+      /// "Controlled" role acts as the DTLS client, the "Controlling" role
+      /// acts as the DTLS server. Since RTCDtlsRole is initialized to "Auto"
+      /// on construction of an RTCDtlsTransport object,
+      /// transport.GetLocalParameters().RTCDtlsRole will have an initial
+      /// value of "Auto".
+      /// </summary>
+      auto,
+      /// <summary>
+      /// The DTLS client role. A transition to "Client" will occur if
+      /// Start(remoteParameters) is called with remoteParameters.RTCDtlsRole
+      /// having a value of "Server". If RTCDtlsRole had previously had a
+      /// value of "Server" (e.g. due to the RTCDtlsTransport having
+      /// previously received packets from a DTLS client), then the DTLS
+      /// session is reset prior to transitioning to the "client" role.
+      /// </summary>
+      client,
+      /// <summary>
+      /// The DTLS server role. If RTCDtlsRole has a value of "Auto" and the
+      /// RTCDtlsTransport receives a DTLS client_hello packet, RTCDtlsRole
+      /// will transition to "Server", even before start() is called. A
+      /// transition from "Auto" to "Server" will also occur if
+      /// Start(remoteParameters) is called with remoteParameters.RTCDtlsRole
+      /// having a value of "Client".
+      /// </summary>
+      server,
+    };
+
+    /// <summary>
+    /// RTCStatsType object is initialized to the name of the dictionary that
+    /// the RTCStats represents.
+    /// </summary>
+    enum RTCStatsType
+    {
+      /// <summary>
+      /// Statistics for the inbound RTP stream that is currently received
+      /// with this RTCRtpReceiver object. It is accessed by the
+      /// RTCInboundRtpStreamStats.
+      /// </summary>
+      inboundRtp,
+      /// <summary>
+      /// Statistics for the outbound RTP stream that is currently sent with
+      /// this RTCRtpSender object. It is accessed by the
+      /// RTCOutboundRtpStreamStats.
+      /// </summary>
+      outboundRtp,
+      /// <summary>
+      /// Codec information for the RTCRtpReceiver or RTCRtpSender objects. It
+      /// is accessed by the RTCCodec.
+      /// </summary>
+      codec,
+      /// <summary>
+      /// Statistics for the RTCSctpTransport object. It is accessed by the
+      /// RTCSctpTransportStats.
+      /// </summary>
+      sctpTransport,
+      /// <summary>
+      /// Statistics for the RTCDataChannel object. It is accessed by the
+      /// RTCDataChannelStats.
+      /// </summary>
+      dataChannel,
+      /// <summary>
+      /// Statistics for the RTCMediaStream object. It is accessed by the
+      /// RTCMediaStreamStats.
+      /// </summary>
+      stream,
+      /// <summary>
+      /// Statistics for the RTCMediaStreamTrack object. It is accessed by the
+      /// RTCMediaStreamTrackStats.
+      /// </summary>
+      track,
+      /// <summary>
+      /// Statistics for the RTCIceGatherer object. It is accessed by the
+      /// RTCIceGathererStats.
+      /// </summary>
+      iceGatherer,
+      /// <summary>
+      /// Statistics for the RTCIceTransport object. It is accessed by the
+      /// RTCIceTransportStats.
+      /// </summary>
+      iceTransport,
+      /// <summary>
+      /// Statistics for the RTCDtlsTransport object. It is accessed by the
+      /// RTCDtlsTransportStats.
+      /// </summary>
+      dtlsTransport,
+      /// <summary>
+      /// Statistics for the RTCSrtpTransport object. It is accessed by the
+      /// RTCSrtpTransportStats.
+      /// </summary>
+      srtpTransport,
+      /// <summary>
+      /// Statistics for the RTCCertificate object. It is accessed by the
+      /// RTCCertificateStats.
+      /// </summary>
+      certificate,
+      /// <summary>
+      /// Statistics for the RTCIceGatherer or RTCIceTransport object. It is
+      /// accessed by the RTCIceCandidateAttributes.
+      /// </summary>
+      candidate,
+      /// <summary>
+      /// Statistics for the RTCIceCandidate object from the RTCIceGatherer
+      /// object. It is accessed by the RTCIceCandidatePairStats.
+      /// </summary>
+      candidatePair,
+      /// <summary>
+      /// Statistics for the local RTCIceCandidate from the RTCIceTransport
+      /// object. It is accessed by the RTCIceCandidateAttributes.
+      /// </summary>
+      localCandidate,
+      /// <summary>
+      /// Statistics for the remote RTCIceCandidate from the RTCIceTransport
+      /// object. It is accessed by the RTCIceCandidateAttributes.
+      /// </summary>
+      remoteCandidate,
+    };
+
+    /// <summary>
+    /// Canadidate pair state is defined in Section 5.7.4 of [RFC5245].
+    /// </summary>
+    enum RTCIceCandidatePairState
+    {
+      /// <summary>
+      /// Defined in Section 5.7.4 of [RFC5245].
+      /// </summary>
+      frozen,
+      /// <summary>
+      /// Defined in Section 5.7.4 of [RFC5245].
+      /// </summary>
+      waiting,
+      /// <summary>
+      /// Defined in Section 5.7.4 of [RFC5245].
+      /// </summary>
+      inProgress,
+      /// <summary>
+      /// Defined in Section 5.7.4 of [RFC5245].
+      /// </summary>
+      failed,
+      /// <summary>
+      /// Defined in Section 5.7.4 of [RFC5245].
+      /// </summary>
+      succeeded,
+      /// <summary>
+      /// Defined in Section 5.7.4 of [RFC5245].
+      /// </summary>
+      cancelled,
+    };
+
+    /// <summary>
+    /// The kind attribute must represent either an audio or video track.
+    /// </summary>
+    enum MediaStreamTrackKind
+    {
+      /// <summary>
+      /// This object represents an audio track.
+      /// </summary>
+      audio,
+      /// <summary>
+      /// This object represents an video track.
+      /// </summary>
+      video
+    };
+
+    /// <summary>
+    /// The state attribute represents the state of the track. 
+    /// </summary>
+    enum MediaStreamTrackState
+    {
+      /// <summary>
+      /// The track is active (the track's underlying media source is making a
+      /// best-effort attempt to provide data in real time).
+      ///
+      /// The output of a track in the live state can be switched on and off
+      /// with the enabled attribute.
+      /// </summary>
+      live,
+      /// <summary>
+      /// The track has ended (the track's underlying media source is no longer
+      /// providing data, and will never provide more data for this track).
+      /// Once a track enters this state, it never exits it.
+      ///
+      /// For example, a video track ends when the user unplugs the USB web
+      /// camera that acts as the track's media source.
+      /// </summary>
+      ended,
+    };
+
+    /// <summary>
+    /// Facing mode enum (as string) to be used in facing mode of the media stream track settings.
+    /// </summary>
+    enum VideoFacingMode
+    {
+      /// <summary>
+      /// The source is facing toward the user (a self-view camera).
+      /// </summary>
+      user,
+      /// <summary>
+      /// The source is facing away from the user (viewing the environment).
+      /// </summary>
+      environment,
+      /// <summary>
+      /// The source is facing to the left of the user.
+      /// </summary>
+      left,
+      /// <summary>
+      /// The source is facing to the right of the user.
+      /// </summary>
+      right,
+    };
+
+    /// <summary>
+    /// The type of the source of the MediaStreamTrack.
+    /// </summary>
+    enum SourceType
+    {
+      /// <summary>
+      /// A valid source type only for video MediaStreamTrack s. The source is
+      /// a local video-producing camera source.
+      /// </summary>
+      Camera,
+      /// <summary>
+      /// A valid source type only for audio MediaStreamTrack s. The source is
+      /// a local audio-producing microphone source.
+      /// </summary>
+      Microphone,
+    };
+
+    /// <summary>
+    /// Describes the kind of the represented device.
+    /// </summary>
+    enum MediaDeviceKind
+    {
+      /// <summary>
+      /// Represents an audio input device; for example a microphone.
+      /// </summary>
+      audioInput,
+      /// <summary>
+      /// Represents an audio output device; for example a pair of headphones.
+      /// </summary>
+      audioOutput,
+      /// <summary>
+      /// Represents a video input device; for example a webcam.
+      /// </summary>
+      videoInput,
+    };
+
+
+    /// <summary>
+    /// RTCRtpDegradationPreference can be used to indicate the desired choice
+    /// between degrading resolution and degrading framerate when bandwidth is
+    /// constrained.
+    /// </summary>
+    enum RTCRtpDegradationPreference
+    {
+      /// <summary>
+      /// Degrade resolution in order to maintain framerate.
+      /// </summary>
+      maintainFramerate,
+      /// <summary>
+      /// Degrade framerate in order to maintain resolution.
+      /// </summary>
+      maintainResolution,
+      /// <summary>
+      /// Degrade a balance of framerate and resolution.
+      /// </summary>
+      balanced,
+    };
+
+    /// <summary>
+    /// RTCPriorityType can be used to indicate the relative priority of
+    /// various flows.
+    /// </summary>
+    enum RTCRtpPriorityType
+    {
+      /// <summary>
+      /// See [draft-ietf-rtcweb-transports], Section 4.
+      /// </summary>
+      veryLow,
+      /// <summary>
+      /// See [draft-ietf-rtcweb-transports], Section 4.
+      /// </summary>
+      low,
+      /// <summary>
+      /// See [draft-ietf-rtcweb-transports], Section 4.
+      /// </summary>
+      medium,
+      /// <summary>
+      /// See [draft-ietf-rtcweb-transports], Section 4.
+      /// </summary>
+      high,
+    };
+
+    /// <summary>
+    /// Configures the type of signal being encoded.
+    /// </summary>
+    enum RTCRtpOpusCodecCapabilityOptionsSignal
+    {
+      /// <summary>
+      /// (default)
+      /// </summary>
+      auto,
+      /// <summary>
+      /// Bias thresholds towards choosing MDCT modes.
+      /// </summary>
+      music,
+      /// <summary>
+      /// Bias thresholds towards choosing LPC or Hybrid modes.
+      /// </summary>
+      voice,
+    };
+
+
+    /// <summary>
+    /// Opus coding mode.
+    /// </summary>
+    enum RTCRtpOpusCodecCapabilityOptionsApplication
+    {
+      /// <summary>
+      /// Gives best quality at a given bitrate for voice signals.
+      /// </summary>
+      voip,
+      /// <summary>
+      /// Gives best quality at a given bitrate for most non-voice signals
+      /// like music. 
+      /// </summary>
+      audio,
+      /// <summary>
+      /// Configures low-delay mode that disables the speech-optimized mode in
+      /// exchange for slightly reduced delay. 
+      /// </summary>
+      lowDelay,
+    };
+
+    /// <summary>
+    /// The type of protection for FlexFEC. See https://tools.ietf.org/html/draft-ietf-payload-flexible-fec-scheme-03
+    /// for more details.
+    /// </summary>
+    enum RTCRtpFlexFecCodecCapabilityParametersToP
+    {
+      /// <summary>
+      /// 1-D interleaved FEC protection.
+      /// </summary>
+      n1DInterleavedFEC = 0,
+      /// <summary>
+      /// 1 for 1-D non-interleaved FEC protection.
+      /// </summary>
+      n1DNonInterleavedFEC = 1,
+      /// <summary>
+      /// 2 for 2-D parity FEC protection.
+      /// </summary>
+      n2DParityFEEC = 2,
+      /// <summary>
+      ///  The value of 3 is reserved for future use.
+      /// </summary>
+      reserved = 3,
+    };
+
+  }
+}
diff --git a/ortc/idl/error.idl b/ortc/idl/error.idl
new file mode 100644
index 00000000..b93c14b0
--- /dev/null
+++ b/ortc/idl/error.idl
@@ -0,0 +1,74 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+namespace org
+{
+  namespace ortc
+  {
+    /// <summary>
+    /// This object represents generic error information.
+    /// </summary>
+    [dictionary]
+    struct Error
+    {
+      /// <summary>
+      /// Gets or sets a string representing the error code (see HTTP
+      /// status codes).
+      /// </summary>
+      uint16 errorCode;
+      /// <summary>
+      /// Gets or sets a string representing one of the error typename.
+      /// </summary>
+      string name;
+      /// <summary>
+      /// Gets or sets a string representing one of the error reason.
+      /// </summary>
+      string reason;
+    };
+
+    typedef zs::PromiseRejectionReason<Error> PromiseRejectionReason;
+
+    /// <summary>
+    /// This object represents the error event for event delegates.
+    /// </summary>
+    interface ErrorEvent
+    {
+      [constructor, delete]
+      void ErrorEvent();
+
+      /// <summary>
+      /// Gets the error information associated with this event (if any).
+      /// </summary>
+      [getter]
+      Error error;
+    };
+  }
+}
diff --git a/ortc/idl/sources.gni b/ortc/idl/sources.gni
new file mode 100644
index 00000000..a910b5fa
--- /dev/null
+++ b/ortc/idl/sources.gni
@@ -0,0 +1,318 @@
+ortc_sources_cxx_glue = [
+"ortc/idl/wrapper/impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainLong.h",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainString.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCInboundRtpStreamStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpReceiver.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCMessageEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraintSet.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainBoolean.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsFingerprint.h",
+ "ortc/idl/wrapper/impl_org_ortc_DoubleRange.h",
+ "ortc/idl/wrapper/impl_org_ortc_Dispatcher.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_OrtcLibWithDispatcher.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferOptions.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransport.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapability.h",
+ "ortc/idl/wrapper/impl_org_ortc_MessageQueue.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtcpFeedback.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceTransport.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCMessageEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataChannel.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_LongRange.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtcpParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePair.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceTransportController.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStateChangeEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtcpParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCCapabilityOptions.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateAttributes.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpUnhandledEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnection.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpStreamStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCCodec.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCConfiguration.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataChannelParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceTransportController.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraints.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtension.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStateChangeEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaStreamTrack.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceServer.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecParameterSettings.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpTransport.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairChangeEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpRedCodecParameterSettings.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferAnswerOptions.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCStatsTypeSet.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceServer.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGatherInterfacePolicy.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtcpTransport.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaDevices.h",
+ "ortc/idl/wrapper/impl_org_ortc_LongRange.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidate.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpContributingSource.h",
+ "ortc/idl/wrapper/impl_org_ortc_ErrorEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_MessageQueue.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsFingerprint.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpFecParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransport.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainBoolean.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListener.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnection.h",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainLongRange.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGatherOptions.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesKeyParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecParameterSettings.h",
+ "ortc/idl/wrapper/impl_org_ortc_MediaDeviceInfo.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIdentity.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpListener.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCAnswerOptions.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferOptions.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityOptions.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_MediaStream.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGatherer.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtensionParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_Helper.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpSender.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsCertificateBinary.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCTrackEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCCertificateStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCStatsProvider.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpCapabilities.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceTransport.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateComplete.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCStatsProvider.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpUnhandledEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtcpFeedback.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesCryptoParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCTrackEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainDoubleRange.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpStreamStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_StringOrStringList.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGatherOptions.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCInboundRtpStreamStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainString.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameterSettings.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtcpTransport.h",
+ "ortc/idl/wrapper/impl_org_ortc_MediaDevices.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsCertificateBinary.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaStreamConstraints.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCCapabilityOptions.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_Settings.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecParameterSettings.h",
+ "ortc/idl/wrapper/impl_org_ortc_Json.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListenerEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListener.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpTransport.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCStatsReport.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataTransport.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaControl.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStateChangeEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGatherInterfacePolicy.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidate.h",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainBooleanParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_MediaStream.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaStreamTrack.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_Error.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaDeviceInfo.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescription.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCapabilities.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaTrackSettings.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaTrackSettings.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIdentityError.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataChannelEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStateChangeEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtmfToneChangeEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateComplete.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStateChangeEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaControl.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpReceiver.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGatherer.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaTrackSupportedConstraints.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransport.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpFecParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_MediaTrackCapabilities.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainDoubleRange.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_Logger.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIdentityResult.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaStreamConstraints.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCIceCandidate.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCIceCandidate.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCStatsTypeSet.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpCapabilities.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_Error.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCCertificate.h",
+ "ortc/idl/wrapper/impl_org_ortc_OverconstrainedError.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainBooleanParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainDouble.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpContributingSource.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCapabilities.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainStringParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_OverconstrainedError.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesKeyParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpTransport.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCAnswerOptions.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidate.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_Logger.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataTransport.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCCertificateStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_Json.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCCertificate.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStateChangeEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataChannelParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpTransportStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIdentityAssertion.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamTrackStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataChannelEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransport.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCStatsReport.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSsrcConflictEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaSource.h",
+ "ortc/idl/wrapper/impl_org_ortc_Helper.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainLong.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtmfSender.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainStringParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtmfSender.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIdentityAssertion.h",
+ "ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraints.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateAttributes.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransport.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePair.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceTransportOptions.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtmfToneChangeEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamTrackStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_MediaSource.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCOutboundRtpStreamStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtension.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStateChangeEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainDouble.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_OrtcLib.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecParameterSettings.h",
+ "ortc/idl/wrapper/impl_org_ortc_StringOrStringList.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_OrtcLib.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceTransportOptions.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListenerEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpEncodingParameters.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSrtpTransportStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpListener.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_ErrorEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescription.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCOutboundRtpStreamStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpTransport.h",
+ "ortc/idl/wrapper/impl_org_ortc_DoubleRange.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDataChannel.h",
+ "ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraintSet.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIdentityError.h",
+ "ortc/idl/wrapper/impl_org_ortc_MediaTrackCapabilities.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceCandidate.h",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCConfiguration.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapability.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCStats.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameterSettings.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpSender.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererIceErrorEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescription.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStateChangeEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCCodec.h",
+ "ortc/idl/wrapper/impl_org_ortc_OverconstrainedErrorEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_Settings.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpEncodingParameters.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_MediaTrackSupportedConstraints.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h",
+ "ortc/idl/wrapper/types.h",
+ "ortc/idl/wrapper/impl_org_ortc_OverconstrainedErrorEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererIceErrorEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStats.h",
+ "ortc/idl/wrapper/impl_org_ortc_ConstrainLongRange.cpp",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIdentity.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCSsrcConflictEvent.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCIdentityResult.h",
+ "ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h",
+]
\ No newline at end of file
diff --git a/ortc/idl/winuwp.json b/ortc/idl/winuwp.json
new file mode 100644
index 00000000..1c69fbf2
--- /dev/null
+++ b/ortc/idl/winuwp.json
@@ -0,0 +1,9 @@
+{
+  "project": {
+    "exclusives": {
+      "exclusive": [
+        "WINUWP"
+      ]
+    }
+  }
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc.cpp b/ortc/idl/wrapper/impl_org_ortc.cpp
new file mode 100644
index 00000000..251b0176
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc.cpp
@@ -0,0 +1,5 @@
+
+#include <zsLib/Log.h>
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_wrapper); } } } }
+namespace wrapper { namespace impl { namespace org { namespace ortc { namespace adapter { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_wrapper_adapter); } } } } }
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainBoolean.cpp b/ortc/idl/wrapper/impl_org_ortc_ConstrainBoolean.cpp
new file mode 100644
index 00000000..b575a546
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainBoolean.cpp
@@ -0,0 +1,116 @@
+
+#include "impl_org_ortc_ConstrainBoolean.h"
+#include "impl_org_ortc_ConstrainBooleanParameters.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainBoolean::ConstrainBoolean()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ConstrainBooleanPtr wrapper::org::ortc::ConstrainBoolean::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainBoolean>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainBoolean::~ConstrainBoolean()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainBoolean::wrapper_init_org_ortc_ConstrainBoolean()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainBoolean::wrapper_init_org_ortc_ConstrainBoolean(wrapper::org::ortc::ConstrainBooleanPtr source)
+{
+  if (!source) return;
+
+  wrapper::org::ortc::ConstrainBooleanPtr pThis = thisWeak_.lock();
+  (*pThis) = (*source);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainBoolean::wrapper_init_org_ortc_ConstrainBoolean(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeConstrainBoolean>(Json::toNative(json));
+
+  wrapper::org::ortc::ConstrainBooleanPtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::ConstrainBooleanPtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::ConstrainBoolean::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("ConstrainBoolean"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::ConstrainBoolean::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainBooleanPtr wrapper::impl::org::ortc::ConstrainBoolean::toWrapper(NativeConstrainBooleanPtr native)
+{
+  if (!native) return ConstrainBooleanPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainBooleanPtr wrapper::impl::org::ortc::ConstrainBoolean::toWrapper(const NativeConstrainBoolean &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainBoolean>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->value = native.mValue;
+  if (native.mParameters.hasValue()) {
+    pThis->parameters = ConstrainBooleanParameters::toWrapper(native.mParameters.value());
+  }
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainBoolean::NativeConstrainBooleanPtr wrapper::impl::org::ortc::ConstrainBoolean::toNative(wrapper::org::ortc::ConstrainBooleanPtr wrapper)
+{
+  auto result = make_shared<NativeConstrainBoolean>();
+
+  result->mValue = wrapper->value;
+  if (wrapper->parameters.hasValue()) {
+    if (wrapper->parameters.value()) {
+      result->mParameters = *ConstrainBooleanParameters::toNative(wrapper->parameters.value());
+    }
+  }
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainBoolean.h b/ortc/idl/wrapper/impl_org_ortc_ConstrainBoolean.h
new file mode 100644
index 00000000..25fc9e45
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainBoolean.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_ConstrainBoolean.h"
+
+#include <ortc/IConstraints.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct ConstrainBoolean : public wrapper::org::ortc::ConstrainBoolean
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IConstraints::ConstrainBoolean, NativeConstrainBoolean);
+
+          ConstrainBooleanWeakPtr thisWeak_;
+
+          ConstrainBoolean();
+          virtual ~ConstrainBoolean();
+
+          // methods ConstrainBoolean
+          virtual void wrapper_init_org_ortc_ConstrainBoolean() override;
+          virtual void wrapper_init_org_ortc_ConstrainBoolean(wrapper::org::ortc::ConstrainBooleanPtr source) override;
+          virtual void wrapper_init_org_ortc_ConstrainBoolean(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static ConstrainBooleanPtr toWrapper(NativeConstrainBooleanPtr native);
+          static ConstrainBooleanPtr toWrapper(const NativeConstrainBoolean &native);
+          static NativeConstrainBooleanPtr toNative(wrapper::org::ortc::ConstrainBooleanPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainBooleanParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_ConstrainBooleanParameters.cpp
new file mode 100644
index 00000000..e8b2962f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainBooleanParameters.cpp
@@ -0,0 +1,110 @@
+
+#include "impl_org_ortc_ConstrainBooleanParameters.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainBooleanParameters::ConstrainBooleanParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ConstrainBooleanParametersPtr wrapper::org::ortc::ConstrainBooleanParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainBooleanParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainBooleanParameters::~ConstrainBooleanParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainBooleanParameters::wrapper_init_org_ortc_ConstrainBooleanParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainBooleanParameters::wrapper_init_org_ortc_ConstrainBooleanParameters(wrapper::org::ortc::ConstrainBooleanParametersPtr source)
+{
+  if (!source) return;
+  wrapper::org::ortc::ConstrainBooleanParametersPtr pThis = thisWeak_.lock();
+  (*pThis) = (*source);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainBooleanParameters::wrapper_init_org_ortc_ConstrainBooleanParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeConstrainBooleanParameters>(Json::toNative(json));
+
+  wrapper::org::ortc::ConstrainBooleanParametersPtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::ConstrainBooleanParametersPtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::ConstrainBooleanParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("ConstrainBooleanParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::ConstrainBooleanParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainBooleanParametersPtr wrapper::impl::org::ortc::ConstrainBooleanParameters::toWrapper(NativeConstrainBooleanParametersPtr native)
+{
+  if (!native) return ConstrainBooleanParametersPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainBooleanParametersPtr wrapper::impl::org::ortc::ConstrainBooleanParameters::toWrapper(const NativeConstrainBooleanParameters &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainBooleanParameters>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->exact = native.mExact;
+  pThis->ideal = native.mIdeal;
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainBooleanParameters::NativeConstrainBooleanParametersPtr wrapper::impl::org::ortc::ConstrainBooleanParameters::toNative(wrapper::org::ortc::ConstrainBooleanParametersPtr wrapper)
+{
+  if (!wrapper) return NativeConstrainBooleanParametersPtr();
+
+  auto result = make_shared<NativeConstrainBooleanParameters>();
+
+  result->mExact = wrapper->exact;
+  result->mIdeal = wrapper->ideal;
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainBooleanParameters.h b/ortc/idl/wrapper/impl_org_ortc_ConstrainBooleanParameters.h
new file mode 100644
index 00000000..44dd8a43
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainBooleanParameters.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_ConstrainBooleanParameters.h"
+
+#include <ortc/IConstraints.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct ConstrainBooleanParameters : public wrapper::org::ortc::ConstrainBooleanParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IConstraints::ConstrainBooleanParameters, NativeConstrainBooleanParameters);
+
+          ConstrainBooleanParametersWeakPtr thisWeak_;
+
+          ConstrainBooleanParameters();
+          virtual ~ConstrainBooleanParameters();
+
+          // methods ConstrainBooleanParameters
+          virtual void wrapper_init_org_ortc_ConstrainBooleanParameters() override;
+          virtual void wrapper_init_org_ortc_ConstrainBooleanParameters(wrapper::org::ortc::ConstrainBooleanParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_ConstrainBooleanParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static ConstrainBooleanParametersPtr toWrapper(NativeConstrainBooleanParametersPtr native);
+          static ConstrainBooleanParametersPtr toWrapper(const NativeConstrainBooleanParameters &native);
+          static NativeConstrainBooleanParametersPtr toNative(wrapper::org::ortc::ConstrainBooleanParametersPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainDouble.cpp b/ortc/idl/wrapper/impl_org_ortc_ConstrainDouble.cpp
new file mode 100644
index 00000000..703afa1e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainDouble.cpp
@@ -0,0 +1,120 @@
+
+#include "impl_org_ortc_ConstrainDouble.h"
+#include "impl_org_ortc_ConstrainDoubleRange.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainDouble::ConstrainDouble()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ConstrainDoublePtr wrapper::org::ortc::ConstrainDouble::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainDouble>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainDouble::~ConstrainDouble()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainDouble::wrapper_init_org_ortc_ConstrainDouble()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainDouble::wrapper_init_org_ortc_ConstrainDouble(wrapper::org::ortc::ConstrainDoublePtr source)
+{
+  if (!source) return;
+
+  wrapper::org::ortc::ConstrainDoublePtr pThis = thisWeak_.lock();
+  (*pThis) = (*source);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainDouble::wrapper_init_org_ortc_ConstrainDouble(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeConstrainDouble>(Json::toNative(json));
+  wrapper::org::ortc::ConstrainDoublePtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::ConstrainDoublePtr pThis = thisWeak_.lock();
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::ConstrainDouble::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("ConstrainDouble"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::ConstrainDouble::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainDoublePtr wrapper::impl::org::ortc::ConstrainDouble::toWrapper(NativeConstrainDoublePtr native)
+{
+  if (!native) return ConstrainDoublePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainDoublePtr wrapper::impl::org::ortc::ConstrainDouble::toWrapper(const NativeConstrainDouble &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainDouble>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->value = native.mValue;
+  if (native.mRange.hasValue()) {
+    pThis->range = ConstrainDoubleRange::toWrapper(native.mRange.value());
+  }
+
+  pThis->wrapper_init_org_ortc_ConstrainDouble();
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainDouble::NativeConstrainDoublePtr wrapper::impl::org::ortc::ConstrainDouble::toNative(wrapper::org::ortc::ConstrainDoublePtr wrapper)
+{
+  if (!wrapper) return NativeConstrainDoublePtr();
+
+  auto result = make_shared<NativeConstrainDouble>();
+  result->mValue = wrapper->value;
+  if (wrapper->range.hasValue()) {
+    auto native = ConstrainDoubleRange::toNative(wrapper->range.value());
+    if (native) {
+      result->mRange = *native;
+    }
+  }
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainDouble.h b/ortc/idl/wrapper/impl_org_ortc_ConstrainDouble.h
new file mode 100644
index 00000000..c4b567f6
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainDouble.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_ConstrainDouble.h"
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct ConstrainDouble : public wrapper::org::ortc::ConstrainDouble
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrackTypes::ConstrainDouble, NativeConstrainDouble);
+
+          ConstrainDoubleWeakPtr thisWeak_;
+
+          ConstrainDouble();
+          virtual ~ConstrainDouble();
+
+          // methods ConstrainDouble
+          virtual void wrapper_init_org_ortc_ConstrainDouble() override;
+          virtual void wrapper_init_org_ortc_ConstrainDouble(wrapper::org::ortc::ConstrainDoublePtr source) override;
+          virtual void wrapper_init_org_ortc_ConstrainDouble(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static ConstrainDoublePtr toWrapper(NativeConstrainDoublePtr native);
+          static ConstrainDoublePtr toWrapper(const NativeConstrainDouble &native);
+          static NativeConstrainDoublePtr toNative(wrapper::org::ortc::ConstrainDoublePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainDoubleRange.cpp b/ortc/idl/wrapper/impl_org_ortc_ConstrainDoubleRange.cpp
new file mode 100644
index 00000000..990c3441
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainDoubleRange.cpp
@@ -0,0 +1,117 @@
+
+#include "impl_org_ortc_ConstrainDoubleRange.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainDoubleRange::ConstrainDoubleRange()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ConstrainDoubleRangePtr wrapper::org::ortc::ConstrainDoubleRange::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainDoubleRange>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainDoubleRange::~ConstrainDoubleRange()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainDoubleRange::wrapper_init_org_ortc_ConstrainDoubleRange()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainDoubleRange::wrapper_init_org_ortc_ConstrainDoubleRange(wrapper::org::ortc::ConstrainDoubleRangePtr source)
+{
+  if (!source) return;
+
+  wrapper::org::ortc::ConstrainDoubleRangePtr pThis = thisWeak_.lock();
+  (*pThis) = (*source);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainDoubleRange::wrapper_init_org_ortc_ConstrainDoubleRange(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeConstrainDoubleRange>(Json::toNative(json));
+
+  wrapper::org::ortc::ConstrainDoubleRangePtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::ConstrainDoubleRangePtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::ConstrainDoubleRange::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("ConstrainDoubleRange"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::ConstrainDoubleRange::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainDoubleRangePtr  wrapper::impl::org::ortc::ConstrainDoubleRange::toWrapper(NativeConstrainDoubleRangePtr native)
+{
+  if (!native) return ConstrainDoubleRangePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainDoubleRangePtr  wrapper::impl::org::ortc::ConstrainDoubleRange::toWrapper(const NativeConstrainDoubleRange &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainDoubleRange>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->min = native.mMin;
+  pThis->max = native.mMax;
+  pThis->exact = native.mExact;
+  pThis->ideal = native.mIdeal;
+
+  pThis->wrapper_init_org_ortc_ConstrainDoubleRange();
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainDoubleRange::NativeConstrainDoubleRangePtr wrapper::impl::org::ortc::ConstrainDoubleRange::toNative(wrapper::org::ortc::ConstrainDoubleRangePtr wrapper)
+{
+  if (!wrapper) return NativeConstrainDoubleRangePtr();
+
+  auto native = make_shared<NativeConstrainDoubleRange>();
+  native->mMin = wrapper->min;
+  native->mMax = wrapper->max;
+  native->mExact = wrapper->exact;
+  native->mIdeal = wrapper->ideal;
+
+  return native;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainDoubleRange.h b/ortc/idl/wrapper/impl_org_ortc_ConstrainDoubleRange.h
new file mode 100644
index 00000000..a50a81ba
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainDoubleRange.h
@@ -0,0 +1,38 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_ConstrainDoubleRange.h"
+
+#include <ortc/IConstraints.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct ConstrainDoubleRange : public wrapper::org::ortc::ConstrainDoubleRange
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IConstraints::ConstrainDoubleRange, NativeConstrainDoubleRange);
+          ConstrainDoubleRangeWeakPtr thisWeak_;
+
+          ConstrainDoubleRange();
+          virtual ~ConstrainDoubleRange();
+
+          // methods ConstrainDoubleRange
+          virtual void wrapper_init_org_ortc_ConstrainDoubleRange() override;
+          virtual void wrapper_init_org_ortc_ConstrainDoubleRange(wrapper::org::ortc::ConstrainDoubleRangePtr source) override;
+          virtual void wrapper_init_org_ortc_ConstrainDoubleRange(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static ConstrainDoubleRangePtr toWrapper(NativeConstrainDoubleRangePtr native);
+          static ConstrainDoubleRangePtr toWrapper(const NativeConstrainDoubleRange &native);
+          static NativeConstrainDoubleRangePtr toNative(wrapper::org::ortc::ConstrainDoubleRangePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainLong.cpp b/ortc/idl/wrapper/impl_org_ortc_ConstrainLong.cpp
new file mode 100644
index 00000000..9667be77
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainLong.cpp
@@ -0,0 +1,118 @@
+
+#include "impl_org_ortc_ConstrainLong.h"
+#include "impl_org_ortc_ConstrainLongRange.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainLong::ConstrainLong()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ConstrainLongPtr wrapper::org::ortc::ConstrainLong::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainLong>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainLong::~ConstrainLong()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainLong::wrapper_init_org_ortc_ConstrainLong()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainLong::wrapper_init_org_ortc_ConstrainLong(wrapper::org::ortc::ConstrainLongPtr source)
+{
+  if (!source) return;
+
+  wrapper::org::ortc::ConstrainLongPtr pThis = thisWeak_.lock();
+  (*pThis) = (*source);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainLong::wrapper_init_org_ortc_ConstrainLong(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeConstrainLong>(Json::toNative(json));
+  wrapper::org::ortc::ConstrainLongPtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::ConstrainLongPtr pThis = thisWeak_.lock();
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::ConstrainLong::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("ConstrainLong"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::ConstrainLong::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainLongPtr wrapper::impl::org::ortc::ConstrainLong::toWrapper(NativeConstrainLongPtr native)
+{
+  if (!native) return ConstrainLongPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainLongPtr wrapper::impl::org::ortc::ConstrainLong::toWrapper(const NativeConstrainLong &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainLong>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->value = native.mValue;
+  if (native.mRange.hasValue()) {
+    pThis->range = ConstrainLongRange::toWrapper(native.mRange.value());
+  }
+
+  pThis->wrapper_init_org_ortc_ConstrainLong();
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainLong::NativeConstrainLongPtr wrapper::impl::org::ortc::ConstrainLong::toNative(wrapper::org::ortc::ConstrainLongPtr wrapper)
+{
+  if (!wrapper) return NativeConstrainLongPtr();
+
+  auto result = make_shared<NativeConstrainLong>();
+  result->mValue = wrapper->value;
+  if (wrapper->range.hasValue()) {
+    auto native = ConstrainLongRange::toNative(wrapper->range.value());
+    if (native) {
+      result->mRange = *native;
+    }
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainLong.h b/ortc/idl/wrapper/impl_org_ortc_ConstrainLong.h
new file mode 100644
index 00000000..e26e6e3a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainLong.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_ConstrainLong.h"
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct ConstrainLong : public wrapper::org::ortc::ConstrainLong
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrackTypes::ConstrainLong, NativeConstrainLong);
+
+          ConstrainLongWeakPtr thisWeak_;
+
+          ConstrainLong();
+          virtual ~ConstrainLong();
+
+          // methods ConstrainLong
+          virtual void wrapper_init_org_ortc_ConstrainLong() override;
+          virtual void wrapper_init_org_ortc_ConstrainLong(wrapper::org::ortc::ConstrainLongPtr source) override;
+          virtual void wrapper_init_org_ortc_ConstrainLong(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static ConstrainLongPtr toWrapper(NativeConstrainLongPtr native);
+          static ConstrainLongPtr toWrapper(const NativeConstrainLong &native);
+          static NativeConstrainLongPtr toNative(wrapper::org::ortc::ConstrainLongPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainLongRange.cpp b/ortc/idl/wrapper/impl_org_ortc_ConstrainLongRange.cpp
new file mode 100644
index 00000000..965a8e8d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainLongRange.cpp
@@ -0,0 +1,116 @@
+
+#include "impl_org_ortc_ConstrainLongRange.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainLongRange::ConstrainLongRange()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ConstrainLongRangePtr wrapper::org::ortc::ConstrainLongRange::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainLongRange>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainLongRange::~ConstrainLongRange()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainLongRange::wrapper_init_org_ortc_ConstrainLongRange()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainLongRange::wrapper_init_org_ortc_ConstrainLongRange(wrapper::org::ortc::ConstrainLongRangePtr source)
+{
+  if (!source) return;
+
+  wrapper::org::ortc::ConstrainLongRangePtr pThis = thisWeak_.lock();
+  (*pThis) = (*source);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainLongRange::wrapper_init_org_ortc_ConstrainLongRange(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeConstrainLongRange>(Json::toNative(json));
+
+  wrapper::org::ortc::ConstrainLongRangePtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::ConstrainLongRangePtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::ConstrainLongRange::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("ConstrainLongRange"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::ConstrainLongRange::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainLongRangePtr  wrapper::impl::org::ortc::ConstrainLongRange::toWrapper(NativeConstrainLongRangePtr native)
+{
+  if (!native) return ConstrainLongRangePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainLongRangePtr  wrapper::impl::org::ortc::ConstrainLongRange::toWrapper(const NativeConstrainLongRange &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainLongRange>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->min = native.mMin;
+  pThis->max = native.mMax;
+  pThis->exact = native.mExact;
+  pThis->ideal = native.mIdeal;
+
+  pThis->wrapper_init_org_ortc_ConstrainLongRange();
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainLongRange::NativeConstrainLongRangePtr wrapper::impl::org::ortc::ConstrainLongRange::toNative(wrapper::org::ortc::ConstrainLongRangePtr wrapper)
+{
+  if (!wrapper) return NativeConstrainLongRangePtr();
+
+  auto native = make_shared<NativeConstrainLongRange>();
+  native->mMin = wrapper->min;
+  native->mMax = wrapper->max;
+  native->mExact = wrapper->exact;
+  native->mIdeal = wrapper->ideal;
+
+  return native;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainLongRange.h b/ortc/idl/wrapper/impl_org_ortc_ConstrainLongRange.h
new file mode 100644
index 00000000..77680c33
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainLongRange.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_ConstrainLongRange.h"
+
+#include <ortc/IConstraints.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct ConstrainLongRange : public wrapper::org::ortc::ConstrainLongRange
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IConstraints::ConstrainLongRange, NativeConstrainLongRange);
+
+          ConstrainLongRangeWeakPtr thisWeak_;
+
+          ConstrainLongRange();
+          virtual ~ConstrainLongRange();
+
+          // methods ConstrainLongRange
+          virtual void wrapper_init_org_ortc_ConstrainLongRange() override;
+          virtual void wrapper_init_org_ortc_ConstrainLongRange(wrapper::org::ortc::ConstrainLongRangePtr source) override;
+          virtual void wrapper_init_org_ortc_ConstrainLongRange(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static ConstrainLongRangePtr toWrapper(NativeConstrainLongRangePtr native);
+          static ConstrainLongRangePtr toWrapper(const NativeConstrainLongRange &native);
+          static NativeConstrainLongRangePtr toNative(wrapper::org::ortc::ConstrainLongRangePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainString.cpp b/ortc/idl/wrapper/impl_org_ortc_ConstrainString.cpp
new file mode 100644
index 00000000..1f28d120
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainString.cpp
@@ -0,0 +1,113 @@
+
+#include "impl_org_ortc_ConstrainString.h"
+#include "impl_org_ortc_StringOrStringList.h"
+#include "impl_org_ortc_ConstrainStringParameters.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainString::ConstrainString()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ConstrainStringPtr wrapper::org::ortc::ConstrainString::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainString>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainString::~ConstrainString()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainString::wrapper_init_org_ortc_ConstrainString()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainString::wrapper_init_org_ortc_ConstrainString(wrapper::org::ortc::ConstrainStringPtr source)
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainString::wrapper_init_org_ortc_ConstrainString(wrapper::org::ortc::JsonPtr json)
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::ConstrainString::toJson()
+{
+  wrapper::org::ortc::JsonPtr result {};
+  return result;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::ConstrainString::hash()
+{
+  String result {};
+  return result;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainStringPtr wrapper::impl::org::ortc::ConstrainString::toWrapper(NativeConstrainStringPtr native)
+{
+  if (!native) return ConstrainStringPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainStringPtr wrapper::impl::org::ortc::ConstrainString::toWrapper(const NativeConstrainString &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainString>();
+  pThis->thisWeak_ = pThis;
+
+  if (native.mValue.hasValue()) {
+    pThis->value = StringOrStringList::toWrapper(native.mValue.value());
+  }
+  if (native.mParameters.hasValue()) {
+    pThis->parameters = ConstrainStringParameters::toWrapper(native.mParameters);
+  }
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainString::NativeConstrainStringPtr wrapper::impl::org::ortc::ConstrainString::toNative(wrapper::org::ortc::ConstrainStringPtr wrapper)
+{
+  if (!wrapper) return NativeConstrainStringPtr();
+
+  auto result = make_shared<NativeConstrainString>();
+
+  if (wrapper->value.hasValue()) {
+    if (wrapper->value.value()) {
+      result->mValue = *StringOrStringList::toNative(wrapper->value.value());
+    }
+  }
+  if (wrapper->parameters.hasValue()) {
+    if (wrapper->parameters.value()) {
+      result->mParameters = *ConstrainStringParameters::toNative(wrapper->parameters.value());
+    }
+  }
+
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainString.h b/ortc/idl/wrapper/impl_org_ortc_ConstrainString.h
new file mode 100644
index 00000000..ba0b4cb1
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainString.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_ConstrainString.h"
+
+#include <ortc/IConstraints.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct ConstrainString : public wrapper::org::ortc::ConstrainString
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IConstraints::ConstrainString, NativeConstrainString);
+
+          ConstrainStringWeakPtr thisWeak_;
+
+          ConstrainString();
+          virtual ~ConstrainString();
+
+          // methods ConstrainString
+          virtual void wrapper_init_org_ortc_ConstrainString() override;
+          virtual void wrapper_init_org_ortc_ConstrainString(wrapper::org::ortc::ConstrainStringPtr source) override;
+          virtual void wrapper_init_org_ortc_ConstrainString(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static ConstrainStringPtr toWrapper(NativeConstrainStringPtr native);
+          static ConstrainStringPtr toWrapper(const NativeConstrainString &native);
+          static NativeConstrainStringPtr toNative(wrapper::org::ortc::ConstrainStringPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainStringParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_ConstrainStringParameters.cpp
new file mode 100644
index 00000000..384c14f8
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainStringParameters.cpp
@@ -0,0 +1,128 @@
+
+#include "impl_org_ortc_ConstrainStringParameters.h"
+#include "impl_org_ortc_StringOrStringList.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainStringParameters::ConstrainStringParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ConstrainStringParametersPtr wrapper::org::ortc::ConstrainStringParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainStringParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainStringParameters::~ConstrainStringParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainStringParameters::wrapper_init_org_ortc_ConstrainStringParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainStringParameters::wrapper_init_org_ortc_ConstrainStringParameters(wrapper::org::ortc::ConstrainStringParametersPtr source)
+{
+  if (!source) return;
+  wrapper::org::ortc::ConstrainStringParametersPtr pThis = thisWeak_.lock();
+
+  auto native = toNative(source);
+  if (!native) return;
+
+  wrapper::org::ortc::ConstrainStringParametersPtr wrapper = toWrapper(native);
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::ConstrainStringParameters::wrapper_init_org_ortc_ConstrainStringParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeConstrainStringParameters>(Json::toNative(json));
+
+  wrapper::org::ortc::ConstrainStringParametersPtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::ConstrainStringParametersPtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::ConstrainStringParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("ConstrainStringParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::ConstrainStringParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainStringParametersPtr wrapper::impl::org::ortc::ConstrainStringParameters::toWrapper(NativeConstrainStringParametersPtr native)
+{
+  if (!native) return ConstrainStringParametersPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainStringParametersPtr wrapper::impl::org::ortc::ConstrainStringParameters::toWrapper(const NativeConstrainStringParameters &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ConstrainStringParameters>();
+  pThis->thisWeak_ = pThis;
+
+  if (native.mExact.hasValue()) {
+    pThis->exact = StringOrStringList::toWrapper(native.mExact.value());
+  }
+  if (native.mIdeal.hasValue()) {
+    pThis->ideal = StringOrStringList::toWrapper(native.mIdeal.value());
+  }
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ConstrainStringParameters::NativeConstrainStringParametersPtr wrapper::impl::org::ortc::ConstrainStringParameters::toNative(wrapper::org::ortc::ConstrainStringParametersPtr wrapper)
+{
+  if (!wrapper) return NativeConstrainStringParametersPtr();
+
+  auto result = make_shared< NativeConstrainStringParameters >();
+
+  if (wrapper->exact.hasValue()) {
+    if (wrapper->exact.value()) {
+      result->mExact = *StringOrStringList::toNative(wrapper->exact.value());
+    }
+  }
+  if (wrapper->ideal.hasValue()) {
+    if (wrapper->ideal.value()) {
+      result->mIdeal = *StringOrStringList::toNative(wrapper->ideal.value());
+    }
+  }
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_ConstrainStringParameters.h b/ortc/idl/wrapper/impl_org_ortc_ConstrainStringParameters.h
new file mode 100644
index 00000000..76e1429f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ConstrainStringParameters.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_ConstrainStringParameters.h"
+
+#include <ortc/IConstraints.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct ConstrainStringParameters : public wrapper::org::ortc::ConstrainStringParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IConstraints::ConstrainStringParameters, NativeConstrainStringParameters);
+
+          ConstrainStringParametersWeakPtr thisWeak_;
+
+          ConstrainStringParameters();
+          virtual ~ConstrainStringParameters();
+
+          // methods ConstrainStringParameters
+          virtual void wrapper_init_org_ortc_ConstrainStringParameters() override;
+          virtual void wrapper_init_org_ortc_ConstrainStringParameters(wrapper::org::ortc::ConstrainStringParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_ConstrainStringParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static ConstrainStringParametersPtr toWrapper(NativeConstrainStringParametersPtr native);
+          static ConstrainStringParametersPtr toWrapper(const NativeConstrainStringParameters &native);
+          static NativeConstrainStringParametersPtr toNative(wrapper::org::ortc::ConstrainStringParametersPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_Dispatcher.cpp b/ortc/idl/wrapper/impl_org_ortc_Dispatcher.cpp
new file mode 100644
index 00000000..7ab81013
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Dispatcher.cpp
@@ -0,0 +1,67 @@
+
+#include "impl_org_ortc_Dispatcher.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::Dispatcher::Dispatcher()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::DispatcherPtr wrapper::org::ortc::Dispatcher::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::Dispatcher>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::Dispatcher::~Dispatcher()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::Dispatcher::wrapper_init_org_ortc_Dispatcher(AnyPtr source)
+{
+  native_ = source;
+}
+
+//------------------------------------------------------------------------------
+AnyPtr wrapper::org::ortc::Dispatcher::get_source()
+{
+  AnyPtr result {};
+  return result;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Dispatcher::set_source(AnyPtr value)
+{
+}
+
+//------------------------------------------------------------------------------
+AnyPtr wrapper::impl::org::ortc::Dispatcher::toNative(wrapper::org::ortc::DispatcherPtr wrapper)
+{
+  if (!wrapper) return AnyPtr();
+
+  auto impl = std::dynamic_pointer_cast<Dispatcher>(wrapper);
+  if (!impl) return AnyPtr();
+
+  return impl->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_Dispatcher.h b/ortc/idl/wrapper/impl_org_ortc_Dispatcher.h
new file mode 100644
index 00000000..309dc1f9
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Dispatcher.h
@@ -0,0 +1,32 @@
+// Generated by zsLibEventingTool
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_Dispatcher.h"
+
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct Dispatcher : public wrapper::org::ortc::Dispatcher
+        {
+          DispatcherWeakPtr thisWeak_;
+          AnyPtr native_;
+
+          Dispatcher();
+          virtual ~Dispatcher();
+
+          // methods Dispatcher
+          virtual void wrapper_init_org_ortc_Dispatcher(AnyPtr source) override;
+
+          static AnyPtr toNative(wrapper::org::ortc::DispatcherPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_DoubleRange.cpp b/ortc/idl/wrapper/impl_org_ortc_DoubleRange.cpp
new file mode 100644
index 00000000..ed8163f4
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_DoubleRange.cpp
@@ -0,0 +1,120 @@
+
+#include "impl_org_ortc_DoubleRange.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::DoubleRange::DoubleRange()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::DoubleRangePtr wrapper::org::ortc::DoubleRange::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::DoubleRange>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::DoubleRange::~DoubleRange()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::DoubleRange::wrapper_init_org_ortc_DoubleRange()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::DoubleRange::wrapper_init_org_ortc_DoubleRange(double value)
+{
+  min = max = value;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::DoubleRange::wrapper_init_org_ortc_DoubleRange(
+  double min,
+  double max
+  )
+{
+  this->min = min;
+  this->max = max;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::DoubleRange::wrapper_init_org_ortc_DoubleRange(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeCapabilityDouble>(Json::toNative(json));
+
+  wrapper::org::ortc::DoubleRangePtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::DoubleRangePtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::DoubleRange::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("DoubleRange"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::DoubleRange::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::DoubleRangePtr wrapper::impl::org::ortc::DoubleRange::toWrapper(NativeCapabilityDoublePtr native)
+{
+  if (!native) return DoubleRangePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::DoubleRangePtr wrapper::impl::org::ortc::DoubleRange::toWrapper(const NativeCapabilityDouble &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::DoubleRange>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->min = native.mMin;
+  pThis->max = native.mMax;
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::DoubleRange::NativeCapabilityDoublePtr wrapper::impl::org::ortc::DoubleRange::toNative(wrapper::org::ortc::DoubleRangePtr wrapper)
+{
+  if (!wrapper) return NativeCapabilityDoublePtr();
+
+  auto result = make_shared<NativeCapabilityDouble>();
+
+  result->mMin = wrapper->min;
+  result->mMax = wrapper->max;
+
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_DoubleRange.h b/ortc/idl/wrapper/impl_org_ortc_DoubleRange.h
new file mode 100644
index 00000000..d5bdd033
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_DoubleRange.h
@@ -0,0 +1,43 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_DoubleRange.h"
+
+#include <ortc/ICapabilities.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct DoubleRange : public wrapper::org::ortc::DoubleRange
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ICapabilities::CapabilityDouble, NativeCapabilityDouble);
+          DoubleRangeWeakPtr thisWeak_;
+
+          DoubleRange();
+          virtual ~DoubleRange();
+
+          // methods DoubleRange
+          virtual void wrapper_init_org_ortc_DoubleRange() override;
+          virtual void wrapper_init_org_ortc_DoubleRange(double value) override;
+          virtual void wrapper_init_org_ortc_DoubleRange(
+            double min,
+            double max
+            ) override;
+          virtual void wrapper_init_org_ortc_DoubleRange(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+
+          static DoubleRangePtr toWrapper(NativeCapabilityDoublePtr native);
+          static DoubleRangePtr toWrapper(const NativeCapabilityDouble &native);
+          static NativeCapabilityDoublePtr toNative(wrapper::org::ortc::DoubleRangePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_Error.cpp b/ortc/idl/wrapper/impl_org_ortc_Error.cpp
new file mode 100644
index 00000000..99c312cb
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Error.cpp
@@ -0,0 +1,78 @@
+
+#include "impl_org_ortc_Error.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::Error::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::Error::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::Error::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::Error::Error()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ErrorPtr wrapper::org::ortc::Error::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::Error>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::Error::~Error()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::Error::wrapper_init_org_ortc_Error()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->errorCode = SafeInt<decltype(pThis->errorCode)>(native.mErrorCode);
+  pThis->name = native.mName;
+  pThis->reason = native.mReason;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mErrorCode = SafeInt<decltype(result->mErrorCode)>(wrapper->errorCode);
+  result->mName = wrapper->name;
+  result->mReason = wrapper->reason;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_Error.h b/ortc/idl/wrapper/impl_org_ortc_Error.h
new file mode 100644
index 00000000..3be44507
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Error.h
@@ -0,0 +1,34 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_Error.h"
+
+#include <ortc/types.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct Error : public wrapper::org::ortc::Error
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ErrorAny, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(Error, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::Error, WrapperType);
+          ErrorWeakPtr thisWeak_;
+
+          Error();
+          virtual ~Error();
+          virtual void wrapper_init_org_ortc_Error() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_ErrorEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_ErrorEvent.cpp
new file mode 100644
index 00000000..37ed35d0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ErrorEvent.cpp
@@ -0,0 +1,70 @@
+
+#include "impl_org_ortc_ErrorEvent.h"
+#include "impl_org_ortc_Error.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::ErrorEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::ErrorEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ErrorEvent::ErrorEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ErrorEventPtr wrapper::org::ortc::ErrorEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::ErrorEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::ErrorEvent::~ErrorEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::ErrorPtr wrapper::impl::org::ortc::ErrorEvent::get_error()
+{
+  return error_;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(::ortc::ErrorAnyPtr error)
+{
+  if (!error) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->error_ = Error::toWrapper(error);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(wrapper::org::ortc::ErrorPtr error)
+{
+  if (!error) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->error_ = error;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_ErrorEvent.h b/ortc/idl/wrapper/impl_org_ortc_ErrorEvent.h
new file mode 100644
index 00000000..fae497f9
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_ErrorEvent.h
@@ -0,0 +1,35 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_ErrorEvent.h"
+
+#include <ortc/types.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct ErrorEvent : public wrapper::org::ortc::ErrorEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(ErrorEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::ErrorEvent, WrapperType);
+          ErrorEventWeakPtr thisWeak_;
+          wrapper::org::ortc::ErrorPtr error_;
+
+          ErrorEvent();
+          virtual ~ErrorEvent();
+
+          // properties ErrorEvent
+          virtual wrapper::org::ortc::ErrorPtr get_error() override;
+
+          static WrapperImplTypePtr toWrapper(::ortc::ErrorAnyPtr error);
+          static WrapperImplTypePtr toWrapper(wrapper::org::ortc::ErrorPtr error);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_Helper.cpp b/ortc/idl/wrapper/impl_org_ortc_Helper.cpp
new file mode 100644
index 00000000..1aee1caa
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Helper.cpp
@@ -0,0 +1,914 @@
+
+#include "impl_org_ortc_Helper.h"
+
+#include "impl_org_ortc_MediaStreamTrack.h"
+#include "impl_org_ortc_RTCStatsTypeSet.h"
+#include "impl_org_ortc_RTCStatsReport.h"
+#include "impl_org_ortc_OverconstrainedError.h"
+#include "impl_org_ortc_Error.h"
+
+#include <ortc/IStatsProvider.h>
+#include <zsLib/Log.h>
+#include <zsLib/IMessageQueueThread.h>
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+namespace wrapper { namespace impl { namespace org { namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper_adapter); } } } } }
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+        } // namespace adapater
+
+        //---------------------------------------------------------------------
+        zsLib::IMessageQueuePtr Helper::getGuiQueue()
+        {
+          return zsLib::IMessageQueueThread::singletonUsingCurrentGUIThreadsMessageQueue();
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::log::Level Helper::toWrapper(zsLib::Log::Level level)
+        {
+          switch (level)
+          {
+            case zsLib::Log::Level::None:   return wrapper::org::ortc::log::Level_none;
+            case zsLib::Log::Level::Basic:  return wrapper::org::ortc::log::Level_basic;
+            case zsLib::Log::Level::Detail: return wrapper::org::ortc::log::Level_detail;
+            case zsLib::Log::Level::Debug:  return wrapper::org::ortc::log::Level_debug;
+            case zsLib::Log::Level::Trace:  return wrapper::org::ortc::log::Level_trace;
+            case zsLib::Log::Level::Insane: return wrapper::org::ortc::log::Level_insane;
+          }
+          ZS_THROW_INVALID_ARGUMENT("level is unknown");
+          return toWrapper(zsLib::Log::Level_First);
+        }
+
+        //---------------------------------------------------------------------
+        zsLib::Log::Level Helper::toNative(wrapper::org::ortc::log::Level level)
+        {
+          switch (level)
+          {
+            case wrapper::org::ortc::log::Level_none:   return zsLib::Log::Level::None;
+            case wrapper::org::ortc::log::Level_basic:  return zsLib::Log::Level::Basic;
+            case wrapper::org::ortc::log::Level_detail: return zsLib::Log::Level::Detail;
+            case wrapper::org::ortc::log::Level_debug:  return zsLib::Log::Level::Debug;
+            case wrapper::org::ortc::log::Level_trace:  return zsLib::Log::Level::Trace;
+            case wrapper::org::ortc::log::Level_insane: return zsLib::Log::Level::Insane;
+          }
+          ZS_THROW_INVALID_ARGUMENT("level is unknown");
+          return zsLib::Log::Level_First;
+        }
+
+        //---------------------------------------------------------------------
+        const char *Helper::toNative(wrapper::org::ortc::log::Component component)
+        {
+          const char *componentStr{};
+          switch (component) {
+            case wrapper::org::ortc::log::Component_all:                     return NULL;
+            case wrapper::org::ortc::log::Component_zslib:                   componentStr = "zslib"; break;
+            case wrapper::org::ortc::log::Component_socket:                  componentStr = "zslib_socket"; break;
+            case wrapper::org::ortc::log::Component_eventing:                componentStr = "zslib_eventing"; break;
+            case wrapper::org::ortc::log::Component_services:                componentStr = "org_ortc_services"; break;
+            case wrapper::org::ortc::log::Component_dns:                     componentStr = "org_ortc_services_dns"; break;
+            case wrapper::org::ortc::log::Component_turn:                    componentStr = "org_ortc_services_turn"; break;
+            case wrapper::org::ortc::log::Component_http:                    componentStr = "org_ortc_services_http"; break;
+            case wrapper::org::ortc::log::Component_logger:                  componentStr = "org_ortc_services_logger"; break;
+            case wrapper::org::ortc::log::Component_wire:                    componentStr = "org_ortc_services_wire"; break;
+            case wrapper::org::ortc::log::Component_stun:                    componentStr = "org_ortc_services_stun"; break;
+            case wrapper::org::ortc::log::Component_ortc:                    componentStr = "org_ortc"; break;
+            case wrapper::org::ortc::log::Component_webrtc:                  componentStr = "org_ortc_webrtc"; break;
+            case wrapper::org::ortc::log::Component_dtlsTransport:           componentStr = "org_ortc_dtls_transport"; break;
+            case wrapper::org::ortc::log::Component_iceGatherer:             componentStr = "org_ortc_ice_gatherer"; break;
+            case wrapper::org::ortc::log::Component_iceGathererRouter:       componentStr = "org_ortc_ice_gatherer_router"; break;
+            case wrapper::org::ortc::log::Component_iceTransport:            componentStr = "org_ortc_ice_transport"; break;
+            case wrapper::org::ortc::log::Component_iceTransportController:  componentStr = "org_ortc_ice_transport_controller"; break;
+            case wrapper::org::ortc::log::Component_mediaDevices:            componentStr = "org_ortc_media_devices"; break;
+            case wrapper::org::ortc::log::Component_mediaStreamTrack:        componentStr = "org_ortc_media_stream_track"; break;
+            case wrapper::org::ortc::log::Component_rtpRtcpPacket:           componentStr = "org_ortc_rtp_rtcp_packet"; break;
+            case wrapper::org::ortc::log::Component_rtpListener:             componentStr = "org_ortc_rtp_listener"; break;
+            case wrapper::org::ortc::log::Component_rtpMediaEngine:          componentStr = "org_ortc_rtp_media_engine"; break;
+            case wrapper::org::ortc::log::Component_rtpReceiver:             componentStr = "org_ortc_rtp_receiver"; break;
+            case wrapper::org::ortc::log::Component_rtpSender:               componentStr = "org_ortc_rtp_sender"; break;
+            case wrapper::org::ortc::log::Component_rtpTypes:                componentStr = "org_ortc_rtp_types"; break;
+            case wrapper::org::ortc::log::Component_sctpDataChannel:         componentStr = "org_ortc_sctp_data_channel"; break;
+            case wrapper::org::ortc::log::Component_srtp:                    componentStr = "org_ortc_srtp"; break;
+            case wrapper::org::ortc::log::Component_stats:                   componentStr = "org_ortc_stats"; break;
+            case wrapper::org::ortc::log::Component_adapter:                 componentStr = "org_ortc_adapter"; break;
+          };
+          ZS_THROW_INVALID_ARGUMENT_IF(!componentStr);
+          return componentStr;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::MediaStreamTrackKind Helper::toWrapper(IMediaStreamTrackTypes::Kinds kind)
+        {
+          switch (kind)
+          {
+            case IMediaStreamTrackTypes::Kind_Audio: return wrapper::org::ortc::MediaStreamTrackKind::MediaStreamTrackKind_audio;
+            case IMediaStreamTrackTypes::Kind_Video: return wrapper::org::ortc::MediaStreamTrackKind::MediaStreamTrackKind_video;
+          }
+          ZS_THROW_INVALID_ARGUMENT("kind is unknown");
+          return toWrapper(IMediaStreamTrackTypes::Kind_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IMediaStreamTrackTypes::Kinds Helper::toNative(wrapper::org::ortc::MediaStreamTrackKind kind)
+        {
+          switch (kind)
+          {
+            case wrapper::org::ortc::MediaStreamTrackKind::MediaStreamTrackKind_audio: return IMediaStreamTrackTypes::Kind_Audio;
+            case wrapper::org::ortc::MediaStreamTrackKind::MediaStreamTrackKind_video: return IMediaStreamTrackTypes::Kind_Video;
+          }
+          ZS_THROW_INVALID_ARGUMENT("kind is unknown");
+          return IMediaStreamTrackTypes::Kind_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::MediaStreamTrackState Helper::toWrapper(IMediaStreamTrackTypes::States state)
+        {
+          switch (state)
+          {
+            case IMediaStreamTrackTypes::State_Live: return wrapper::org::ortc::MediaStreamTrackState::MediaStreamTrackState_live;
+            case IMediaStreamTrackTypes::State_Ended: return wrapper::org::ortc::MediaStreamTrackState::MediaStreamTrackState_ended;
+          }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return wrapper::org::ortc::MediaStreamTrackState::MediaStreamTrackState_ended;
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IMediaDevicesTypes::DeviceKinds Helper::toNative(wrapper::org::ortc::MediaDeviceKind kind)
+        {
+          switch (kind)
+          {
+            case wrapper::org::ortc::MediaDeviceKind_audioInput:       return ::ortc::IMediaDevicesTypes::DeviceKind_AudioInput;
+            case wrapper::org::ortc::MediaDeviceKind_audioOutput:      return ::ortc::IMediaDevicesTypes::DeviceKind_AudioOutput;
+            case wrapper::org::ortc::MediaDeviceKind_videoInput:       return ::ortc::IMediaDevicesTypes::DeviceKind_VideoInput;
+          }
+
+          ZS_THROW_INVALID_ARGUMENT("kind is unknown");
+          return ::ortc::IMediaDevicesTypes::DeviceKind_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::MediaDeviceKind Helper::toWrapper(::ortc::IMediaDevicesTypes::DeviceKinds kind)
+        {
+          switch (kind)
+          {
+            case ::ortc::IMediaDevicesTypes::DeviceKind_AudioInput:     return wrapper::org::ortc::MediaDeviceKind_audioInput;
+            case ::ortc::IMediaDevicesTypes::DeviceKind_AudioOutput:    return wrapper::org::ortc::MediaDeviceKind_audioOutput;
+            case ::ortc::IMediaDevicesTypes::DeviceKind_VideoInput:     return wrapper::org::ortc::MediaDeviceKind_videoInput;
+          }
+          ZS_THROW_INVALID_ARGUMENT("kind is unknown");
+          return toWrapper(::ortc::IMediaDevicesTypes::DeviceKind_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IStatsReportTypes::StatsTypes Helper::toNative(wrapper::org::ortc::RTCStatsType type)
+        {
+          switch (type)
+          {
+            case wrapper::org::ortc::RTCStatsType_inboundRtp:       return ::ortc::IStatsReportTypes::StatsType_InboundRTP;
+            case wrapper::org::ortc::RTCStatsType_outboundRtp:      return ::ortc::IStatsReportTypes::StatsType_OutboundRTP;
+            case wrapper::org::ortc::RTCStatsType_codec:            return ::ortc::IStatsReportTypes::StatsType_Codec;
+            case wrapper::org::ortc::RTCStatsType_sctpTransport:    return ::ortc::IStatsReportTypes::StatsType_SCTPTransport;
+            case wrapper::org::ortc::RTCStatsType_dataChannel:      return ::ortc::IStatsReportTypes::StatsType_DataChannel;
+            case wrapper::org::ortc::RTCStatsType_stream:           return ::ortc::IStatsReportTypes::StatsType_Stream;
+            case wrapper::org::ortc::RTCStatsType_track:            return ::ortc::IStatsReportTypes::StatsType_Track;
+            case wrapper::org::ortc::RTCStatsType_iceGatherer:      return ::ortc::IStatsReportTypes::StatsType_ICEGatherer;
+            case wrapper::org::ortc::RTCStatsType_iceTransport:     return ::ortc::IStatsReportTypes::StatsType_ICETransport;
+            case wrapper::org::ortc::RTCStatsType_dtlsTransport:    return ::ortc::IStatsReportTypes::StatsType_DTLSTransport;
+            case wrapper::org::ortc::RTCStatsType_srtpTransport:    return ::ortc::IStatsReportTypes::StatsType_SRTPTransport;
+            case wrapper::org::ortc::RTCStatsType_certificate:      return ::ortc::IStatsReportTypes::StatsType_Certificate;
+            case wrapper::org::ortc::RTCStatsType_candidate:        return ::ortc::IStatsReportTypes::StatsType_Candidate;
+            case wrapper::org::ortc::RTCStatsType_candidatePair:    return ::ortc::IStatsReportTypes::StatsType_CandidatePair;
+            case wrapper::org::ortc::RTCStatsType_localCandidate:   return ::ortc::IStatsReportTypes::StatsType_LocalCandidate;
+            case wrapper::org::ortc::RTCStatsType_remoteCandidate:  return ::ortc::IStatsReportTypes::StatsType_RemoteCandidate;
+          }
+
+          ZS_THROW_INVALID_ARGUMENT("stats type is unknown");
+          return ::ortc::IStatsReportTypes::StatsType_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCStatsType Helper::toWrapper(::ortc::IStatsReportTypes::StatsTypes type)
+        {
+          switch (type)
+          {
+            case ::ortc::IStatsReportTypes::StatsType_InboundRTP:     return wrapper::org::ortc::RTCStatsType_inboundRtp;
+            case ::ortc::IStatsReportTypes::StatsType_OutboundRTP:    return wrapper::org::ortc::RTCStatsType_outboundRtp;
+            case ::ortc::IStatsReportTypes::StatsType_Codec:          return wrapper::org::ortc::RTCStatsType_codec;
+            case ::ortc::IStatsReportTypes::StatsType_SCTPTransport:  return wrapper::org::ortc::RTCStatsType_sctpTransport;
+            case ::ortc::IStatsReportTypes::StatsType_DataChannel:    return wrapper::org::ortc::RTCStatsType_dataChannel;
+            case ::ortc::IStatsReportTypes::StatsType_Stream:         return wrapper::org::ortc::RTCStatsType_stream;
+            case ::ortc::IStatsReportTypes::StatsType_Track:          return wrapper::org::ortc::RTCStatsType_track;
+            case ::ortc::IStatsReportTypes::StatsType_ICEGatherer:    return wrapper::org::ortc::RTCStatsType_iceGatherer;
+            case ::ortc::IStatsReportTypes::StatsType_ICETransport:   return wrapper::org::ortc::RTCStatsType_iceTransport;
+            case ::ortc::IStatsReportTypes::StatsType_DTLSTransport:  return wrapper::org::ortc::RTCStatsType_dtlsTransport;
+            case ::ortc::IStatsReportTypes::StatsType_SRTPTransport:  return wrapper::org::ortc::RTCStatsType_srtpTransport;
+            case ::ortc::IStatsReportTypes::StatsType_Certificate:      return wrapper::org::ortc::RTCStatsType_certificate;
+            case ::ortc::IStatsReportTypes::StatsType_Candidate:        return wrapper::org::ortc::RTCStatsType_candidate;
+            case ::ortc::IStatsReportTypes::StatsType_CandidatePair:    return wrapper::org::ortc::RTCStatsType_candidatePair;
+            case ::ortc::IStatsReportTypes::StatsType_LocalCandidate:   return wrapper::org::ortc::RTCStatsType_localCandidate;
+            case ::ortc::IStatsReportTypes::StatsType_RemoteCandidate:  return wrapper::org::ortc::RTCStatsType_remoteCandidate;
+          }
+          ZS_THROW_INVALID_ARGUMENT("stats type is unknown");
+          return toWrapper(::ortc::IStatsReportTypes::StatsType_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCSctpTransportState Helper::toWrapper(::ortc::ISCTPTransportTypes::States state)
+        {
+          switch (state)
+          {
+            case ::ortc::ISCTPTransportTypes::State_New:            return wrapper::org::ortc::RTCSctpTransportState_new;
+            case ::ortc::ISCTPTransportTypes::State_Connecting:     return wrapper::org::ortc::RTCSctpTransportState_connecting;
+            case ::ortc::ISCTPTransportTypes::State_Connected:      return wrapper::org::ortc::RTCSctpTransportState_connected;
+            case ::ortc::ISCTPTransportTypes::State_Closed:         return wrapper::org::ortc::RTCSctpTransportState_closed;
+          }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return toWrapper(::ortc::ISCTPTransportTypes::State_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCDataChannelState Helper::toWrapper(::ortc::IDataChannelTypes::States state)
+        {
+          switch (state)
+          {
+            case ::ortc::IDataChannelTypes::State_Connecting: return wrapper::org::ortc::RTCDataChannelState_connecting;
+            case ::ortc::IDataChannelTypes::State_Open:       return wrapper::org::ortc::RTCDataChannelState_open;
+            case ::ortc::IDataChannelTypes::State_Closing:    return wrapper::org::ortc::RTCDataChannelState_closing;
+            case ::ortc::IDataChannelTypes::State_Closed:     return wrapper::org::ortc::RTCDataChannelState_closed;
+          }
+          ZS_THROW_INVALID_ARGUMENT("data channel state is unknown");
+          return toWrapper(::ortc::IDataChannelTypes::State_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCIceCandidatePairState Helper::toWrapper(::ortc::IStatsReportTypes::StatsICECandidatePairStates state)
+        {
+          switch (state)
+          {
+            case ::ortc::IStatsReportTypes::StatsICECandidatePairState_Frozen:      return wrapper::org::ortc::RTCIceCandidatePairState_frozen;
+            case ::ortc::IStatsReportTypes::StatsICECandidatePairState_Waiting:     return wrapper::org::ortc::RTCIceCandidatePairState_waiting;
+            case ::ortc::IStatsReportTypes::StatsICECandidatePairState_InProgress:  return wrapper::org::ortc::RTCIceCandidatePairState_inProgress;
+            case ::ortc::IStatsReportTypes::StatsICECandidatePairState_Failed:      return wrapper::org::ortc::RTCIceCandidatePairState_failed;
+            case ::ortc::IStatsReportTypes::StatsICECandidatePairState_Succeeded:   return wrapper::org::ortc::RTCIceCandidatePairState_succeeded;
+            case ::ortc::IStatsReportTypes::StatsICECandidatePairState_Cancelled:   return wrapper::org::ortc::RTCIceCandidatePairState_failed;
+          }
+          ZS_THROW_INVALID_ARGUMENT("ICE candidate pair state is unknown");
+          return toWrapper(::ortc::IStatsReportTypes::StatsICECandidatePairState_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::adapter::RTCPeerConnectionSignalingMode Helper::toWrapper(::ortc::adapter::IPeerConnectionTypes::SignalingModes mode)
+        {
+          switch (mode)
+          {
+            case ::ortc::adapter::IPeerConnectionTypes::SignalingMode_JSON:         return wrapper::org::ortc::adapter::RTCPeerConnectionSignalingMode_json;
+            case ::ortc::adapter::IPeerConnectionTypes::SignalingMode_SDP:          return wrapper::org::ortc::adapter::RTCPeerConnectionSignalingMode_sdp;
+          }
+          ZS_THROW_INVALID_ARGUMENT("signaling mode is unknown");
+          return toWrapper(::ortc::adapter::IPeerConnectionTypes::SignalingMode_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::adapter::IPeerConnectionTypes::SignalingModes Helper::toNative(wrapper::org::ortc::adapter::RTCPeerConnectionSignalingMode mode)
+        {
+          switch (mode)
+          {
+            case wrapper::org::ortc::adapter::RTCPeerConnectionSignalingMode_json:         return ::ortc::adapter::IPeerConnectionTypes::SignalingMode_JSON;
+            case wrapper::org::ortc::adapter::RTCPeerConnectionSignalingMode_sdp:          return ::ortc::adapter::IPeerConnectionTypes::SignalingMode_SDP;
+          }
+          ZS_THROW_INVALID_ARGUMENT("signaling mode is unknown");
+          return ::ortc::adapter::IPeerConnectionTypes::SignalingMode_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::adapter::RTCRtcpMuxPolicy Helper::toWrapper(::ortc::adapter::IPeerConnectionTypes::RTCPMuxPolicies policy)
+        {
+          switch (policy)
+          {
+            case ::ortc::adapter::IPeerConnectionTypes::RTCPMuxPolicy_Negotiated:       return wrapper::org::ortc::adapter::RTCRtcpMuxPolicy_negotiated;
+            case ::ortc::adapter::IPeerConnectionTypes::RTCPMuxPolicy_Require:          return wrapper::org::ortc::adapter::RTCRtcpMuxPolicy_require;
+          }
+          ZS_THROW_INVALID_ARGUMENT("mux policy mode is unknown");
+          return toWrapper(::ortc::adapter::IPeerConnectionTypes::RTCPMuxPolicy_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::adapter::IPeerConnectionTypes::RTCPMuxPolicies Helper::toNative(wrapper::org::ortc::adapter::RTCRtcpMuxPolicy policy)
+        {
+          switch (policy)
+          {
+            case wrapper::org::ortc::adapter::RTCRtcpMuxPolicy_negotiated:       return ::ortc::adapter::IPeerConnectionTypes::RTCPMuxPolicy_Negotiated;
+            case wrapper::org::ortc::adapter::RTCRtcpMuxPolicy_require:          return ::ortc::adapter::IPeerConnectionTypes::RTCPMuxPolicy_Require;
+          }
+          ZS_THROW_INVALID_ARGUMENT("mux policy is unknown");
+          return ::ortc::adapter::IPeerConnectionTypes::RTCPMuxPolicy_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::adapter::RTCBundlePolicy Helper::toWrapper(::ortc::adapter::IPeerConnectionTypes::BundlePolicies policy)
+        {
+          switch (policy)
+          {
+            case ::ortc::adapter::IPeerConnectionTypes::BundlePolicy_Balanced:    return wrapper::org::ortc::adapter::RTCBundlePolicy_balanced;
+            case ::ortc::adapter::IPeerConnectionTypes::BundlePolicy_MaxCompat:   return wrapper::org::ortc::adapter::RTCBundlePolicy_maxCompat;
+            case ::ortc::adapter::IPeerConnectionTypes::BundlePolicy_MaxBundle:   return wrapper::org::ortc::adapter::RTCBundlePolicy_maxBundle;
+          }
+          ZS_THROW_INVALID_ARGUMENT("bundle policy mode is unknown");
+          return toWrapper(::ortc::adapter::IPeerConnectionTypes::BundlePolicy_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::adapter::IPeerConnectionTypes::BundlePolicies Helper::toNative(wrapper::org::ortc::adapter::RTCBundlePolicy policy)
+        {
+          switch (policy)
+          {
+            case wrapper::org::ortc::adapter::RTCBundlePolicy_balanced:       return ::ortc::adapter::IPeerConnectionTypes::BundlePolicy_Balanced;
+            case wrapper::org::ortc::adapter::RTCBundlePolicy_maxCompat:      return ::ortc::adapter::IPeerConnectionTypes::BundlePolicy_MaxCompat;
+            case wrapper::org::ortc::adapter::RTCBundlePolicy_maxBundle:      return ::ortc::adapter::IPeerConnectionTypes::BundlePolicy_MaxBundle;
+          }
+          ZS_THROW_INVALID_ARGUMENT("bundle policy is unknown");
+          return ::ortc::adapter::IPeerConnectionTypes::BundlePolicy_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::adapter::RTCSignalingState Helper::toWrapper(::ortc::adapter::IPeerConnectionTypes::SignalingStates state)
+        {
+          switch (state)
+          {
+            case ::ortc::adapter::IPeerConnectionTypes::SignalingState_Stable:              return wrapper::org::ortc::adapter::RTCSignalingState_stable;
+            case ::ortc::adapter::IPeerConnectionTypes::SignalingState_HaveLocalOffer:      return wrapper::org::ortc::adapter::RTCSignalingState_haveLocalOffer;
+            case ::ortc::adapter::IPeerConnectionTypes::SignalingState_HaveRemoteOffer:     return wrapper::org::ortc::adapter::RTCSignalingState_haveRemoteOffer;
+            case ::ortc::adapter::IPeerConnectionTypes::SignalingState_HaveLocalPranswer:   return wrapper::org::ortc::adapter::RTCSignalingState_haveLocalPranswer;
+            case ::ortc::adapter::IPeerConnectionTypes::SignalingState_HaveRemotePranswer:  return wrapper::org::ortc::adapter::RTCSignalingState_haveRemotePranswer;
+            case ::ortc::adapter::IPeerConnectionTypes::SignalingState_Closed:              return wrapper::org::ortc::adapter::RTCSignalingState_closed;
+           }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return toWrapper(::ortc::adapter::IPeerConnectionTypes::SignalingState_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::adapter::RTCIceConnectionState Helper::toPeerConnectionWrapper(::ortc::IICETransportTypes::States state)
+        {
+         switch (state)
+          {
+            case ::ortc::IICETransportTypes::State_New:           return wrapper::org::ortc::adapter::RTCIceConnectionState_new;
+            case ::ortc::IICETransportTypes::State_Checking:      return wrapper::org::ortc::adapter::RTCIceConnectionState_checking;
+            case ::ortc::IICETransportTypes::State_Connected:     return wrapper::org::ortc::adapter::RTCIceConnectionState_connected;
+            case ::ortc::IICETransportTypes::State_Completed:     return wrapper::org::ortc::adapter::RTCIceConnectionState_completed;
+            case ::ortc::IICETransportTypes::State_Disconnected:  return wrapper::org::ortc::adapter::RTCIceConnectionState_disconnected;
+            case ::ortc::IICETransportTypes::State_Failed:        return wrapper::org::ortc::adapter::RTCIceConnectionState_failed;
+            case ::ortc::IICETransportTypes::State_Closed:        return wrapper::org::ortc::adapter::RTCIceConnectionState_closed;
+         }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return toPeerConnectionWrapper(::ortc::IICETransportTypes::State_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::adapter::RTCPeerConnectionState Helper::toWrapper(::ortc::adapter::IPeerConnectionTypes::PeerConnectionStates state)
+        {
+          switch (state)
+          {
+            case ::ortc::adapter::IPeerConnectionTypes::PeerConnectionState_New:          return wrapper::org::ortc::adapter::RTCPeerConnectionState_new;
+            case ::ortc::adapter::IPeerConnectionTypes::PeerConnectionState_Connecting:   return wrapper::org::ortc::adapter::RTCPeerConnectionState_connecting;
+            case ::ortc::adapter::IPeerConnectionTypes::PeerConnectionState_Connected:    return wrapper::org::ortc::adapter::RTCPeerConnectionState_connected;
+            case ::ortc::adapter::IPeerConnectionTypes::PeerConnectionState_Disconnected: return wrapper::org::ortc::adapter::RTCPeerConnectionState_disconnected;
+            case ::ortc::adapter::IPeerConnectionTypes::PeerConnectionState_Failed:       return wrapper::org::ortc::adapter::RTCPeerConnectionState_failed;
+            case ::ortc::adapter::IPeerConnectionTypes::PeerConnectionState_Closed:       return wrapper::org::ortc::adapter::RTCPeerConnectionState_closed;
+          }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return toWrapper(::ortc::adapter::IPeerConnectionTypes::PeerConnectionState_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCIceGatherFilterPolicy Helper::toWrapper(::ortc::IICEGathererTypes::FilterPolicies policy)
+        {
+          return static_cast<wrapper::org::ortc::RTCIceGatherFilterPolicy>(static_cast<std::underlying_type<::ortc::IICEGathererTypes::FilterPolicies>::type>(policy));
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IICEGathererTypes::FilterPolicies Helper::toNative(wrapper::org::ortc::RTCIceGatherFilterPolicy policy)
+        {
+          return static_cast<::ortc::IICEGathererTypes::FilterPolicies>(static_cast<std::underlying_type<wrapper::org::ortc::RTCIceGatherFilterPolicy>::type>(policy));
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCIceCredentialType Helper::toWrapper(::ortc::IICEGathererTypes::CredentialTypes type)
+        {
+          switch (type)
+          {
+            case ::ortc::IICEGathererTypes::CredentialType_Password:  return wrapper::org::ortc::RTCIceCredentialType_password;
+            case ::ortc::IICEGathererTypes::CredentialType_Token:     return wrapper::org::ortc::RTCIceCredentialType_token;
+          }
+          ZS_THROW_INVALID_ARGUMENT("credential type is unknown");
+          return toWrapper(::ortc::IICEGathererTypes::CredentialType_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IICEGathererTypes::CredentialTypes Helper::toNative(wrapper::org::ortc::RTCIceCredentialType type)
+        {
+          switch (type)
+          {
+            case wrapper::org::ortc::RTCIceCredentialType_password:   return ::ortc::IICEGathererTypes::CredentialType_Password;
+            case wrapper::org::ortc::RTCIceCredentialType_token:      return ::ortc::IICEGathererTypes::CredentialType_Token;
+          }
+          ZS_THROW_INVALID_ARGUMENT("credential type is unknown");
+          return ::ortc::IICEGathererTypes::CredentialType_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCIceGathererState Helper::toWrapper(::ortc::IICEGathererTypes::States state)
+        {
+          switch (state)
+          {
+            case ::ortc::IICEGathererTypes::State_New:        return wrapper::org::ortc::RTCIceGathererState_new;
+            case ::ortc::IICEGathererTypes::State_Gathering:  return wrapper::org::ortc::RTCIceGathererState_gathering;
+            case ::ortc::IICEGathererTypes::State_Complete:   return wrapper::org::ortc::RTCIceGathererState_complete;
+            case ::ortc::IICEGathererTypes::State_Closed:     return wrapper::org::ortc::RTCIceGathererState_closed;
+          }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return toWrapper(::ortc::IICEGathererTypes::State_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IICEGathererTypes::States Helper::toNative(wrapper::org::ortc::RTCIceGathererState state)
+        {
+          switch (state)
+          {
+            case wrapper::org::ortc::RTCIceGathererState_new:         return ::ortc::IICEGathererTypes::State_New;
+            case wrapper::org::ortc::RTCIceGathererState_gathering:   return ::ortc::IICEGathererTypes::State_Gathering;
+            case wrapper::org::ortc::RTCIceGathererState_complete:    return ::ortc::IICEGathererTypes::State_Complete;
+            case wrapper::org::ortc::RTCIceGathererState_closed:      return ::ortc::IICEGathererTypes::State_Closed;
+          }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return ::ortc::IICEGathererTypes::State_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCIceCandidateType Helper::toWrapper(::ortc::IICETypes::CandidateTypes type)
+        {
+          switch (type)
+          {
+            case ::ortc::IICETypes::CandidateType_Host:   return wrapper::org::ortc::RTCIceCandidateType_host;
+            case ::ortc::IICETypes::CandidateType_Srflex:   return wrapper::org::ortc::RTCIceCandidateType_srflex;
+            case ::ortc::IICETypes::CandidateType_Prflx:    return wrapper::org::ortc::RTCIceCandidateType_prflx;
+            case ::ortc::IICETypes::CandidateType_Relay:    return wrapper::org::ortc::RTCIceCandidateType_relay;
+          }
+          ZS_THROW_INVALID_ARGUMENT("ice candidate type is unknown");
+          return toWrapper(::ortc::IICETypes::CandidateType_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCIceComponent Helper::toWrapper(::ortc::IICETypes::Components component)
+        {
+          switch (component)
+          {
+            case ::ortc::IICETypes::Component_RTP:    return wrapper::org::ortc::RTCIceComponent_rtp;
+            case ::ortc::IICETypes::Component_RTCP:   return wrapper::org::ortc::RTCIceComponent_rtcp;
+          }
+          ZS_THROW_INVALID_ARGUMENT("component is unknown");
+          return toWrapper(::ortc::IICETypes::Component_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCIceProtocol Helper::toWrapper(::ortc::IICETypes::Protocols protocol)
+        {
+          switch (protocol)
+          {
+            case ::ortc::IICETypes::Protocol_UDP:  return wrapper::org::ortc::RTCIceProtocol_udp;
+            case ::ortc::IICETypes::Protocol_TCP:  return wrapper::org::ortc::RTCIceProtocol_tcp;
+           }
+          ZS_THROW_INVALID_ARGUMENT("protocol is unknown");
+          return toWrapper(::ortc::IICETypes::Protocol_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCIceTcpCandidateType Helper::toWrapper(::ortc::IICETypes::TCPCandidateTypes type)
+        {
+          switch (type)
+          {
+            case ::ortc::IICETypes::TCPCandidateType_Active:  return wrapper::org::ortc::RTCIceTcpCandidateType_active;
+            case ::ortc::IICETypes::TCPCandidateType_Passive: return wrapper::org::ortc::RTCIceTcpCandidateType_passive;
+            case ::ortc::IICETypes::TCPCandidateType_SO:      return wrapper::org::ortc::RTCIceTcpCandidateType_so;
+          }
+          ZS_THROW_INVALID_ARGUMENT("tcp candidate type is unknown");
+          return toWrapper(::ortc::IICETypes::TCPCandidateType_First);
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCIceTransportState Helper::toWrapper(::ortc::IICETransportTypes::States state)
+        {
+          switch (state)
+          {
+            case ::ortc::IICETransportTypes::State_New:           return wrapper::org::ortc::RTCIceTransportState_new;
+            case ::ortc::IICETransportTypes::State_Checking:      return wrapper::org::ortc::RTCIceTransportState_checking;
+            case ::ortc::IICETransportTypes::State_Connected:     return wrapper::org::ortc::RTCIceTransportState_connected;
+            case ::ortc::IICETransportTypes::State_Completed:     return wrapper::org::ortc::RTCIceTransportState_completed;
+            case ::ortc::IICETransportTypes::State_Disconnected:  return wrapper::org::ortc::RTCIceTransportState_disconnected;
+            case ::ortc::IICETransportTypes::State_Failed:        return wrapper::org::ortc::RTCIceTransportState_failed;
+            case ::ortc::IICETransportTypes::State_Closed:        return wrapper::org::ortc::RTCIceTransportState_closed;
+          }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return toWrapper(::ortc::IICETransportTypes::State_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IICETransportTypes::States Helper::toNative(wrapper::org::ortc::RTCIceTransportState state)
+        {
+          switch (state)
+          {
+            case wrapper::org::ortc::RTCIceTransportState_new:          return ::ortc::IICETransportTypes::State_New;
+            case wrapper::org::ortc::RTCIceTransportState_checking:     return ::ortc::IICETransportTypes::State_Checking;
+            case wrapper::org::ortc::RTCIceTransportState_connected:    return ::ortc::IICETransportTypes::State_Connected;
+            case wrapper::org::ortc::RTCIceTransportState_completed:    return ::ortc::IICETransportTypes::State_Completed;
+            case wrapper::org::ortc::RTCIceTransportState_disconnected: return ::ortc::IICETransportTypes::State_Disconnected;
+            case wrapper::org::ortc::RTCIceTransportState_failed:       return ::ortc::IICETransportTypes::State_Failed;
+            case wrapper::org::ortc::RTCIceTransportState_closed:       return ::ortc::IICETransportTypes::State_Closed;
+          }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return ::ortc::IICETransportTypes::State_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCIceRole Helper::toWrapper(::ortc::IICETypes::Roles role)
+        {
+          switch (role)
+          {
+            case ::ortc::IICETypes::Role_Controlling:           return wrapper::org::ortc::RTCIceRole_controlling;
+            case ::ortc::IICETypes::Role_Controlled:            return wrapper::org::ortc::RTCIceRole_controlled;
+          }
+          ZS_THROW_INVALID_ARGUMENT("role is unknown");
+          return toWrapper(::ortc::IICETypes::Role_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IICETypes::Roles Helper::toNative(wrapper::org::ortc::RTCIceRole role)
+        {
+          switch (role)
+          {
+            case wrapper::org::ortc::RTCIceRole_controlling:    return ::ortc::IICETypes::Role_Controlling;
+            case wrapper::org::ortc::RTCIceRole_controlled:     return ::ortc::IICETypes::Role_Controlled;
+          }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return ::ortc::IICETypes::Role_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsSignal Helper::toWrapper(::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signals signal)
+        {
+          switch (signal)
+          {
+            case ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signal_Auto:  return wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsSignal_auto;
+            case ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signal_Music:  return wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsSignal_music;
+            case ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signal_Voice:  return wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsSignal_voice;
+          }
+          ZS_THROW_INVALID_ARGUMENT("signal type is unknown");
+          return toWrapper(::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signal_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signals Helper::toNative(wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsSignal signal)
+        {
+          switch (signal)
+          {
+            case wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsSignal_auto:  return ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signal_Auto;
+            case wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsSignal_music: return ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signal_Music;
+            case wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsSignal_voice: return ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signal_Voice;
+          }
+          ZS_THROW_INVALID_ARGUMENT("signal type is unknown");
+          return ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signal_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsApplication Helper::toWrapper(::ortc::IRTPTypes::OpusCodecCapabilityOptions::Applications application)
+        {
+          switch (application)
+          {
+            case ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Application_VoIP:       return wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsApplication_voip;
+            case ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Application_Audio:      return wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsApplication_audio;
+            case ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Application_LowDelay:   return wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsApplication_lowDelay;
+          }
+          ZS_THROW_INVALID_ARGUMENT("application type is unknown");
+          return toWrapper(::ortc::IRTPTypes::OpusCodecCapabilityOptions::Application_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Applications Helper::toNative(wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsApplication application)
+        {
+          switch (application)
+          {
+            case wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsApplication_voip:      return ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Application_VoIP;
+            case wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsApplication_audio:     return ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Application_Audio;
+            case wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsApplication_lowDelay:  return ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Application_LowDelay;
+          }
+          ZS_THROW_INVALID_ARGUMENT("application type is unknown");
+          return ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Application_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP Helper::toWrapper(::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToPs top)
+        {
+          switch (top)
+          {
+            case ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToP_1DInterleavedFEC:     return wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP_n1DInterleavedFEC;
+            case ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToP_1DNonInterleavedFEC:  return wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP_n1DNonInterleavedFEC;
+            case ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToP_2DParityFEEC:         return wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP_n2DParityFEEC;
+            case ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToP_Reserved:             return wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP_reserved;
+          }
+          ZS_THROW_INVALID_ARGUMENT("ToP is unknown");
+          return toWrapper(::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToP_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToPs Helper::toNative(wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP top)
+        {
+          switch (top)
+          {
+            case wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP_n1DInterleavedFEC:     return ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToP_1DInterleavedFEC;
+            case wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP_n1DNonInterleavedFEC:  return ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToP_1DNonInterleavedFEC;
+            case wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP_n2DParityFEEC:         return ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToP_2DParityFEEC;
+            case wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP_reserved:              return ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToP_Reserved;
+          }
+          ZS_THROW_INVALID_ARGUMENT("ToP is unknown");
+          return ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToP_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCRtpDegradationPreference Helper::toWrapper(::ortc::IRTPTypes::DegradationPreferences preference)
+        {
+          switch (preference)
+          {
+            case ::ortc::IRTPTypes::DegradationPreference_MaintainFramerate:    return wrapper::org::ortc::RTCRtpDegradationPreference_maintainFramerate;
+            case ::ortc::IRTPTypes::DegradationPreference_MaintainResolution:   return wrapper::org::ortc::RTCRtpDegradationPreference_maintainResolution;
+            case ::ortc::IRTPTypes::DegradationPreference_Balanced:             return wrapper::org::ortc::RTCRtpDegradationPreference_balanced;
+          }
+          ZS_THROW_INVALID_ARGUMENT("preference is unknown");
+          return toWrapper(::ortc::IRTPTypes::DegradationPreference_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IRTPTypes::DegradationPreferences Helper::toNative(wrapper::org::ortc::RTCRtpDegradationPreference preference)
+        {
+          switch (preference)
+          {
+            case wrapper::org::ortc::RTCRtpDegradationPreference_maintainFramerate:     return ::ortc::IRTPTypes::DegradationPreference_MaintainFramerate;
+            case wrapper::org::ortc::RTCRtpDegradationPreference_maintainResolution:    return ::ortc::IRTPTypes::DegradationPreference_MaintainResolution;
+            case wrapper::org::ortc::RTCRtpDegradationPreference_balanced:              return ::ortc::IRTPTypes::DegradationPreference_Balanced;
+          }
+          ZS_THROW_INVALID_ARGUMENT("preference is unknown");
+          return ::ortc::IRTPTypes::DegradationPreference_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCRtpPriorityType Helper::toWrapper(::ortc::IRTPTypes::PriorityTypes type)
+        {
+          switch (type)
+          {
+            case ::ortc::IRTPTypes::PriorityType_VeryLow:     return wrapper::org::ortc::RTCRtpPriorityType_veryLow;
+            case ::ortc::IRTPTypes::PriorityType_Low:         return wrapper::org::ortc::RTCRtpPriorityType_low;
+            case ::ortc::IRTPTypes::PriorityType_Medium:      return wrapper::org::ortc::RTCRtpPriorityType_medium;
+            case ::ortc::IRTPTypes::PriorityType_High:        return wrapper::org::ortc::RTCRtpPriorityType_high;
+          }
+          ZS_THROW_INVALID_ARGUMENT("type is unknown");
+          return toWrapper(::ortc::IRTPTypes::PriorityType_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IRTPTypes::PriorityTypes Helper::toNative(wrapper::org::ortc::RTCRtpPriorityType type)
+        {
+          switch (type)
+          {
+            case wrapper::org::ortc::RTCRtpPriorityType_veryLow:    return ::ortc::IRTPTypes::PriorityType_VeryLow;
+            case wrapper::org::ortc::RTCRtpPriorityType_low:        return ::ortc::IRTPTypes::PriorityType_Low;
+            case wrapper::org::ortc::RTCRtpPriorityType_medium:     return ::ortc::IRTPTypes::PriorityType_Medium;
+            case wrapper::org::ortc::RTCRtpPriorityType_high:       return ::ortc::IRTPTypes::PriorityType_High;
+           }
+          ZS_THROW_INVALID_ARGUMENT("type is unknown");
+          return ::ortc::IRTPTypes::PriorityType_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType Helper::toWrapper(::ortc::adapter::ISessionDescriptionTypes::SignalingTypes type)
+        {
+          switch (type)
+          {
+            case ::ortc::adapter::ISessionDescriptionTypes::SignalingType_JSON:         return wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType_json;
+            case ::ortc::adapter::ISessionDescriptionTypes::SignalingType_SDPOffer:     return wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType_sdpOffer;
+            case ::ortc::adapter::ISessionDescriptionTypes::SignalingType_SDPPranswer:  return wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType_sdpPranswer;
+            case ::ortc::adapter::ISessionDescriptionTypes::SignalingType_SDPAnswer:    return wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType_sdpAnswer;
+            case ::ortc::adapter::ISessionDescriptionTypes::SignalingType_SDPRollback:  return wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType_sdpRollback;
+          }
+          ZS_THROW_INVALID_ARGUMENT("type is unknown");
+          return toWrapper(::ortc::adapter::ISessionDescriptionTypes::SignalingType_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::adapter::ISessionDescriptionTypes::SignalingTypes Helper::toNative(wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType type)
+        {
+          switch (type)
+          {
+            case wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType_json:        return ::ortc::adapter::ISessionDescriptionTypes::SignalingType_JSON;
+            case wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType_sdpOffer:    return ::ortc::adapter::ISessionDescriptionTypes::SignalingType_SDPOffer;
+            case wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType_sdpPranswer: return ::ortc::adapter::ISessionDescriptionTypes::SignalingType_SDPPranswer;
+            case wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType_sdpAnswer:   return ::ortc::adapter::ISessionDescriptionTypes::SignalingType_SDPAnswer;
+            case wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType_sdpRollback: return ::ortc::adapter::ISessionDescriptionTypes::SignalingType_SDPRollback;
+          }
+          ZS_THROW_INVALID_ARGUMENT("type is unknown");
+          return ::ortc::adapter::ISessionDescriptionTypes::SignalingType_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCDtlsRole Helper::toWrapper(::ortc::IDTLSTransportTypes::Roles role)
+        {  
+          switch (role)
+          {
+            case ::ortc::IDTLSTransportTypes::Role_Auto:         return wrapper::org::ortc::RTCDtlsRole_auto;
+            case ::ortc::IDTLSTransportTypes::Role_Client:       return wrapper::org::ortc::RTCDtlsRole_client;
+            case ::ortc::IDTLSTransportTypes::Role_Server:       return wrapper::org::ortc::RTCDtlsRole_server;
+          }
+          ZS_THROW_INVALID_ARGUMENT("role is unknown");
+          return toWrapper(::ortc::IDTLSTransportTypes::Role_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IDTLSTransportTypes::Roles Helper::toNative(wrapper::org::ortc::RTCDtlsRole role)
+        {
+          switch (role)
+          {
+            case wrapper::org::ortc::RTCDtlsRole_auto:        return ::ortc::IDTLSTransportTypes::Role_Auto;
+            case wrapper::org::ortc::RTCDtlsRole_client:      return ::ortc::IDTLSTransportTypes::Role_Client;
+            case wrapper::org::ortc::RTCDtlsRole_server:      return ::ortc::IDTLSTransportTypes::Role_Server;
+          }
+          ZS_THROW_INVALID_ARGUMENT("role is unknown");
+          return ::ortc::IDTLSTransportTypes::Role_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::RTCDtlsTransportState Helper::toWrapper(::ortc::IDTLSTransportTypes::States state)
+        {
+          switch (state)
+          {
+            case ::ortc::IDTLSTransportTypes::State_New:          return wrapper::org::ortc::RTCDtlsTransportState_new;
+            case ::ortc::IDTLSTransportTypes::State_Connecting:   return wrapper::org::ortc::RTCDtlsTransportState_connecting;
+            case ::ortc::IDTLSTransportTypes::State_Connected:    return wrapper::org::ortc::RTCDtlsTransportState_connected;
+            case ::ortc::IDTLSTransportTypes::State_Closed:       return wrapper::org::ortc::RTCDtlsTransportState_closed;
+            case ::ortc::IDTLSTransportTypes::State_Failed:       return wrapper::org::ortc::RTCDtlsTransportState_failed;
+          }
+          ZS_THROW_INVALID_ARGUMENT("state is unknown");
+          return toWrapper(::ortc::IDTLSTransportTypes::State_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::IDTLSTransportTypes::States Helper::toNative(wrapper::org::ortc::RTCDtlsTransportState state)
+        {
+          switch (state)
+          {
+            case wrapper::org::ortc::RTCDtlsTransportState_new:         return ::ortc::IDTLSTransportTypes::State_New;
+            case wrapper::org::ortc::RTCDtlsTransportState_connecting:  return ::ortc::IDTLSTransportTypes::State_Connecting;
+            case wrapper::org::ortc::RTCDtlsTransportState_connected:   return ::ortc::IDTLSTransportTypes::State_Connected;
+            case wrapper::org::ortc::RTCDtlsTransportState_closed:      return ::ortc::IDTLSTransportTypes::State_Closed;
+            case wrapper::org::ortc::RTCDtlsTransportState_failed:      return ::ortc::IDTLSTransportTypes::State_Failed;
+          }
+          ZS_THROW_INVALID_ARGUMENT("role is unknown");
+          return ::ortc::IDTLSTransportTypes::State_First;
+        }
+
+        //---------------------------------------------------------------------
+        wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection Helper::toWrapper(::ortc::adapter::ISessionDescriptionTypes::MediaDirections direction)
+        {
+          switch (direction)
+          {
+            case ::ortc::adapter::ISessionDescriptionTypes::MediaDirection_SendReceive:   return wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection_sendReceive;
+            case ::ortc::adapter::ISessionDescriptionTypes::MediaDirection_SendOnly:      return wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection_sendOnly;
+            case ::ortc::adapter::ISessionDescriptionTypes::MediaDirection_ReceiveOnly:   return wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection_receiveOnly;
+            case ::ortc::adapter::ISessionDescriptionTypes::MediaDirection_Inactive:      return wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection_inactive;
+          }
+          ZS_THROW_INVALID_ARGUMENT("direction is unknown");
+          return toWrapper(::ortc::adapter::ISessionDescriptionTypes::MediaDirection_First);
+        }
+
+        //---------------------------------------------------------------------
+        ::ortc::adapter::ISessionDescriptionTypes::MediaDirections Helper::toNative(wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection direction)
+        {
+          switch (direction)
+          {
+            case wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection_sendReceive:     return ::ortc::adapter::ISessionDescriptionTypes::MediaDirection_SendReceive;
+            case wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection_sendOnly:        return ::ortc::adapter::ISessionDescriptionTypes::MediaDirection_SendOnly;
+            case wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection_receiveOnly:     return ::ortc::adapter::ISessionDescriptionTypes::MediaDirection_ReceiveOnly;
+            case wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection_inactive:        return ::ortc::adapter::ISessionDescriptionTypes::MediaDirection_Inactive;
+          }
+          ZS_THROW_INVALID_ARGUMENT("direction is unknown");
+          return ::ortc::adapter::ISessionDescriptionTypes::MediaDirection_First;
+        }
+
+        //---------------------------------------------------------------------
+        Helper::WrapperMediaStreamTrackListPtr Helper::toWrapper(MediaStreamTrackListPtr tracks)
+        {
+          auto result = make_shared<WrapperMediaStreamTrackList>();
+          if (!tracks) return result;
+          for (auto iter = tracks->begin(); iter != tracks->end(); ++iter)
+          {
+            auto native = wrapper::impl::org::ortc::MediaStreamTrack::toWrapper(*iter);
+            if (!native) continue;
+            result->push_back(native);
+          }
+          return result;
+        }
+
+        //---------------------------------------------------------------------
+        Helper::MediaStreamTrackListPtr Helper::toNative(WrapperMediaStreamTrackListPtr tracks)
+        {
+          if (!tracks) return MediaStreamTrackListPtr();
+
+          MediaStreamTrackListPtr result = make_shared<MediaStreamTrackList>();
+          for (auto iter = tracks->begin(); iter != tracks->end(); ++iter)
+          {
+            auto native = wrapper::impl::org::ortc::MediaStreamTrack::toNative(*iter);
+            if (!native) continue;
+            result->push_back(native);
+          }
+          return result;
+        }
+
+        //---------------------------------------------------------------------
+        PromisePtr Helper::toWrapper(PromisePtr promise)
+        {
+          if (!promise) return promise;
+
+          auto result = Promise::create(getGuiQueue());
+
+          promise->thenClosure([promise, result] {
+            if (promise->isRejected()) {
+              reject(promise, result);
+              return;
+            }
+
+            result->resolve();
+          });
+          promise->background();
+          return result;
+        }
+
+        //---------------------------------------------------------------------
+        void Helper::reject(
+                            PromisePtr nativePromise,
+                            PromisePtr wrapperPromise
+                            )
+        {
+          {
+            auto reason = nativePromise->reason<::ortc::ErrorAny>();
+            if (reason) {
+              auto wrapper = Error::toWrapper(reason);
+              auto holder = make_shared< AnyHolder<ErrorPtr> >();
+              holder->value_ = wrapper;
+              wrapperPromise->reject(holder);
+              return;
+            }
+          }
+          {
+            auto reason = nativePromise->reason<::ortc::IMediaStreamTrackTypes::OverconstrainedError>();
+            if (reason) {
+              auto wrapper = OverconstrainedError::toWrapper(reason);
+              auto holder = make_shared< AnyHolder<OverconstrainedErrorPtr> >();
+              holder->value_ = wrapper;
+              wrapperPromise->reject(holder);
+              return;
+            }
+          }
+          wrapperPromise->reject();
+          return;
+        }
+
+        //---------------------------------------------------------------------
+        Helper::PromiseWithStatsReportPtr Helper::getStats(IStatsProviderPtr native, wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+        {
+          ZS_THROW_INVALID_ARGUMENT_IF(!native);
+          ZS_THROW_INVALID_ARGUMENT_IF(!statTypes);
+
+          auto value = wrapper::impl::org::ortc::RTCStatsTypeSet::toNative(statTypes);
+          ZS_THROW_INVALID_ARGUMENT_IF(!value);
+
+          auto promise = native->getStats(*value);
+          if (!promise) return PromiseWithStatsReportPtr();
+
+          auto result = PromiseWithStatsReport::create();
+
+          promise->thenClosure([result, promise]()
+          {
+            if (promise->isRejected())
+            {
+              result->reject();
+              return;
+            }
+            result->resolve(wrapper::impl::org::ortc::RTCStatsReport::toWrapper(promise->value()));
+          });
+          promise->background();
+          return result;
+        }
+
+      } // namespace ortc
+    } // namespace org
+  } // namespace impl
+} // namespace wrapper
diff --git a/ortc/idl/wrapper/impl_org_ortc_Helper.h b/ortc/idl/wrapper/impl_org_ortc_Helper.h
new file mode 100644
index 00000000..b01983c9
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Helper.h
@@ -0,0 +1,143 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_Json.h"
+
+#include <ortc/IMediaStreamTrack.h>
+#include <ortc/IStatsReport.h>
+#include <ortc/IICETypes.h>
+#include <ortc/IRTPTypes.h>
+#include <ortc/IDTLSTransport.h>
+#include <ortc/IMediaDevices.h>
+#include <ortc/adapter/IPeerConnection.h>
+
+#include <zsLib/Log.h>
+#include <zsLib/SafeInt.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct Helper
+        {
+          typedef PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > PromiseWithStatsReport;
+          ZS_DECLARE_PTR(PromiseWithStatsReport);
+
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrackTypes, IMediaStreamTrackTypes);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsProvider, IStatsProvider);
+
+          typedef list< ::ortc::IMediaStreamTrackPtr > MediaStreamTrackList;
+          ZS_DECLARE_PTR(MediaStreamTrackList);
+
+          typedef list< wrapper::org::ortc::MediaStreamTrackPtr > WrapperMediaStreamTrackList;
+          ZS_DECLARE_PTR(WrapperMediaStreamTrackList);
+
+          static zsLib::IMessageQueuePtr getGuiQueue();
+
+          static wrapper::org::ortc::log::Level toWrapper(zsLib::Log::Level level);
+          static zsLib::Log::Level toNative(wrapper::org::ortc::log::Level level);
+
+          static const char *toNative(wrapper::org::ortc::log::Component component);
+
+          static wrapper::org::ortc::MediaStreamTrackKind toWrapper(IMediaStreamTrackTypes::Kinds kind);
+          static IMediaStreamTrackTypes::Kinds toNative(wrapper::org::ortc::MediaStreamTrackKind kind);
+
+          static wrapper::org::ortc::MediaStreamTrackState toWrapper(IMediaStreamTrackTypes::States state);
+
+          static ::ortc::IMediaDevicesTypes::DeviceKinds toNative(wrapper::org::ortc::MediaDeviceKind kind);
+          static wrapper::org::ortc::MediaDeviceKind toWrapper(::ortc::IMediaDevicesTypes::DeviceKinds kind);
+
+          static ::ortc::IStatsReportTypes::StatsTypes toNative(wrapper::org::ortc::RTCStatsType type);
+          static wrapper::org::ortc::RTCStatsType toWrapper(::ortc::IStatsReportTypes::StatsTypes type);
+
+          static wrapper::org::ortc::RTCSctpTransportState toWrapper(::ortc::ISCTPTransportTypes::States state);
+          static wrapper::org::ortc::RTCDataChannelState toWrapper(::ortc::IDataChannelTypes::States state);
+
+          static wrapper::org::ortc::RTCIceCandidatePairState toWrapper(::ortc::IStatsReportTypes::StatsICECandidatePairStates state);
+
+          static wrapper::org::ortc::adapter::RTCPeerConnectionSignalingMode toWrapper(::ortc::adapter::IPeerConnectionTypes::SignalingModes mode);
+          static ::ortc::adapter::IPeerConnectionTypes::SignalingModes toNative(wrapper::org::ortc::adapter::RTCPeerConnectionSignalingMode mode);
+
+          static wrapper::org::ortc::adapter::RTCRtcpMuxPolicy toWrapper(::ortc::adapter::IPeerConnectionTypes::RTCPMuxPolicies policy);
+          static ::ortc::adapter::IPeerConnectionTypes::RTCPMuxPolicies toNative(wrapper::org::ortc::adapter::RTCRtcpMuxPolicy policy);
+
+          static wrapper::org::ortc::adapter::RTCBundlePolicy toWrapper(::ortc::adapter::IPeerConnectionTypes::BundlePolicies policy);
+          static ::ortc::adapter::IPeerConnectionTypes::BundlePolicies toNative(wrapper::org::ortc::adapter::RTCBundlePolicy policy);
+
+          static wrapper::org::ortc::adapter::RTCSignalingState toWrapper(::ortc::adapter::IPeerConnectionTypes::SignalingStates state);
+          static wrapper::org::ortc::adapter::RTCIceConnectionState toPeerConnectionWrapper(::ortc::IICETransportTypes::States state);
+          static wrapper::org::ortc::adapter::RTCPeerConnectionState toWrapper(::ortc::adapter::IPeerConnectionTypes::PeerConnectionStates state);
+
+          static wrapper::org::ortc::RTCIceGatherFilterPolicy toWrapper(::ortc::IICEGathererTypes::FilterPolicies policy);
+          static ::ortc::IICEGathererTypes::FilterPolicies toNative(wrapper::org::ortc::RTCIceGatherFilterPolicy policy);
+
+          static wrapper::org::ortc::RTCIceCredentialType toWrapper(::ortc::IICEGathererTypes::CredentialTypes policy);
+          static ::ortc::IICEGathererTypes::CredentialTypes toNative(wrapper::org::ortc::RTCIceCredentialType policy);
+
+          static wrapper::org::ortc::RTCIceGathererState toWrapper(::ortc::IICEGathererTypes::States state);
+          static ::ortc::IICEGathererTypes::States toNative(wrapper::org::ortc::RTCIceGathererState state);
+
+          static wrapper::org::ortc::RTCIceComponent toWrapper(::ortc::IICETypes::Components component);
+          static wrapper::org::ortc::RTCIceProtocol toWrapper(::ortc::IICETypes::Protocols protocol);
+          static wrapper::org::ortc::RTCIceCandidateType toWrapper(::ortc::IICETypes::CandidateTypes type);
+          static wrapper::org::ortc::RTCIceTcpCandidateType toWrapper(::ortc::IICETypes::TCPCandidateTypes type);
+
+          static wrapper::org::ortc::RTCIceTransportState toWrapper(::ortc::IICETransportTypes::States state);
+          static ::ortc::IICETransportTypes::States toNative(wrapper::org::ortc::RTCIceTransportState state);
+
+          static wrapper::org::ortc::RTCIceRole toWrapper(::ortc::IICETypes::Roles role);
+          static ::ortc::IICETypes::Roles toNative(wrapper::org::ortc::RTCIceRole role);
+
+          static wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsSignal toWrapper(::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signals signal);
+          static ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Signals toNative(wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsSignal signal);
+
+          static wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsApplication toWrapper(::ortc::IRTPTypes::OpusCodecCapabilityOptions::Applications application);
+          static ::ortc::IRTPTypes::OpusCodecCapabilityOptions::Applications toNative(wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsApplication application);
+
+          static wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP toWrapper(::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToPs top);
+          static ::ortc::IRTPTypes::FlexFECCodecCapabilityParameters::ToPs toNative(wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersToP top);
+
+          static wrapper::org::ortc::RTCRtpDegradationPreference toWrapper(::ortc::IRTPTypes::DegradationPreferences preference);
+          static ::ortc::IRTPTypes::DegradationPreferences toNative(wrapper::org::ortc::RTCRtpDegradationPreference preference);
+
+          static wrapper::org::ortc::RTCRtpPriorityType toWrapper(::ortc::IRTPTypes::PriorityTypes type);
+          static ::ortc::IRTPTypes::PriorityTypes toNative(wrapper::org::ortc::RTCRtpPriorityType type);
+
+          static wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType toWrapper(::ortc::adapter::ISessionDescriptionTypes::SignalingTypes type);
+          static ::ortc::adapter::ISessionDescriptionTypes::SignalingTypes toNative(wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType type);
+
+          static wrapper::org::ortc::RTCDtlsRole toWrapper(::ortc::IDTLSTransportTypes::Roles role);
+          static ::ortc::IDTLSTransportTypes::Roles toNative(wrapper::org::ortc::RTCDtlsRole role);
+
+          static wrapper::org::ortc::RTCDtlsTransportState toWrapper(::ortc::IDTLSTransportTypes::States state);
+          static ::ortc::IDTLSTransportTypes::States toNative(wrapper::org::ortc::RTCDtlsTransportState state);
+
+          static wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection toWrapper(::ortc::adapter::ISessionDescriptionTypes::MediaDirections direction);
+          static ::ortc::adapter::ISessionDescriptionTypes::MediaDirections toNative(wrapper::org::ortc::adapter::RTCSessionDescriptionMediaDirection direction);
+
+          static WrapperMediaStreamTrackListPtr toWrapper(MediaStreamTrackListPtr tracks);
+          static MediaStreamTrackListPtr toNative(WrapperMediaStreamTrackListPtr tracks);
+
+          static PromisePtr toWrapper(PromisePtr promise);
+          static void reject(
+                             PromisePtr nativePromise,
+                             PromisePtr wrapperPromise
+                             );
+
+          static PromiseWithStatsReportPtr getStats(IStatsProviderPtr native, wrapper::org::ortc::RTCStatsTypeSetPtr statTypes);
+
+          template <typename optionalType1, typename optionalType2>
+          static void optionalSafeIntConvert(const optionalType1 &inputType, optionalType2 &outputType)
+          {
+            outputType = inputType.hasValue() ? optionalType2(SafeInt<typename optionalType2::UseType>(inputType.value())) : optionalType2();
+          }
+
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_Json.cpp b/ortc/idl/wrapper/impl_org_ortc_Json.cpp
new file mode 100644
index 00000000..c7093f4d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Json.cpp
@@ -0,0 +1,73 @@
+
+#include "impl_org_ortc_Json.h"
+
+#include <zsLib/eventing/IHelper.h>
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(zsLib::eventing::IHelper, UseHelper);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::Json::Json()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::org::ortc::Json::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::Json>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::Json::~Json()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::Json::wrapper_init_org_ortc_Json(String jsonString)
+{
+  native_ = UseHelper::toJSON(jsonString);
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::Json::toString()
+{
+  if (!native_) return String();
+  return UseHelper::toString(native_);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::JsonPtr wrapper::impl::org::ortc::Json::toWrapper(zsLib::XML::ElementPtr rootEl)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::Json>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = rootEl;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+zsLib::XML::ElementPtr wrapper::impl::org::ortc::Json::toNative(wrapper::org::ortc::JsonPtr wrapper)
+{
+  if (!wrapper) return zsLib::XML::ElementPtr();
+  auto result = std::dynamic_pointer_cast<wrapper::impl::org::ortc::Json>(wrapper);
+  if (!result) return zsLib::XML::ElementPtr();
+  return result->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_Json.h b/ortc/idl/wrapper/impl_org_ortc_Json.h
new file mode 100644
index 00000000..4f9ad826
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Json.h
@@ -0,0 +1,34 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_Json.h"
+
+#include <zsLib/XML.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct Json : public wrapper::org::ortc::Json
+        {
+          JsonWeakPtr thisWeak_;
+          zsLib::XML::ElementPtr native_;
+
+          Json();
+          virtual ~Json();
+
+          // methods Json
+          virtual void wrapper_init_org_ortc_Json(String jsonString) override;
+          virtual String toString() override;
+
+          static JsonPtr toWrapper(zsLib::XML::ElementPtr rootEl);
+          static zsLib::XML::ElementPtr toNative(wrapper::org::ortc::JsonPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_Logger.cpp b/ortc/idl/wrapper/impl_org_ortc_Logger.cpp
new file mode 100644
index 00000000..0b6d85c3
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Logger.cpp
@@ -0,0 +1,208 @@
+
+#include "impl_org_ortc_Logger.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+#include <ortc/services/ILogger.h>
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+using namespace wrapper::impl::org::ortc;
+
+ZS_DECLARE_TYPEDEF_PTR(::ortc::services::ILogger, UseLogger);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::Logger::~Logger()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::setLogLevel(
+  wrapper::org::ortc::log::Component component,
+  wrapper::org::ortc::log::Level level
+  )
+{
+  UseLogger::setLogLevel(Helper::toNative(component), Helper::toNative(level));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::setLogLevel(
+  String component,
+  wrapper::org::ortc::log::Level level
+  )
+{
+  UseLogger::setLogLevel(component, Helper::toNative(level));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::installStdOutLogger(bool colorizeOutput)
+{
+  UseLogger::installStdOutLogger(colorizeOutput);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::installFileLogger(
+  String fileName,
+  bool colorizeOutput
+  )
+{
+  UseLogger::installFileLogger(fileName, colorizeOutput);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::installTelnetLogger(
+  uint16_t listenPort,
+  ::zsLib::Seconds maxWaitForSocketToBeAvailable,
+  bool colorizeOutput
+  )
+{
+  UseLogger::installTelnetLogger(listenPort, maxWaitForSocketToBeAvailable, colorizeOutput);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::installOutgoingTelnetLogger(
+  String serverHostWithPort,
+  bool colorizeOutput,
+  String sendStringUponConnection
+  )
+{
+  UseLogger::installOutgoingTelnetLogger(serverHostWithPort, colorizeOutput, sendStringUponConnection);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::installDebuggerLogger()
+{
+  UseLogger::installDebuggerLogger();
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::org::ortc::Logger::isTelnetLoggerListening()
+{
+  return UseLogger::isTelnetLoggerListening();
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::org::ortc::Logger::isTelnetLoggerConnected()
+{
+  return UseLogger::isTelnetLoggerConnected();
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::org::ortc::Logger::isOutgoingTelnetLoggerConnected()
+{
+  return UseLogger::isOutgoingTelnetLoggerConnected();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::uninstallStdOutLogger()
+{
+  UseLogger::uninstallStdOutLogger();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::uninstallFileLogger()
+{
+  UseLogger::uninstallFileLogger();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::uninstallTelnetLogger()
+{
+  UseLogger::uninstallTelnetLogger();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::uninstallOutgoingTelnetLogger()
+{
+  UseLogger::uninstallOutgoingTelnetLogger();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::uninstallDebuggerLogger()
+{
+  UseLogger::uninstallDebuggerLogger();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::setDefaultEventingLevel(
+  wrapper::org::ortc::log::Component component,
+  wrapper::org::ortc::log::Level level
+  )
+{
+  UseLogger::setDefaultEventingLevel(Helper::toNative(component), Helper::toNative(level));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::setDefaultEventingLevel(
+  String component,
+  wrapper::org::ortc::log::Level level
+  )
+{
+  UseLogger::setDefaultEventingLevel(component, Helper::toNative(level));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::setEventingLevel(
+  wrapper::org::ortc::log::Component component,
+  wrapper::org::ortc::log::Level level
+  )
+{
+  UseLogger::setEventingLevel(Helper::toNative(component), Helper::toNative(level));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::setEventingLevel(
+  String component,
+  wrapper::org::ortc::log::Level level
+  )
+{
+  UseLogger::setEventingLevel(component, Helper::toNative(level));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::installEventingListener(
+  String sharedSecret,
+  uint16_t listenPort,
+  ::zsLib::Seconds maxWaitForSocketToBeAvailable
+  )
+{
+  UseLogger::installEventingListener(listenPort, sharedSecret, maxWaitForSocketToBeAvailable);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::connectToEventingServer(
+  String sharedSecret,
+  String serverHostWithPort
+  )
+{
+  UseLogger::connectToEventingServer(serverHostWithPort, sharedSecret);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::uninstallEventingListener()
+{
+  UseLogger::uninstallEventingListener();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Logger::disconnectEventingServer()
+{
+  UseLogger::disconnectEventingServer();
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_Logger.h b/ortc/idl/wrapper/impl_org_ortc_Logger.h
new file mode 100644
index 00000000..bf4bcc35
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Logger.h
@@ -0,0 +1,22 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_Logger.h"
+
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct Logger : public wrapper::org::ortc::Logger
+        {
+          virtual ~Logger();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_LongRange.cpp b/ortc/idl/wrapper/impl_org_ortc_LongRange.cpp
new file mode 100644
index 00000000..01a25fdf
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_LongRange.cpp
@@ -0,0 +1,118 @@
+
+#include "impl_org_ortc_LongRange.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::LongRange::LongRange()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::LongRangePtr wrapper::org::ortc::LongRange::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::LongRange>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::LongRange::~LongRange()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::LongRange::wrapper_init_org_ortc_LongRange()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::LongRange::wrapper_init_org_ortc_LongRange(long value)
+{
+  min = max = value;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::LongRange::wrapper_init_org_ortc_LongRange(
+  long min,
+  long max
+  )
+{
+  this->min = min;
+  this->max = max;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::LongRange::wrapper_init_org_ortc_LongRange(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeCapabilityLong>(Json::toNative(json));
+
+  wrapper::org::ortc::LongRangePtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::LongRangePtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::LongRange::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("LongRange"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::LongRange::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::LongRangePtr wrapper::impl::org::ortc::LongRange::toWrapper(NativeCapabilityLongPtr native)
+{
+  if (!native) return LongRangePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::LongRangePtr wrapper::impl::org::ortc::LongRange::toWrapper(const NativeCapabilityLong &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::LongRange>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->min = native.mMin;
+  pThis->max = native.mMax;
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::LongRange::NativeCapabilityLongPtr wrapper::impl::org::ortc::LongRange::toNative(wrapper::org::ortc::LongRangePtr wrapper)
+{
+  if (!wrapper) return NativeCapabilityLongPtr();
+
+  auto result = make_shared<NativeCapabilityLong>();
+
+  result->mMin = wrapper->min;
+  result->mMax = wrapper->max;
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_LongRange.h b/ortc/idl/wrapper/impl_org_ortc_LongRange.h
new file mode 100644
index 00000000..5482b432
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_LongRange.h
@@ -0,0 +1,43 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_LongRange.h"
+
+
+#include <ortc/ICapabilities.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct LongRange : public wrapper::org::ortc::LongRange
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ICapabilities::CapabilityLong, NativeCapabilityLong);
+          LongRangeWeakPtr thisWeak_;
+
+          LongRange();
+          virtual ~LongRange();
+
+          // methods LongRange
+          virtual void wrapper_init_org_ortc_LongRange() override;
+          virtual void wrapper_init_org_ortc_LongRange(long value) override;
+          virtual void wrapper_init_org_ortc_LongRange(
+            long min,
+            long max
+            ) override;
+          virtual void wrapper_init_org_ortc_LongRange(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static LongRangePtr toWrapper(NativeCapabilityLongPtr native);
+          static LongRangePtr toWrapper(const NativeCapabilityLong &native);
+          static NativeCapabilityLongPtr toNative(wrapper::org::ortc::LongRangePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaControl.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaControl.cpp
new file mode 100644
index 00000000..151a253c
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaControl.cpp
@@ -0,0 +1,40 @@
+// Generated by zsLibEventingTool
+
+#include "impl_org_ortc_MediaControl.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaControl::~MediaControl()
+{
+}
+
+//------------------------------------------------------------------------------
+AnyPtr wrapper::org::ortc::MediaControl::get_displayOrientation()
+{
+  AnyPtr result {};
+  return result;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::MediaControl::set_displayOrientation(AnyPtr value)
+{
+}
+
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaControl.h b/ortc/idl/wrapper/impl_org_ortc_MediaControl.h
new file mode 100644
index 00000000..47171912
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaControl.h
@@ -0,0 +1,25 @@
+// Generated by zsLibEventingTool
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaControl.h"
+
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaControl : public wrapper::org::ortc::MediaControl
+        {
+          MediaControlWeakPtr thisWeak_;
+
+          virtual ~MediaControl();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaDeviceInfo.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaDeviceInfo.cpp
new file mode 100644
index 00000000..c14021a0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaDeviceInfo.cpp
@@ -0,0 +1,114 @@
+
+#include "impl_org_ortc_MediaDeviceInfo.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaDeviceInfo::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaDeviceInfo::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaDeviceInfo::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaDeviceInfo::MediaDeviceInfo()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaDeviceInfoPtr wrapper::org::ortc::MediaDeviceInfo::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaDeviceInfo>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaDeviceInfo::~MediaDeviceInfo()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaDeviceInfo::wrapper_init_org_ortc_MediaDeviceInfo()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaDeviceInfo::wrapper_init_org_ortc_MediaDeviceInfo(wrapper::org::ortc::MediaDeviceInfoPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaDeviceInfo::wrapper_init_org_ortc_MediaDeviceInfo(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::MediaDeviceInfo::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::MediaDeviceInfo::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->kind = Helper::toWrapper(native.mKind);
+  pThis->label = native.mLabel;
+  pThis->deviceId = native.mDeviceID;
+  pThis->groupId = native.mGroupID;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mKind = Helper::toNative(wrapper->kind);
+  result->mLabel = wrapper->label;
+  result->mDeviceID = wrapper->deviceId;
+  result->mGroupID = wrapper->groupId;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaDeviceInfo.h b/ortc/idl/wrapper/impl_org_ortc_MediaDeviceInfo.h
new file mode 100644
index 00000000..2bf22cdb
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaDeviceInfo.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaDeviceInfo.h"
+
+#include <ortc/IMediaDevices.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaDeviceInfo : public wrapper::org::ortc::MediaDeviceInfo
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaDevicesTypes::Device, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(MediaDeviceInfo, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::MediaDeviceInfo, WrapperType);
+          MediaDeviceInfoWeakPtr thisWeak_;
+
+          MediaDeviceInfo();
+          virtual ~MediaDeviceInfo();
+
+          // methods MediaDeviceInfo
+          virtual void wrapper_init_org_ortc_MediaDeviceInfo() override;
+          virtual void wrapper_init_org_ortc_MediaDeviceInfo(wrapper::org::ortc::MediaDeviceInfoPtr source) override;
+          virtual void wrapper_init_org_ortc_MediaDeviceInfo(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaDevices.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaDevices.cpp
new file mode 100644
index 00000000..81e79c9e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaDevices.cpp
@@ -0,0 +1,150 @@
+
+#include "impl_org_ortc_MediaDevices.h"
+#include "impl_org_ortc_MediaStreamConstraints.h"
+#include "impl_org_ortc_MediaStreamTrack.h"
+#include "impl_org_ortc_MediaDeviceInfo.h"
+#include "impl_org_ortc_MediaTrackSupportedConstraints.h"
+#include "impl_org_ortc_Helper.h"
+
+
+#include <zsLib/IHelper.h>
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaDevices::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaDevices::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaDevices::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaDevices::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaDevices::MediaDevices()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaDevicesPtr wrapper::org::ortc::MediaDevices::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaDevices>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaDevices::~MediaDevices()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaTrackSupportedConstraintsPtr wrapper::org::ortc::MediaDevices::getSupportedConstraints()
+{
+  return wrapper::impl::org::ortc::MediaTrackSupportedConstraints::toWrapper(NativeType::getSupportedConstraints());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< shared_ptr< list< wrapper::org::ortc::MediaDeviceInfoPtr > > > > wrapper::org::ortc::MediaDevices::enumerateDevices()
+{
+  ZS_DECLARE_TYPEDEF_PTR(PromiseWithHolderPtr< shared_ptr< list< wrapper::org::ortc::MediaDeviceInfoPtr > > >, PromiseWithType);
+
+  auto promise = NativeType::enumerateDevices();
+
+  auto result = PromiseWithType::create(wrapper::impl::org::ortc::Helper::getGuiQueue());
+
+  promise->thenClosure([promise, result] {
+    if (promise->isRejected()) {
+      wrapper::impl::org::ortc::Helper::reject(promise, result);
+      return;
+    }
+    auto wrapperList = make_shared< list< wrapper::org::ortc::MediaDeviceInfoPtr > >();
+    auto nativeList = promise->value();
+    for (auto iter = nativeList->begin(); iter != nativeList->end(); ++iter) {
+      auto wrapper = wrapper::impl::org::ortc::MediaDeviceInfo::toWrapper(*iter);
+      if (!wrapper) continue;
+      wrapperList->push_back(wrapper);
+    }
+
+    result->resolve(wrapperList);
+  });
+  promise->background();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< shared_ptr< list< wrapper::org::ortc::MediaStreamTrackPtr > > > > wrapper::org::ortc::MediaDevices::getUserMedia(wrapper::org::ortc::MediaStreamConstraintsPtr constraints)
+{
+  ZS_DECLARE_TYPEDEF_PTR(PromiseWithHolderPtr< shared_ptr< list< wrapper::org::ortc::MediaStreamTrackPtr > > >, PromiseWithType);
+
+  auto native = wrapper::impl::org::ortc::MediaStreamConstraints::toNative(constraints);
+  if (!native) return PromiseWithType::createRejected(wrapper::impl::org::ortc::Helper::getGuiQueue());
+  auto promise = NativeType::getUserMedia(*native);
+
+  auto result = PromiseWithType::create(wrapper::impl::org::ortc::Helper::getGuiQueue());
+
+  promise->thenClosure([promise, result] {
+    if (promise->isRejected()) {
+      wrapper::impl::org::ortc::Helper::reject(promise, result);
+      return;
+    }
+    auto wrapperList = make_shared< list< wrapper::org::ortc::MediaStreamTrackPtr > >();
+    auto nativeList = promise->value();
+    for (auto iter = nativeList->begin(); iter != nativeList->end(); ++iter) {
+      auto wrapper = wrapper::impl::org::ortc::MediaStreamTrack::toWrapper(*iter);
+      if (!wrapper) continue;
+      wrapperList->push_back(wrapper);
+    }
+
+    result->resolve(wrapperList);
+  });
+  promise->background();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaDevicesPtr wrapper::org::ortc::MediaDevices::get_singleton()
+{
+  zsLib::AutoRecursiveLock lock(*zsLib::IHelper::getGlobalLock());
+  static zsLib::SingletonLazySharedPtr<MediaDevices> singleton(wrapper_create());
+  auto result = singleton.singleton();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaDevices::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onMediaDevicesChanged()
+{
+  onDeviceChange();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = ::ortc::IMediaDevices::subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaDevices.h b/ortc/idl/wrapper/impl_org_ortc_MediaDevices.h
new file mode 100644
index 00000000..6e1e69a9
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaDevices.h
@@ -0,0 +1,42 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaDevices.h"
+
+#include <ortc/IMediaDevices.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaDevices : public wrapper::org::ortc::MediaDevices,
+                              public ::ortc::IMediaDevicesDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaDevices, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaDevices, IMediaDevices);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaDevicesSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(MediaDevices, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::MediaDevices, WrapperType);
+          MediaDevicesWeakPtr thisWeak_;
+          //NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          NativeTypeSubscriptionPtr subscription_;
+
+          MediaDevices();
+          virtual ~MediaDevices();
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          virtual void onMediaDevicesChanged() override;
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaSource.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaSource.cpp
new file mode 100644
index 00000000..2751c6f0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaSource.cpp
@@ -0,0 +1,76 @@
+
+#include "impl_org_ortc_MediaSource.h"
+#include "impl_org_ortc_MediaStreamTrack.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaSource::MediaSource()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaSourcePtr wrapper::org::ortc::MediaSource::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaSource>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaSource::~MediaSource()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaSource::wrapper_init_org_ortc_MediaSource()
+{
+}
+
+//------------------------------------------------------------------------------
+AnyPtr wrapper::impl::org::ortc::MediaSource::get_source()
+{
+  zsLib::AutoLock lock(lock_);
+  return source_;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaSource::set_source(AnyPtr value)
+{
+  zsLib::AutoLock lock(lock_);
+  source_ = value;
+}
+
+//------------------------------------------------------------------------------
+AnyPtr wrapper::impl::org::ortc::MediaSource::get_track()
+{
+  auto holder = make_shared < AnyHolder< ::ortc::IMediaStreamTrackPtr > > ();
+  holder->value_ = MediaStreamTrack::toNative(track_);
+  return holder;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaSourcePtr wrapper::impl::org::ortc::MediaSource::createWithTrack(MediaStreamTrackPtr track)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaSource>();
+  pThis->thisWeak_ = pThis;
+  pThis->track_ = track;
+  pThis->wrapper_init_org_ortc_MediaSource();
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaSource.h b/ortc/idl/wrapper/impl_org_ortc_MediaSource.h
new file mode 100644
index 00000000..49fce987
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaSource.h
@@ -0,0 +1,38 @@
+// Generated by zsLibEventingTool
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaSource.h"
+
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaSource : public wrapper::org::ortc::MediaSource
+        {
+          MediaSourceWeakPtr thisWeak_;
+          MediaStreamTrackPtr track_;
+
+          zsLib::Lock lock_;
+          AnyPtr source_;
+
+          MediaSource();
+          virtual ~MediaSource();
+          virtual void wrapper_init_org_ortc_MediaSource() override;
+
+          // properties MediaSource
+          virtual AnyPtr get_source() override;
+          virtual void set_source(AnyPtr value) override;
+          virtual AnyPtr get_track() override;
+
+          static MediaSourcePtr createWithTrack(MediaStreamTrackPtr track);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaStreamConstraints.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaStreamConstraints.cpp
new file mode 100644
index 00000000..98addb19
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaStreamConstraints.cpp
@@ -0,0 +1,122 @@
+
+#include "impl_org_ortc_MediaStreamConstraints.h"
+#include "impl_org_ortc_MediaTrackConstraints.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaStreamConstraints::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaStreamConstraints::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaStreamConstraints::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaStreamConstraints::MediaStreamConstraints()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaStreamConstraintsPtr wrapper::org::ortc::MediaStreamConstraints::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaStreamConstraints>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaStreamConstraints::~MediaStreamConstraints()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaStreamConstraints::wrapper_init_org_ortc_MediaStreamConstraints()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaStreamConstraints::wrapper_init_org_ortc_MediaStreamConstraints(wrapper::org::ortc::MediaStreamConstraintsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaStreamConstraints::wrapper_init_org_ortc_MediaStreamConstraints(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::MediaStreamConstraints::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::MediaStreamConstraints::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  if (native.mAudio) {
+    pThis->audio = MediaTrackConstraints::toWrapper(native.mAudio);
+  }
+  if (native.mVideo) {
+    pThis->video = MediaTrackConstraints::toWrapper(native.mVideo);
+  }
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  if (wrapper->audio.hasValue()) {
+    if (wrapper->audio.value()) {
+      result->mAudio = MediaTrackConstraints::toNative(wrapper->audio.value());
+    }
+  }
+  if (wrapper->video.hasValue()) {
+    if (wrapper->video.value()) {
+      result->mVideo = MediaTrackConstraints::toNative(wrapper->video.value());
+    }
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaStreamConstraints.h b/ortc/idl/wrapper/impl_org_ortc_MediaStreamConstraints.h
new file mode 100644
index 00000000..eb15a1bf
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaStreamConstraints.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaStreamConstraints.h"
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaStreamConstraints : public wrapper::org::ortc::MediaStreamConstraints
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrackTypes::Constraints, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(MediaStreamConstraints, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::MediaStreamConstraints, WrapperType);
+          MediaStreamConstraintsWeakPtr thisWeak_;
+
+          MediaStreamConstraints();
+          virtual ~MediaStreamConstraints();
+
+          // methods MediaStreamConstraints
+          virtual void wrapper_init_org_ortc_MediaStreamConstraints() override;
+          virtual void wrapper_init_org_ortc_MediaStreamConstraints(wrapper::org::ortc::MediaStreamConstraintsPtr source) override;
+          virtual void wrapper_init_org_ortc_MediaStreamConstraints(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaStreamTrack.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaStreamTrack.cpp
new file mode 100644
index 00000000..e47fc02c
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaStreamTrack.cpp
@@ -0,0 +1,239 @@
+
+#include "impl_org_ortc_MediaStreamTrack.h"
+#include "impl_org_ortc_MediaTrackCapabilities.h"
+#include "impl_org_ortc_MediaTrackConstraints.h"
+#include "impl_org_ortc_MediaTrackSettings.h"
+#include "impl_org_ortc_MediaSource.h"
+#include "impl_org_ortc_OverconstrainedError.h"
+#include "impl_org_ortc_OverconstrainedErrorEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaStreamTrack::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaStreamTrack::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaStreamTrack::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaStreamTrack::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaStreamTrack::MediaStreamTrack()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaStreamTrackPtr wrapper::org::ortc::MediaStreamTrack::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaStreamTrack>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaStreamTrack::~MediaStreamTrack()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaStreamTrackPtr wrapper::impl::org::ortc::MediaStreamTrack::clone()
+{
+  return toWrapper(native_->clone());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaStreamTrack::stop()
+{
+  return native_->stop();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaTrackCapabilitiesPtr wrapper::impl::org::ortc::MediaStreamTrack::getCapabilities()
+{
+  return MediaTrackCapabilities::toWrapper(native_->getCapabilities());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaTrackConstraintsPtr wrapper::impl::org::ortc::MediaStreamTrack::getConstraints()
+{
+  return MediaTrackConstraints::toWrapper(native_->getConstraints());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaTrackSettingsPtr wrapper::impl::org::ortc::MediaStreamTrack::getSettings()
+{
+  return MediaTrackSettings::toWrapper(native_->getSettings());
+}
+
+//------------------------------------------------------------------------------
+PromisePtr wrapper::impl::org::ortc::MediaStreamTrack::applyConstraints(wrapper::org::ortc::MediaTrackConstraintsPtr constraints)
+{
+  ZS_THROW_INVALID_ARGUMENT_IF(!constraints);
+
+  return Helper::toWrapper(native_->applyConstraints(*MediaTrackConstraints::toNative(constraints)));
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::MediaStreamTrack::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaStreamTrackKind wrapper::impl::org::ortc::MediaStreamTrack::get_kind()
+{
+  return Helper::toWrapper(native_->kind());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::MediaStreamTrack::get_id()
+{
+  return native_->id();
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::MediaStreamTrack::get_deviceId()
+{
+  return native_->deviceID();
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::MediaStreamTrack::get_label()
+{
+  return native_->label();
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::MediaStreamTrack::get_enabled()
+{
+  return native_->enabled();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaStreamTrack::set_enabled(bool value)
+{
+  native_->enabled(value);
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::MediaStreamTrack::get_muted()
+{
+  return native_->muted();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaStreamTrack::set_muted(bool value)
+{
+  native_->muted(value);
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::MediaStreamTrack::get_remote()
+{
+  return native_->remote();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaStreamTrackState wrapper::impl::org::ortc::MediaStreamTrack::get_readyState()
+{
+  return Helper::toWrapper(native_->readyState());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaSourcePtr wrapper::impl::org::ortc::MediaStreamTrack::get_source()
+{
+  zsLib::AutoLock lock(lock_);
+  if (mediaSource_) return mediaSource_;
+
+  mediaSource_ = MediaSource::createWithTrack(thisWeak_.lock());
+  return mediaSource_;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaStreamTrack::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaStreamTrack::onMediaStreamTrackMute(
+                                                                        IMediaStreamTrackPtr track,
+                                                                        bool isMuted
+                                                                        )
+{
+  if (isMuted) {
+    onMute();
+  } else {
+    onUnmute();
+  }
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaStreamTrack::onMediaStreamTrackEnded(IMediaStreamTrackPtr track)
+{
+  onEnded();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaStreamTrack::onMediaStreamTrackOverConstrained(
+                                                                                   IMediaStreamTrackPtr track,
+                                                                                   OverconstrainedErrorPtr error
+                                                                                   )
+{
+  onOverConstrained(OverconstrainedErrorEvent::toWrapper(wrapper::impl::org::ortc::OverconstrainedError::toWrapper(error)));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaStreamTrack.h b/ortc/idl/wrapper/impl_org_ortc_MediaStreamTrack.h
new file mode 100644
index 00000000..b4a1b0d2
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaStreamTrack.h
@@ -0,0 +1,81 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaStreamTrack.h"
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaStreamTrack : public wrapper::org::ortc::MediaStreamTrack,
+                                  public ::ortc::IMediaStreamTrackDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrack, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrack, IMediaStreamTrack);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrackSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(MediaStreamTrack, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::MediaStreamTrack, WrapperType);
+
+          MediaStreamTrackWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_ {true};
+          NativeTypeSubscriptionPtr subscription_;
+          MediaSourcePtr mediaSource_;
+
+          MediaStreamTrack();
+          virtual ~MediaStreamTrack();
+
+          // methods MediaStreamTrack
+          virtual wrapper::org::ortc::MediaStreamTrackPtr clone() override;
+          virtual void stop() override;
+          virtual wrapper::org::ortc::MediaTrackCapabilitiesPtr getCapabilities() override;
+          virtual wrapper::org::ortc::MediaTrackConstraintsPtr getConstraints() override;
+          virtual wrapper::org::ortc::MediaTrackSettingsPtr getSettings() override;
+          virtual PromisePtr applyConstraints(wrapper::org::ortc::MediaTrackConstraintsPtr constraints) override;
+
+          // properties MediaStreamTrack
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::MediaStreamTrackKind get_kind() override;
+          virtual String get_id() override;
+          virtual String get_deviceId() override;
+          virtual String get_label() override;
+          virtual bool get_enabled() override;
+          virtual void set_enabled(bool value) override;
+          virtual bool get_muted() override;
+          virtual void set_muted(bool value) override;
+          virtual bool get_remote() override;
+          virtual wrapper::org::ortc::MediaStreamTrackState get_readyState() override;
+          virtual wrapper::org::ortc::MediaSourcePtr get_source() override;
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          // IMediaStreamTrackDelegate
+          virtual void onMediaStreamTrackMute(
+                                              IMediaStreamTrackPtr track,
+                                              bool isMuted
+                                              ) override;
+
+          virtual void onMediaStreamTrackEnded(IMediaStreamTrackPtr track) override;
+          virtual void onMediaStreamTrackOverConstrained(
+                                                         IMediaStreamTrackPtr track,
+                                                         OverconstrainedErrorPtr error
+                                                         ) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaTrackCapabilities.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaTrackCapabilities.cpp
new file mode 100644
index 00000000..cc95001d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaTrackCapabilities.cpp
@@ -0,0 +1,212 @@
+
+#include "impl_org_ortc_MediaTrackCapabilities.h"
+#include "impl_org_ortc_LongRange.h"
+#include "impl_org_ortc_DoubleRange.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackCapabilities::MediaTrackCapabilities()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaTrackCapabilitiesPtr wrapper::org::ortc::MediaTrackCapabilities::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaTrackCapabilities>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackCapabilities::~MediaTrackCapabilities()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackCapabilities::wrapper_init_org_ortc_MediaTrackCapabilities()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackCapabilities::wrapper_init_org_ortc_MediaTrackCapabilities(wrapper::org::ortc::MediaTrackCapabilitiesPtr source)
+{
+  wrapper::org::ortc::MediaTrackCapabilitiesPtr pThis = thisWeak_.lock();
+  wrapper::org::ortc::MediaTrackCapabilitiesPtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackCapabilities::wrapper_init_org_ortc_MediaTrackCapabilities(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  wrapper::org::ortc::MediaTrackCapabilitiesPtr wrapper = toWrapper(make_shared<NativeCapabilities>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  wrapper::org::ortc::MediaTrackCapabilitiesPtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::MediaTrackCapabilities::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::MediaTrackCapabilities::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackCapabilitiesPtr wrapper::impl::org::ortc::MediaTrackCapabilities::toWrapper(NativeCapabilitiesPtr native)
+{
+  if (!native) return MediaTrackCapabilitiesPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackCapabilitiesPtr wrapper::impl::org::ortc::MediaTrackCapabilities::toWrapper(const NativeCapabilities &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaTrackCapabilities>();
+  pThis->thisWeak_ = pThis;
+
+  if (native.mWidth.hasValue()) {
+    pThis->width = LongRange::toWrapper(native.mWidth.value());
+  }
+  if (native.mHeight.hasValue()) {
+    pThis->height = LongRange::toWrapper(native.mHeight.value());
+  }
+  if (native.mAspectRatio.hasValue()) {
+    pThis->aspectRatio = DoubleRange::toWrapper(native.mAspectRatio.value());
+  }
+  if (native.mFrameRate.hasValue()) {
+    pThis->frameRate = DoubleRange::toWrapper(native.mFrameRate.value());
+  }
+  if (native.mFacingMode.hasValue()) {
+    pThis->facingMode = make_shared<  list< String > >();
+    for (auto iter = native.mFacingMode.value().begin(); iter != native.mFacingMode.value().end(); ++iter)
+    {
+      pThis->facingMode->push_back(*iter);
+    }
+  }
+  if (native.mVolume.hasValue()) {
+    pThis->volume = DoubleRange::toWrapper(native.mVolume.value());
+  }
+  if (native.mSampleRate.hasValue()) {
+    pThis->sampleRate = LongRange::toWrapper(native.mSampleRate.value());
+  }
+  if (native.mSampleSize.hasValue()) {
+    pThis->sampleSize = LongRange::toWrapper(native.mSampleSize.value());
+  }
+  if (native.mEchoCancellation.hasValue()) {
+    pThis->echoCancellation = make_shared< list< bool > >();
+    for (auto iter = native.mEchoCancellation.value().begin(); iter != native.mEchoCancellation.value().end(); ++iter)
+    {
+      pThis->echoCancellation->push_back(*iter);
+    }
+  }
+  if (native.mLatency.hasValue()) {
+    pThis->latency = DoubleRange::toWrapper(native.mLatency.value());
+  }
+  if (native.mChannelCount.hasValue()) {
+    pThis->channelCount = LongRange::toWrapper(native.mChannelCount.value());
+  }
+  pThis->deviceId = native.mDeviceID;
+  pThis->groupId = native.mGroupID;
+  
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackCapabilities::NativeCapabilitiesPtr wrapper::impl::org::ortc::MediaTrackCapabilities::toNative(wrapper::org::ortc::MediaTrackCapabilitiesPtr wrapper)
+{
+  if (!wrapper) return NativeCapabilitiesPtr();
+
+  auto native = make_shared< NativeCapabilities >();
+
+  if (wrapper->width.hasValue()) {
+    if (wrapper->width.value()) {
+      native->mWidth = *LongRange::toNative(wrapper->width);
+    }
+  }
+  if (wrapper->height.hasValue()) {
+    if (wrapper->height.value()) {
+      native->mHeight = *LongRange::toNative(wrapper->height);
+    }
+  }
+  if (wrapper->aspectRatio.hasValue()) {
+    if (wrapper->aspectRatio.value()) {
+      native->mAspectRatio = *DoubleRange::toNative(wrapper->aspectRatio);
+    }
+  }
+  if (wrapper->frameRate.hasValue()) {
+    if (wrapper->frameRate.value()) {
+      native->mFrameRate = *DoubleRange::toNative(wrapper->frameRate);
+    }
+  }
+  if (wrapper->facingMode) {
+    auto value = make_shared<NativeCapabilityString>();
+    for (auto iter = wrapper->facingMode->begin(); iter != wrapper->facingMode->end(); ++iter) {
+      value->insert(*iter);
+    }
+    native->mFacingMode = *value;
+  }
+  if (wrapper->volume.hasValue()) {
+    if (wrapper->volume.value()) {
+      native->mVolume = *DoubleRange::toNative(wrapper->volume);
+    }
+  }
+  if (wrapper->sampleRate.hasValue()) {
+    if (wrapper->sampleRate.value()) {
+      native->mSampleRate = *LongRange::toNative(wrapper->sampleRate);
+    }
+  }
+  if (wrapper->sampleSize.hasValue()) {
+    if (wrapper->sampleSize.value()) {
+      native->mSampleSize = *LongRange::toNative(wrapper->sampleSize);
+    }
+  }
+  if (wrapper->echoCancellation) {
+    auto value = make_shared<NativeCapabilityBoolean>();
+    for (auto iter = wrapper->echoCancellation->begin(); iter != wrapper->echoCancellation->end(); ++iter) {
+      value->insert(*iter);
+    }
+    native->mEchoCancellation = *value;
+  }
+  if (wrapper->latency.hasValue()) {
+    if (wrapper->latency.value()) {
+      native->mLatency = *DoubleRange::toNative(wrapper->latency);
+    }
+  }
+  if (wrapper->channelCount.hasValue()) {
+    if (wrapper->channelCount.value()) {
+      native->mChannelCount = *LongRange::toNative(wrapper->channelCount);
+    }
+  }
+
+  native->mDeviceID = wrapper->deviceId;
+  native->mGroupID = wrapper->groupId;
+
+  return native;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaTrackCapabilities.h b/ortc/idl/wrapper/impl_org_ortc_MediaTrackCapabilities.h
new file mode 100644
index 00000000..39ee9206
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaTrackCapabilities.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaTrackCapabilities.h"
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaTrackCapabilities : public wrapper::org::ortc::MediaTrackCapabilities
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrackTypes::Capabilities, NativeCapabilities);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ICapabilities::CapabilityString, NativeCapabilityString);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ICapabilities::CapabilityBoolean, NativeCapabilityBoolean);
+          
+          MediaTrackCapabilitiesWeakPtr thisWeak_;
+
+          MediaTrackCapabilities();
+          virtual ~MediaTrackCapabilities();
+
+          // methods MediaTrackCapabilities
+          virtual void wrapper_init_org_ortc_MediaTrackCapabilities() override;
+          virtual void wrapper_init_org_ortc_MediaTrackCapabilities(wrapper::org::ortc::MediaTrackCapabilitiesPtr source) override;
+          virtual void wrapper_init_org_ortc_MediaTrackCapabilities(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static MediaTrackCapabilitiesPtr toWrapper(NativeCapabilitiesPtr native);
+          static MediaTrackCapabilitiesPtr toWrapper(const NativeCapabilities &native);
+          static NativeCapabilitiesPtr toNative(wrapper::org::ortc::MediaTrackCapabilitiesPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraintSet.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraintSet.cpp
new file mode 100644
index 00000000..662d7859
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraintSet.cpp
@@ -0,0 +1,169 @@
+
+#include "impl_org_ortc_MediaTrackConstraintSet.h"
+#include "impl_org_ortc_ConstrainLong.h"
+#include "impl_org_ortc_ConstrainDouble.h"
+#include "impl_org_ortc_ConstrainString.h"
+#include "impl_org_ortc_ConstrainBoolean.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackConstraintSet::MediaTrackConstraintSet()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaTrackConstraintSetPtr wrapper::org::ortc::MediaTrackConstraintSet::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaTrackConstraintSet>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackConstraintSet::~MediaTrackConstraintSet()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackConstraintSet::wrapper_init_org_ortc_MediaTrackConstraintSet()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackConstraintSet::wrapper_init_org_ortc_MediaTrackConstraintSet(wrapper::org::ortc::MediaTrackConstraintSetPtr source)
+{
+  if (!source) return;
+  wrapper::org::ortc::MediaTrackConstraintSetPtr pThis = thisWeak_.lock();
+
+  auto native = toNative(source);
+  if (!native) return;
+
+  wrapper::org::ortc::MediaTrackConstraintSetPtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackConstraintSet::wrapper_init_org_ortc_MediaTrackConstraintSet(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeConstraintSet>(Json::toNative(json));
+
+  wrapper::org::ortc::MediaTrackConstraintSetPtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::MediaTrackConstraintSetPtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::MediaTrackConstraintSet::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::MediaTrackConstraintSet::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackConstraintSetPtr wrapper::impl::org::ortc::MediaTrackConstraintSet::toWrapper(NativeConstraintSetPtr native)
+{
+  if (!native) return MediaTrackConstraintSetPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackConstraintSetPtr wrapper::impl::org::ortc::MediaTrackConstraintSet::toWrapper(const NativeConstraintSet &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaTrackConstraintSet>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->width = ConstrainLong::toWrapper(native.mWidth);
+  pThis->height = ConstrainLong::toWrapper(native.mHeight);
+  pThis->aspectRatio = ConstrainDouble::toWrapper(native.mAspectRatio);
+  pThis->frameRate = ConstrainDouble::toWrapper(native.mFrameRate);
+  pThis->facingMode = ConstrainString::toWrapper(native.mFacingMode);
+  pThis->volume = ConstrainDouble::toWrapper(native.mVolume);
+  pThis->sampleRate = ConstrainLong::toWrapper(native.mSampleRate);
+  pThis->sampleSize = ConstrainLong::toWrapper(native.mSampleSize);
+  pThis->echoCancellation = ConstrainBoolean::toWrapper(native.mEchoCancellation);
+  pThis->latency = ConstrainDouble::toWrapper(native.mLatency);
+  pThis->channelCount = ConstrainLong::toWrapper(native.mChannelCount);
+  pThis->deviceId = ConstrainString::toWrapper(native.mDeviceID);
+  pThis->groupId = ConstrainString::toWrapper(native.mGroupID);
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackConstraintSet::NativeConstraintSetPtr wrapper::impl::org::ortc::MediaTrackConstraintSet::toNative(wrapper::org::ortc::MediaTrackConstraintSetPtr wrapper)
+{
+  if (!wrapper) return NativeConstraintSetPtr();
+  
+  auto result = make_shared<NativeConstraintSet>();
+
+  if (wrapper->width) {
+    result->mWidth = *ConstrainLong::toNative(wrapper->width);
+  }
+  if (wrapper->height) {
+    result->mHeight = *ConstrainLong::toNative(wrapper->height);
+  }
+  if (wrapper->aspectRatio) {
+    result->mAspectRatio = *ConstrainDouble::toNative(wrapper->aspectRatio);
+  }
+  if (wrapper->frameRate) {
+    result->mFrameRate = *ConstrainDouble::toNative(wrapper->frameRate);
+  }
+  if (wrapper->facingMode) {
+    result->mFacingMode = *ConstrainString::toNative(wrapper->facingMode);
+  }
+  if (wrapper->volume) {
+    result->mVolume = *ConstrainDouble::toNative(wrapper->volume);
+  }
+  if (wrapper->sampleRate) {
+    result->mSampleRate = *ConstrainLong::toNative(wrapper->sampleRate);
+  }
+  if (wrapper->sampleSize) {
+    result->mSampleSize = *ConstrainLong::toNative(wrapper->sampleSize);
+  }
+  if (wrapper->echoCancellation) {
+    result->mEchoCancellation = *ConstrainBoolean::toNative(wrapper->echoCancellation);
+  }
+  if (wrapper->latency) {
+    result->mLatency = *ConstrainDouble::toNative(wrapper->latency);
+  }
+  if (wrapper->channelCount) {
+    result->mChannelCount = *ConstrainLong::toNative(wrapper->channelCount);
+  }
+  if (wrapper->deviceId) {
+    result->mDeviceID = *ConstrainString::toNative(wrapper->deviceId);
+  }
+  if (wrapper->groupId) {
+    result->mGroupID = *ConstrainString::toNative(wrapper->groupId);
+  }
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraintSet.h b/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraintSet.h
new file mode 100644
index 00000000..aef17194
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraintSet.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaTrackConstraintSet.h"
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaTrackConstraintSet : public wrapper::org::ortc::MediaTrackConstraintSet
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrackTypes::ConstraintSet, NativeConstraintSet);
+
+          MediaTrackConstraintSetWeakPtr thisWeak_;
+
+          MediaTrackConstraintSet();
+          virtual ~MediaTrackConstraintSet();
+
+          // methods MediaTrackConstraintSet
+          virtual void wrapper_init_org_ortc_MediaTrackConstraintSet() override;
+          virtual void wrapper_init_org_ortc_MediaTrackConstraintSet(wrapper::org::ortc::MediaTrackConstraintSetPtr source) override;
+          virtual void wrapper_init_org_ortc_MediaTrackConstraintSet(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static MediaTrackConstraintSetPtr toWrapper(NativeConstraintSetPtr native);
+          static MediaTrackConstraintSetPtr toWrapper(const NativeConstraintSet &native);
+          static NativeConstraintSetPtr toNative(wrapper::org::ortc::MediaTrackConstraintSetPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraints.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraints.cpp
new file mode 100644
index 00000000..d3bd3805
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraints.cpp
@@ -0,0 +1,187 @@
+
+#include "impl_org_ortc_MediaTrackConstraints.h"
+#include "impl_org_ortc_MediaTrackConstraintSet.h"
+#include "impl_org_ortc_ConstrainLong.h"
+#include "impl_org_ortc_ConstrainDouble.h"
+#include "impl_org_ortc_ConstrainString.h"
+#include "impl_org_ortc_ConstrainBoolean.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackConstraints::MediaTrackConstraints()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaTrackConstraintsPtr wrapper::org::ortc::MediaTrackConstraints::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaTrackConstraints>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackConstraints::~MediaTrackConstraints()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::MediaTrackConstraints::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::MediaTrackConstraints::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackConstraints::wrapper_init_org_ortc_MediaTrackConstraints()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackConstraints::wrapper_init_org_ortc_MediaTrackConstraints(wrapper::org::ortc::MediaTrackConstraintsPtr source)
+{
+  if (!source) return;
+  wrapper::org::ortc::MediaTrackConstraintsPtr pThis = thisWeak_.lock();
+
+  auto native = toNative(source);
+  if (!native) return;
+
+  wrapper::org::ortc::MediaTrackConstraintsPtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackConstraints::wrapper_init_org_ortc_MediaTrackConstraints(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeTrackConstraints>(Json::toNative(json));
+
+  wrapper::org::ortc::MediaTrackConstraintsPtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::MediaTrackConstraintsPtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackConstraintsPtr wrapper::impl::org::ortc::MediaTrackConstraints::toWrapper(NativeTrackConstraintsPtr native)
+{
+  if (!native) return MediaTrackConstraintsPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackConstraintsPtr wrapper::impl::org::ortc::MediaTrackConstraints::toWrapper(const NativeTrackConstraints &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaTrackConstraints>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->width = ConstrainLong::toWrapper(native.mWidth);
+  pThis->height = ConstrainLong::toWrapper(native.mHeight);
+  pThis->aspectRatio = ConstrainDouble::toWrapper(native.mAspectRatio);
+  pThis->frameRate = ConstrainDouble::toWrapper(native.mFrameRate);
+  pThis->facingMode = ConstrainString::toWrapper(native.mFacingMode);
+  pThis->volume = ConstrainDouble::toWrapper(native.mVolume);
+  pThis->sampleRate = ConstrainLong::toWrapper(native.mSampleRate);
+  pThis->sampleSize = ConstrainLong::toWrapper(native.mSampleSize);
+  pThis->echoCancellation = ConstrainBoolean::toWrapper(native.mEchoCancellation);
+  pThis->latency = ConstrainDouble::toWrapper(native.mLatency);
+  pThis->channelCount = ConstrainLong::toWrapper(native.mChannelCount);
+  pThis->deviceId = ConstrainString::toWrapper(native.mDeviceID);
+  pThis->groupId = ConstrainString::toWrapper(native.mGroupID);
+
+  pThis->advanced = make_shared< list< wrapper::org::ortc::MediaTrackConstraintSetPtr > >();
+
+  for (auto iter = native.mAdvanced.begin(); iter != native.mAdvanced.end(); ++iter)
+  {
+    auto wrapper = wrapper::impl::org::ortc::MediaTrackConstraintSet::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->advanced->push_back(wrapper);
+  }
+
+  return pThis;
+}
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackConstraints::NativeTrackConstraintsPtr wrapper::impl::org::ortc::MediaTrackConstraints::toNative(wrapper::org::ortc::MediaTrackConstraintsPtr wrapper)
+{
+  if (!wrapper) return NativeTrackConstraintsPtr();
+
+  auto result = make_shared<NativeTrackConstraints>();
+
+  if (wrapper->width) {
+    result->mWidth = *ConstrainLong::toNative(wrapper->width);
+  }
+  if (wrapper->height) {
+    result->mHeight = *ConstrainLong::toNative(wrapper->height);
+  }
+  if (wrapper->aspectRatio) {
+    result->mAspectRatio = *ConstrainDouble::toNative(wrapper->aspectRatio);
+  }
+  if (wrapper->frameRate) {
+    result->mFrameRate = *ConstrainDouble::toNative(wrapper->frameRate);
+  }
+  if (wrapper->facingMode) {
+    result->mFacingMode = *ConstrainString::toNative(wrapper->facingMode);
+  }
+  if (wrapper->volume) {
+    result->mVolume = *ConstrainDouble::toNative(wrapper->volume);
+  }
+  if (wrapper->sampleRate) {
+    result->mSampleRate = *ConstrainLong::toNative(wrapper->sampleRate);
+  }
+  if (wrapper->sampleSize) {
+    result->mSampleSize = *ConstrainLong::toNative(wrapper->sampleSize);
+  }
+  if (wrapper->echoCancellation) {
+    result->mEchoCancellation = *ConstrainBoolean::toNative(wrapper->echoCancellation);
+  }
+  if (wrapper->latency) {
+    result->mLatency = *ConstrainDouble::toNative(wrapper->latency);
+  }
+  if (wrapper->channelCount) {
+    result->mChannelCount = *ConstrainLong::toNative(wrapper->channelCount);
+  }
+  if (wrapper->deviceId) {
+    result->mDeviceID = *ConstrainString::toNative(wrapper->deviceId);
+  }
+  if (wrapper->groupId) {
+    result->mGroupID = *ConstrainString::toNative(wrapper->groupId);
+  }
+
+  if (wrapper->advanced) {
+    for (auto iter = wrapper->advanced->begin(); iter != wrapper->advanced->end(); ++iter)
+    {
+      auto native = wrapper::impl::org::ortc::MediaTrackConstraintSet::toNative(*iter);
+      if (!native) continue;
+      result->mAdvanced.push_back(native);
+    }
+  }
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraints.h b/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraints.h
new file mode 100644
index 00000000..b175cc2a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaTrackConstraints.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaTrackConstraints.h"
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaTrackConstraints : public wrapper::org::ortc::MediaTrackConstraints
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrackTypes::TrackConstraints, NativeTrackConstraints);
+
+          MediaTrackConstraintsWeakPtr thisWeak_;
+
+          MediaTrackConstraints();
+          virtual ~MediaTrackConstraints();
+
+          // methods MediaTrackConstraintSet
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // methods MediaTrackConstraints
+          virtual void wrapper_init_org_ortc_MediaTrackConstraints() override;
+          virtual void wrapper_init_org_ortc_MediaTrackConstraints(wrapper::org::ortc::MediaTrackConstraintsPtr source) override;
+          virtual void wrapper_init_org_ortc_MediaTrackConstraints(wrapper::org::ortc::JsonPtr json) override;
+
+          static MediaTrackConstraintsPtr toWrapper(NativeTrackConstraintsPtr native);
+          static MediaTrackConstraintsPtr toWrapper(const NativeTrackConstraints &native);
+          static NativeTrackConstraintsPtr toNative(wrapper::org::ortc::MediaTrackConstraintsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaTrackSettings.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaTrackSettings.cpp
new file mode 100644
index 00000000..d6355395
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaTrackSettings.cpp
@@ -0,0 +1,132 @@
+
+#include "impl_org_ortc_MediaTrackSettings.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackSettings::MediaTrackSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaTrackSettingsPtr wrapper::org::ortc::MediaTrackSettings::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaTrackSettings>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackSettings::~MediaTrackSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackSettings::wrapper_init_org_ortc_MediaTrackSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackSettings::wrapper_init_org_ortc_MediaTrackSettings(wrapper::org::ortc::MediaTrackSettingsPtr source)
+{
+  if (!source) return;
+
+  wrapper::org::ortc::MediaTrackSettingsPtr wrapper = source;
+  wrapper::org::ortc::MediaTrackSettingsPtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackSettings::wrapper_init_org_ortc_MediaTrackSettings(wrapper::org::ortc::JsonPtr json)
+{
+  auto rootEl = Json::toNative(json);
+  if (!rootEl) return;
+
+  auto native = Settings::create(rootEl);
+  if (!native) return;
+
+  wrapper::org::ortc::MediaTrackSettingsPtr wrapper = toWrapper(native);
+  if (!wrapper) return;
+
+  wrapper::org::ortc::MediaTrackSettingsPtr pThis = thisWeak_.lock();
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::MediaTrackSettings::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::MediaTrackSettings::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackSettingsPtr wrapper::impl::org::ortc::MediaTrackSettings::toWrapper(SettingsPtr native)
+{
+  if (!native) return MediaTrackSettingsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaTrackSettings>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->width = native->mWidth;
+  pThis->height = native->mHeight;
+  pThis->aspectRatio = native->mAspectRatio;
+  pThis->frameRate = native->mFrameRate;
+  pThis->facingMode = native->mFacingMode;
+  pThis->volume = native->mVolume;
+  pThis->sampleRate = native->mSampleRate;
+  pThis->sampleSize = native->mSampleSize;
+  pThis->echoCancellation = native->mEchoCancellation;
+  pThis->latency = native->mLatency;
+  pThis->channelCount = native->mChannelCount;
+  pThis->deviceId = native->mDeviceID;
+  pThis->groupId = native->mGroupID;
+
+  pThis->wrapper_init_org_ortc_MediaTrackSettings();
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackSettings::SettingsPtr wrapper::impl::org::ortc::MediaTrackSettings::toNative(MediaTrackSettingsPtr wrapper)
+{
+  if (!wrapper) return SettingsPtr();
+
+  auto native = Settings::create();
+
+  native->mWidth = wrapper->width;
+  native->mHeight = wrapper->height;
+  native->mAspectRatio = wrapper->aspectRatio;
+  native->mFrameRate = wrapper->frameRate;
+  native->mFacingMode = wrapper->facingMode;
+  native->mVolume = wrapper->volume;
+  native->mSampleRate = wrapper->sampleRate;
+  native->mSampleSize = wrapper->sampleSize;
+  native->mEchoCancellation = wrapper->echoCancellation;
+  native->mLatency = wrapper->latency;
+  native->mChannelCount = wrapper->channelCount;
+  native->mDeviceID = wrapper->deviceId;
+  native->mGroupID = wrapper->groupId;
+
+  return native;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaTrackSettings.h b/ortc/idl/wrapper/impl_org_ortc_MediaTrackSettings.h
new file mode 100644
index 00000000..2ece0232
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaTrackSettings.h
@@ -0,0 +1,38 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaTrackSettings.h"
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaTrackSettings : public wrapper::org::ortc::MediaTrackSettings
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrackTypes::Settings, Settings);
+
+          MediaTrackSettingsWeakPtr thisWeak_;
+
+          MediaTrackSettings();
+          virtual ~MediaTrackSettings();
+
+          // methods MediaTrackSettings
+          virtual void wrapper_init_org_ortc_MediaTrackSettings() override;
+          virtual void wrapper_init_org_ortc_MediaTrackSettings(wrapper::org::ortc::MediaTrackSettingsPtr source) override;
+          virtual void wrapper_init_org_ortc_MediaTrackSettings(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static MediaTrackSettingsPtr toWrapper(SettingsPtr native);
+          static SettingsPtr toNative(MediaTrackSettingsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaTrackSupportedConstraints.cpp b/ortc/idl/wrapper/impl_org_ortc_MediaTrackSupportedConstraints.cpp
new file mode 100644
index 00000000..24e7fd42
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaTrackSupportedConstraints.cpp
@@ -0,0 +1,132 @@
+
+#include "impl_org_ortc_MediaTrackSupportedConstraints.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaTrackSupportedConstraints::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaTrackSupportedConstraints::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MediaTrackSupportedConstraints::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackSupportedConstraints::MediaTrackSupportedConstraints()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaTrackSupportedConstraintsPtr wrapper::org::ortc::MediaTrackSupportedConstraints::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MediaTrackSupportedConstraints>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MediaTrackSupportedConstraints::~MediaTrackSupportedConstraints()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackSupportedConstraints::wrapper_init_org_ortc_MediaTrackSupportedConstraints()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackSupportedConstraints::wrapper_init_org_ortc_MediaTrackSupportedConstraints(wrapper::org::ortc::MediaTrackSupportedConstraintsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::MediaTrackSupportedConstraints::wrapper_init_org_ortc_MediaTrackSupportedConstraints(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::MediaTrackSupportedConstraints::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("MediaTrackSupportedConstraints"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::MediaTrackSupportedConstraints::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->width = native.mWidth;
+  pThis->height = native.mHeight;
+  pThis->aspectRatio = native.mAspectRatio;
+  pThis->frameRate = native.mFrameRate;
+  pThis->facingMode = native.mFacingMode;
+  pThis->volume = native.mVolume;
+  pThis->sampleRate = native.mSampleRate;
+  pThis->sampleSize = native.mSampleSize;
+  pThis->echoCancellation = native.mEchoCancellation;
+  pThis->latency = native.mLatency;
+  pThis->channelCount = native.mChannelCount;
+  pThis->deviceId = native.mDeviceID;
+  pThis->groupId = native.mGroupID;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mWidth = wrapper->width;
+  result->mHeight = wrapper->height;
+  result->mAspectRatio = wrapper->aspectRatio;
+  result->mFrameRate = wrapper->frameRate;
+  result->mFacingMode = wrapper->facingMode;
+  result->mVolume = wrapper->volume;
+  result->mSampleRate = wrapper->sampleRate;
+  result->mSampleSize = wrapper->sampleSize;
+  result->mEchoCancellation = wrapper->echoCancellation;
+  result->mLatency = wrapper->latency;
+  result->mChannelCount = wrapper->channelCount;
+  result->mDeviceID = wrapper->deviceId;
+  result->mGroupID = wrapper->groupId;
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MediaTrackSupportedConstraints.h b/ortc/idl/wrapper/impl_org_ortc_MediaTrackSupportedConstraints.h
new file mode 100644
index 00000000..269bcbe6
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MediaTrackSupportedConstraints.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MediaTrackSupportedConstraints.h"
+
+#include <ortc/IMediaDevices.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MediaTrackSupportedConstraints : public wrapper::org::ortc::MediaTrackSupportedConstraints
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaDevicesTypes::SupportedConstraints, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(MediaTrackSupportedConstraints, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::MediaTrackSupportedConstraints, WrapperType);
+          MediaTrackSupportedConstraintsWeakPtr thisWeak_;
+
+          MediaTrackSupportedConstraints();
+          virtual ~MediaTrackSupportedConstraints();
+
+          // methods MediaTrackSupportedConstraints
+          virtual void wrapper_init_org_ortc_MediaTrackSupportedConstraints() override;
+          virtual void wrapper_init_org_ortc_MediaTrackSupportedConstraints(wrapper::org::ortc::MediaTrackSupportedConstraintsPtr source) override;
+          virtual void wrapper_init_org_ortc_MediaTrackSupportedConstraints(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_MessageQueue.cpp b/ortc/idl/wrapper/impl_org_ortc_MessageQueue.cpp
new file mode 100644
index 00000000..a3d9ded5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MessageQueue.cpp
@@ -0,0 +1,72 @@
+
+#include "impl_org_ortc_MessageQueue.h"
+
+#include <zsLib/IMessageQueueThread.h>
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MessageQueue::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MessageQueue::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::MessageQueue::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MessageQueue::MessageQueue()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MessageQueuePtr wrapper::org::ortc::MessageQueue::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::MessageQueue>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::MessageQueue::~MessageQueue()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MessageQueuePtr wrapper::org::ortc::MessageQueue::getDefaultForUi()
+{
+  return wrapper::impl::org::ortc::MessageQueue::toWrapper(zsLib::IMessageQueueThread::singletonUsingCurrentGUIThreadsMessageQueue());
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!impl) return NativeTypePtr();
+
+  return impl->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_MessageQueue.h b/ortc/idl/wrapper/impl_org_ortc_MessageQueue.h
new file mode 100644
index 00000000..c4cb7153
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_MessageQueue.h
@@ -0,0 +1,32 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_MessageQueue.h"
+
+#include <zsLib/IMessageQueue.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct MessageQueue : public wrapper::org::ortc::MessageQueue
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::zsLib::IMessageQueue, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(MessageQueue, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::MessageQueue, WrapperType);
+          MessageQueueWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          MessageQueue();
+          virtual ~MessageQueue();
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
diff --git a/ortc/idl/wrapper/impl_org_ortc_OrtcLib.cpp b/ortc/idl/wrapper/impl_org_ortc_OrtcLib.cpp
new file mode 100644
index 00000000..f84ae8e2
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_OrtcLib.cpp
@@ -0,0 +1,125 @@
+
+#include "impl_org_ortc_OrtcLib.h"
+#include "impl_org_ortc_MessageQueue.h"
+#include "impl_org_ortc_Helper.h"
+
+#include <ortc/services/IBackgrounding.h>
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::OrtcLib::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::OrtcLib::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::OrtcLib::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::OrtcLib::~OrtcLib()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::OrtcLib::setup()
+{
+  setup(wrapper::org::ortc::MessageQueue::getDefaultForUi());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::OrtcLib::setup(wrapper::org::ortc::MessageQueuePtr queue)
+{
+  NativeType::setup(wrapper::impl::org::ortc::MessageQueue::toNative(queue));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::OrtcLib::startMediaTracing()
+{
+  NativeType::startMediaTracing();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::OrtcLib::stopMediaTracing()
+{
+  NativeType::stopMediaTracing();
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::org::ortc::OrtcLib::isMediaTracing()
+{
+  return NativeType::isMediaTracing();
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::org::ortc::OrtcLib::saveMediaTrace(String filename)
+{
+  return NativeType::saveMediaTrace(filename);  
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::org::ortc::OrtcLib::saveMediaTrace(
+  String host,
+  int port
+  )
+{
+  return NativeType::saveMediaTrace(host, port);
+}
+
+//------------------------------------------------------------------------------
+PromisePtr wrapper::org::ortc::OrtcLib::notifyGoingToBackground()
+{
+  struct Notified : public Any,
+                    public ::ortc::services::IBackgroundingCompletionDelegate
+  {
+    virtual void onBackgroundingReady(::ortc::services::IBackgroundingQueryPtr query)
+    {
+      promise_->resolve();
+      promise_.reset();
+    }
+
+    PromisePtr promise_;
+    ::ortc::services::IBackgroundingQueryPtr query_;
+  };
+
+  auto observer = make_shared<Notified>();
+  observer->promise_ = Promise::create(wrapper::impl::org::ortc::Helper::getGuiQueue());
+  observer->promise_->setReferenceHolder(observer);
+  observer->query_ = ::ortc::services::IBackgrounding::notifyGoingToBackground();
+  return observer->promise_;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::OrtcLib::notifyGoingToBackgroundNow()
+{
+  ::ortc::services::IBackgrounding::notifyGoingToBackgroundNow();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::OrtcLib::notifyReturningFromBackground()
+{
+  ::ortc::services::IBackgrounding::notifyReturningFromBackground();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Milliseconds wrapper::org::ortc::OrtcLib::get_ntpServerTime()
+{
+  return NativeType::ntpServerTime();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::OrtcLib::set_ntpServerTime(::zsLib::Milliseconds value)
+{
+  NativeType::ntpServerTime(value);
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_OrtcLib.h b/ortc/idl/wrapper/impl_org_ortc_OrtcLib.h
new file mode 100644
index 00000000..c30499cb
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_OrtcLib.h
@@ -0,0 +1,27 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_OrtcLib.h"
+
+#include <ortc/IORTC.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct OrtcLib : public wrapper::org::ortc::OrtcLib
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IORTC, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(OrtcLib, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::OrtcLib, WrapperType);
+
+          virtual ~OrtcLib();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_OrtcLibWithDispatcher.cpp b/ortc/idl/wrapper/impl_org_ortc_OrtcLibWithDispatcher.cpp
new file mode 100644
index 00000000..ddfc41d5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_OrtcLibWithDispatcher.cpp
@@ -0,0 +1,53 @@
+
+#include "impl_org_ortc_OrtcLibWithDispatcher.h"
+#include "impl_org_ortc_OrtcLib.h"
+#include "impl_org_ortc_Dispatcher.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::OrtcLibWithDispatcher::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::OrtcLibWithDispatcher::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::OrtcLibWithDispatcher::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::OrtcLibWithDispatcher::~OrtcLibWithDispatcher()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::OrtcLibWithDispatcher::setup(wrapper::org::ortc::DispatcherPtr dispatcher)
+{
+  typedef zsLib::AnyHolder< Windows::UI::Core::CoreDispatcher^ > AnyDispatchHolder;
+
+  auto any = wrapper::impl::org::ortc::Dispatcher::toNative(dispatcher);
+  if (!any) {
+    wrapper::org::ortc::OrtcLib::setup();
+    return;
+  }
+
+  auto holder = std::dynamic_pointer_cast<AnyDispatchHolder>(wrapper::impl::org::ortc::Dispatcher::toNative(dispatcher));
+  if (!holder) {
+    wrapper::org::ortc::OrtcLib::setup();
+    return;
+  }
+
+  NativeType::setup(holder->value_);
+}
+
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_OrtcLibWithDispatcher.h b/ortc/idl/wrapper/impl_org_ortc_OrtcLibWithDispatcher.h
new file mode 100644
index 00000000..932efe59
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_OrtcLibWithDispatcher.h
@@ -0,0 +1,27 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_OrtcLibWithDispatcher.h"
+
+#include <ortc/IORTC.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct OrtcLibWithDispatcher : public wrapper::org::ortc::OrtcLibWithDispatcher
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IORTC, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(OrtcLibWithDispatcher, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::OrtcLibWithDispatcher, WrapperType);
+
+          virtual ~OrtcLibWithDispatcher();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_OverconstrainedError.cpp b/ortc/idl/wrapper/impl_org_ortc_OverconstrainedError.cpp
new file mode 100644
index 00000000..2e3be861
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_OverconstrainedError.cpp
@@ -0,0 +1,60 @@
+
+#include "impl_org_ortc_OverconstrainedError.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::OverconstrainedError::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::OverconstrainedError::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::OverconstrainedError::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::OverconstrainedError::OverconstrainedError()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::OverconstrainedErrorPtr wrapper::org::ortc::OverconstrainedError::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::OverconstrainedError>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::OverconstrainedError::~OverconstrainedError()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::OverconstrainedError::wrapper_init_org_ortc_OverconstrainedError()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return OverconstrainedErrorPtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->name = native->mName;
+  pThis->message = native->mMessage;
+  pThis->constraint = native->mConstraint;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_OverconstrainedError.h b/ortc/idl/wrapper/impl_org_ortc_OverconstrainedError.h
new file mode 100644
index 00000000..6c00b78e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_OverconstrainedError.h
@@ -0,0 +1,33 @@
+// Generated by zsLibEventingTool
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_OverconstrainedError.h"
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct OverconstrainedError : public wrapper::org::ortc::OverconstrainedError
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrackTypes::OverconstrainedError, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(OverconstrainedError, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::OverconstrainedError, WrapperType);
+          OverconstrainedErrorWeakPtr thisWeak_;
+
+          OverconstrainedError();
+          virtual ~OverconstrainedError();
+          virtual void wrapper_init_org_ortc_OverconstrainedError() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_OverconstrainedErrorEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_OverconstrainedErrorEvent.cpp
new file mode 100644
index 00000000..76886f09
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_OverconstrainedErrorEvent.cpp
@@ -0,0 +1,60 @@
+
+#include "impl_org_ortc_OverconstrainedErrorEvent.h"
+#include "impl_org_ortc_OverconstrainedError.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::OverconstrainedErrorEvent::OverconstrainedErrorEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::OverconstrainedErrorEventPtr wrapper::org::ortc::OverconstrainedErrorEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::OverconstrainedErrorEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::OverconstrainedErrorEvent::~OverconstrainedErrorEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::OverconstrainedErrorEvent::wrapper_init_org_ortc_OverconstrainedErrorEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::OverconstrainedErrorPtr wrapper::impl::org::ortc::OverconstrainedErrorEvent::get_error()
+{
+  return error_;
+}
+
+wrapper::impl::org::ortc::OverconstrainedErrorEventPtr wrapper::impl::org::ortc::OverconstrainedErrorEvent::toWrapper(OverconstrainedErrorPtr error)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::OverconstrainedErrorEvent>();
+  pThis->thisWeak_ = pThis;
+  pThis->error_ = error;
+  pThis->wrapper_init_org_ortc_OverconstrainedErrorEvent();
+  return pThis;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_OverconstrainedErrorEvent.h b/ortc/idl/wrapper/impl_org_ortc_OverconstrainedErrorEvent.h
new file mode 100644
index 00000000..7105f9bf
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_OverconstrainedErrorEvent.h
@@ -0,0 +1,32 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_OverconstrainedErrorEvent.h"
+
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct OverconstrainedErrorEvent : public wrapper::org::ortc::OverconstrainedErrorEvent
+        {
+          OverconstrainedErrorEventWeakPtr thisWeak_;
+          OverconstrainedErrorPtr error_;
+
+          OverconstrainedErrorEvent();
+          virtual ~OverconstrainedErrorEvent();
+          virtual void wrapper_init_org_ortc_OverconstrainedErrorEvent() override;
+
+          // properties OverconstrainedErrorEvent
+          virtual wrapper::org::ortc::OverconstrainedErrorPtr get_error() override;
+
+          static OverconstrainedErrorEventPtr toWrapper(OverconstrainedErrorPtr error);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCCertificate.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCCertificate.cpp
new file mode 100644
index 00000000..1dfa658c
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCCertificate.cpp
@@ -0,0 +1,119 @@
+
+#include "impl_org_ortc_RTCCertificate.h"
+#include "impl_org_ortc_RTCDtlsFingerprint.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCertificate::RTCCertificate()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCCertificatePtr wrapper::org::ortc::RTCCertificate::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCCertificate>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCertificate::~RTCCertificate()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCCertificatePtr > > wrapper::org::ortc::RTCCertificate::generateCertificate()
+{
+  return impl::org::ortc::RTCCertificate::toWrapper(::ortc::ICertificate::generateCertificate());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCCertificatePtr > > wrapper::org::ortc::RTCCertificate::generateCertificate(String keygenAlgorithm)
+{
+  if (keygenAlgorithm.isEmpty()) return generateCertificate();
+  return impl::org::ortc::RTCCertificate::toWrapper(::ortc::ICertificate::generateCertificate(keygenAlgorithm));
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCCertificatePtr > > wrapper::org::ortc::RTCCertificate::generateCertificate(wrapper::org::ortc::JsonPtr keygenAlgorithm)
+{
+  if (!keygenAlgorithm) return generateCertificate();
+
+  auto native = impl::org::ortc::Json::toNative(keygenAlgorithm);
+  if (!native) return generateCertificate();
+
+  return impl::org::ortc::RTCCertificate::toWrapper(::ortc::ICertificate::generateCertificate(native));
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCCertificate::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCCertificate::get_expires()
+{
+  return native_->expires();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsFingerprintPtr wrapper::impl::org::ortc::RTCCertificate::get_fingerprint()
+{
+  return RTCDtlsFingerprint::toWrapper(native_->fingerprint());
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCertificate::PromiseWithTypePtr wrapper::impl::org::ortc::RTCCertificate::toWrapper(NativePromiseWithCertificatePtr promise)
+{
+  if (!promise) return PromiseWithTypePtr();
+
+  auto result = PromiseWithType::create(Helper::getGuiQueue());
+  promise->thenClosure([result, promise] {
+    if (promise->isRejected()) {
+      Helper::reject(promise, result);
+      return;
+    }
+
+    result->resolve(toWrapper(promise->value()));
+  });
+  promise->background();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCertificatePtr wrapper::impl::org::ortc::RTCCertificate::toWrapper(NativeTypePtr native)
+{
+  if (!native) return RTCCertificatePtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCCertificate>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCertificate::NativeTypePtr wrapper::impl::org::ortc::RTCCertificate::toNative(wrapper::org::ortc::RTCCertificatePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  return std::dynamic_pointer_cast<RTCCertificate>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCCertificate.h b/ortc/idl/wrapper/impl_org_ortc_RTCCertificate.h
new file mode 100644
index 00000000..8ab3a6d6
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCCertificate.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCCertificate.h"
+
+#include <ortc/ICertificate.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCCertificate : public wrapper::org::ortc::RTCCertificate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ICertificate, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(PromiseWithHolderPtr< wrapper::org::ortc::RTCCertificatePtr >, PromiseWithType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ICertificateTypes::PromiseWithCertificate, NativePromiseWithCertificate);
+
+          RTCCertificateWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCCertificate();
+          virtual ~RTCCertificate();
+
+          // properties RTCCertificate
+          virtual uint64_t get_objectId() override;
+          virtual ::zsLib::Time get_expires() override;
+          virtual wrapper::org::ortc::RTCDtlsFingerprintPtr get_fingerprint() override;
+
+          static PromiseWithTypePtr toWrapper(NativePromiseWithCertificatePtr promise);
+          static RTCCertificatePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(wrapper::org::ortc::RTCCertificatePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCCertificateStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCCertificateStats.cpp
new file mode 100644
index 00000000..5e0c9daa
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCCertificateStats.cpp
@@ -0,0 +1,142 @@
+
+#include "impl_org_ortc_RTCCertificateStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCertificateStats::RTCCertificateStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCCertificateStatsPtr wrapper::org::ortc::RTCCertificateStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCCertificateStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCertificateStats::~RTCCertificateStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCCertificateStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCCertificateStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCertificateStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCCertificateStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCCertificateStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCertificateStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCertificateStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCCertificateStats::wrapper_init_org_ortc_RTCCertificateStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCCertificateStats::wrapper_init_org_ortc_RTCCertificateStats(wrapper::org::ortc::RTCCertificateStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCCertificateStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCCertificateStats::wrapper_init_org_ortc_RTCCertificateStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCertificateStats::get_fingerprint()
+{
+  return native_->mFingerprint;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCertificateStats::get_fingerprintAlgorithm()
+{
+  return native_->mFingerprintAlgorithm;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCertificateStats::get_base64Certificate()
+{
+  return native_->mBase64Certificate;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCertificateStats::get_issuerCertificateId()
+{
+  return native_->mIssuerCertificateID;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCertificateStatsPtr wrapper::impl::org::ortc::RTCCertificateStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCCertificateStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCCertificateStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCertificateStats::NativeStatsPtr wrapper::impl::org::ortc::RTCCertificateStats::toNative(wrapper::org::ortc::RTCCertificateStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCCertificateStats>(wrapper)->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCCertificateStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCCertificateStats.h
new file mode 100644
index 00000000..5c4b2d58
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCCertificateStats.h
@@ -0,0 +1,52 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCCertificateStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCCertificateStats : public wrapper::org::ortc::RTCCertificateStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::CertificateStats, NativeStats);
+          RTCCertificateStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCCertificateStats();
+          virtual ~RTCCertificateStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCCertificateStats
+          virtual void wrapper_init_org_ortc_RTCCertificateStats() override;
+          virtual void wrapper_init_org_ortc_RTCCertificateStats(wrapper::org::ortc::RTCCertificateStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCCertificateStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCCertificateStats
+          virtual String get_fingerprint() override;
+          virtual String get_fingerprintAlgorithm() override;
+          virtual String get_base64Certificate() override;
+          virtual String get_issuerCertificateId() override;
+
+          static RTCCertificateStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCCertificateStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCCodec.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCCodec.cpp
new file mode 100644
index 00000000..7fb07899
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCCodec.cpp
@@ -0,0 +1,148 @@
+
+#include "impl_org_ortc_RTCCodec.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCodec::RTCCodec()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCCodecPtr wrapper::org::ortc::RTCCodec::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCCodec>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCodec::~RTCCodec()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCCodec::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCCodec"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCodec::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCCodec::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCCodec::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCodec::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCodec::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCCodec::wrapper_init_org_ortc_RTCCodec()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCCodec::wrapper_init_org_ortc_RTCCodec(wrapper::org::ortc::RTCCodecPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCCodec();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCCodec::wrapper_init_org_ortc_RTCCodec(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+Optional< uint8_t > wrapper::impl::org::ortc::RTCCodec::get_payloadType()
+{
+  return native_->mPayloadType;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCodec::get_codec()
+{
+  return native_->mCodec;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCCodec::get_clockRate()
+{
+  return native_->mClockRate;
+}
+
+//------------------------------------------------------------------------------
+Optional< unsigned long > wrapper::impl::org::ortc::RTCCodec::get_channels()
+{
+  return native_->mChannels;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCCodec::get_parameters()
+{
+  return native_->mParameters;
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCodecPtr wrapper::impl::org::ortc::RTCCodec::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCCodecPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCCodec>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCCodec::NativeStatsPtr wrapper::impl::org::ortc::RTCCodec::toNative(wrapper::org::ortc::RTCCodecPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCCodec>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCCodec.h b/ortc/idl/wrapper/impl_org_ortc_RTCCodec.h
new file mode 100644
index 00000000..b5fbb3c2
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCCodec.h
@@ -0,0 +1,53 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCCodec.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCCodec : public wrapper::org::ortc::RTCCodec
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::Codec, NativeStats);
+          RTCCodecWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCCodec();
+          virtual ~RTCCodec();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCCodec
+          virtual void wrapper_init_org_ortc_RTCCodec() override;
+          virtual void wrapper_init_org_ortc_RTCCodec(wrapper::org::ortc::RTCCodecPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCCodec(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCCodec
+          virtual Optional< uint8_t > get_payloadType() override;
+          virtual String get_codec() override;
+          virtual unsigned long get_clockRate() override;
+          virtual Optional< unsigned long > get_channels() override;
+          virtual String get_parameters() override;
+
+          static RTCCodecPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCCodecPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataChannel.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannel.cpp
new file mode 100644
index 00000000..bc13746a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannel.cpp
@@ -0,0 +1,225 @@
+
+#include "impl_org_ortc_RTCDataChannel.h"
+#include "impl_org_ortc_RTCDataChannelParameters.h"
+#include "impl_org_ortc_RTCDataTransport.h"
+#include "impl_org_ortc_RTCMessageEvent.h"
+#include "impl_org_ortc_RTCDataChannelStateChangeEvent.h"
+#include "impl_org_ortc_ErrorEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannel::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannel::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannel::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannel::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannel::RTCDataChannel()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataChannelPtr wrapper::org::ortc::RTCDataChannel::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDataChannel>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannel::~RTCDataChannel()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::RTCDataChannel::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannel::wrapper_init_org_ortc_RTCDataChannel(
+  wrapper::org::ortc::RTCDataTransportPtr transport,
+  wrapper::org::ortc::RTCDataChannelParametersPtr params
+  )
+{
+  auto native = RTCDataChannelParameters::toNative(params);
+  ZS_THROW_INVALID_ARGUMENT_IF(!params);
+  native_ = NativeType::create(thisWeak_.lock(), RTCDataTransport::toNative(transport), *native);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannel::close()
+{
+  native_->close();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannel::send(String text)
+{
+  native_->send(text);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannel::send(SecureByteBlockPtr data)
+{
+  if (!data) return;
+  native_->send(*data);
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCDataChannel::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataTransportPtr wrapper::impl::org::ortc::RTCDataChannel::get_transport()
+{
+  return RTCDataTransport::toWrapper(native_->transport());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataChannelParametersPtr wrapper::impl::org::ortc::RTCDataChannel::get_parameters()
+{
+  return RTCDataChannelParameters::toWrapper(native_->parameters());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataChannelState wrapper::impl::org::ortc::RTCDataChannel::get_readyState()
+{
+  return Helper::toWrapper(native_->readyState());
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCDataChannel::get_bufferedAmount()
+{
+  return SafeInt<uint64_t>(native_->bufferedAmount());
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCDataChannel::get_bufferedAmountLowThreshold()
+{
+  return SafeInt<uint64_t>(native_->bufferedAmountLowThreshold());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannel::set_bufferedAmountLowThreshold(uint64_t value)
+{
+  native_->bufferedAmountLowThreshold(SafeInt<size_t>(value));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDataChannel::get_binaryType()
+{
+  return native_->binaryType();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannel::set_binaryType(String value)
+{
+  native_->binaryType(value);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannel::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onDataChannelStateChange(
+  IDataChannelPtr channel,
+  ::ortc::IDataChannelTypes::States state
+)
+{
+  onStateChange(RTCDataChannelStateChangeEvent::toWrapper(state));
+
+  switch (state) {
+    case ::ortc::IDataChannelTypes::State_Open:   onOpen(); break;
+    case ::ortc::IDataChannelTypes::State_Closed: onClose(); break;
+    default: break;
+  }
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onDataChannelError(
+  IDataChannelPtr channel,
+  ::ortc::ErrorAnyPtr error
+)
+{
+  onError(ErrorEvent::toWrapper(error));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onDataChannelBufferedAmountLow(IDataChannelPtr channel)
+{
+  onBufferedAmountLow();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onDataChannelMessage(
+  IDataChannelPtr channel,
+  MessageEventDataPtr data
+)
+{
+  onMessage(RTCMessageEvent::toWrapper(data));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataChannel.h b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannel.h
new file mode 100644
index 00000000..285478fc
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannel.h
@@ -0,0 +1,85 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDataChannel.h"
+
+#include <ortc/IDataChannel.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDataChannel : public wrapper::org::ortc::RTCDataChannel,
+                                public ::ortc::IDataChannelDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDataChannel, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDataChannel, IDataChannel);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDataChannelSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDataChannel, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDataChannel, WrapperType);
+
+          RTCDataChannelWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_{ true };
+          NativeTypeSubscriptionPtr subscription_;
+
+          RTCDataChannel();
+          virtual ~RTCDataChannel();
+
+          // methods RTCStatsProvider
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+          // methods RTCDataChannel
+          virtual void wrapper_init_org_ortc_RTCDataChannel(
+            wrapper::org::ortc::RTCDataTransportPtr transport,
+            wrapper::org::ortc::RTCDataChannelParametersPtr params
+            ) override;
+          virtual void close() override;
+          virtual void send(String text) override;
+          virtual void send(SecureByteBlockPtr data) override;
+
+          // properties RTCDataChannel
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::RTCDataTransportPtr get_transport() override;
+          virtual wrapper::org::ortc::RTCDataChannelParametersPtr get_parameters() override;
+          virtual wrapper::org::ortc::RTCDataChannelState get_readyState() override;
+          virtual uint64_t get_bufferedAmount() override;
+          virtual uint64_t get_bufferedAmountLowThreshold() override;
+          virtual void set_bufferedAmountLowThreshold(uint64_t value) override;
+          virtual String get_binaryType() override;
+          virtual void set_binaryType(String value) override;
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          virtual void onDataChannelStateChange(
+            IDataChannelPtr channel,
+            ::ortc::IDataChannelTypes::States state
+          ) override;
+
+          virtual void onDataChannelError(
+            IDataChannelPtr channel,
+            ::ortc::ErrorAnyPtr error
+          ) override;
+
+          virtual void onDataChannelBufferedAmountLow(IDataChannelPtr channel) override;
+
+          virtual void onDataChannelMessage(
+            IDataChannelPtr channel,
+            MessageEventDataPtr data
+          ) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelEvent.cpp
new file mode 100644
index 00000000..5d9f4d6c
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelEvent.cpp
@@ -0,0 +1,59 @@
+
+#include "impl_org_ortc_RTCDataChannelEvent.h"
+#include "impl_org_ortc_RTCDataChannel.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannelEvent::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannelEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannelEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannelEvent::RTCDataChannelEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataChannelEventPtr wrapper::org::ortc::RTCDataChannelEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDataChannelEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannelEvent::~RTCDataChannelEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataChannelPtr wrapper::impl::org::ortc::RTCDataChannelEvent::get_dataChannel()
+{
+  return RTCDataChannel::toWrapper(native_);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelEvent.h
new file mode 100644
index 00000000..bd98713e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelEvent.h
@@ -0,0 +1,35 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDataChannelEvent.h"
+
+#include <ortc/types.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDataChannelEvent : public wrapper::org::ortc::RTCDataChannelEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDataChannel, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDataChannelEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDataChannelEvent, WrapperType);
+          RTCDataChannelEventWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCDataChannelEvent();
+          virtual ~RTCDataChannelEvent();
+
+          // properties RTCDataChannelEvent
+          virtual wrapper::org::ortc::RTCDataChannelPtr get_dataChannel() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelParameters.cpp
new file mode 100644
index 00000000..bab0ac1a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelParameters.cpp
@@ -0,0 +1,120 @@
+
+#include "impl_org_ortc_RTCDataChannelParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannelParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannelParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannelParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannelParameters::RTCDataChannelParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataChannelParametersPtr wrapper::org::ortc::RTCDataChannelParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDataChannelParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannelParameters::~RTCDataChannelParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannelParameters::wrapper_init_org_ortc_RTCDataChannelParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannelParameters::wrapper_init_org_ortc_RTCDataChannelParameters(wrapper::org::ortc::RTCDataChannelParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannelParameters::wrapper_init_org_ortc_RTCDataChannelParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCDataChannelParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCDataChannelParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDataChannelParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->label = native.mLabel;
+  pThis->ordered = native.mOrdered;
+  pThis->maxPacketLifetime = native.mMaxPacketLifetime;
+  pThis->maxRetransmits = native.mMaxRetransmits;
+  pThis->protocol = native.mProtocol;
+  pThis->negotiated = native.mNegotiated;
+  Helper::optionalSafeIntConvert(native.mID, pThis->id);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mLabel = wrapper->label;
+  result->mOrdered = wrapper->ordered;
+  result->mMaxPacketLifetime = wrapper->maxPacketLifetime;
+  result->mMaxRetransmits = wrapper->maxRetransmits;
+  result->mProtocol = wrapper->protocol;
+  result->mNegotiated = wrapper->negotiated;
+  Helper::optionalSafeIntConvert(wrapper->id, result->mID);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelParameters.h
new file mode 100644
index 00000000..15200d8e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDataChannelParameters.h"
+
+#include <ortc/IDataChannel.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDataChannelParameters : public wrapper::org::ortc::RTCDataChannelParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDataChannelTypes::Parameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDataChannelParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDataChannelParameters, WrapperType);
+          RTCDataChannelParametersWeakPtr thisWeak_;
+
+          RTCDataChannelParameters();
+          virtual ~RTCDataChannelParameters();
+
+          // methods RTCDataChannelParameters
+          virtual void wrapper_init_org_ortc_RTCDataChannelParameters() override;
+          virtual void wrapper_init_org_ortc_RTCDataChannelParameters(wrapper::org::ortc::RTCDataChannelParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCDataChannelParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStateChangeEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStateChangeEvent.cpp
new file mode 100644
index 00000000..a86d077b
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStateChangeEvent.cpp
@@ -0,0 +1,59 @@
+
+#include "impl_org_ortc_RTCDataChannelStateChangeEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannelStateChangeEvent::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannelStateChangeEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataChannelStateChangeEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannelStateChangeEvent::RTCDataChannelStateChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataChannelStateChangeEventPtr wrapper::org::ortc::RTCDataChannelStateChangeEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDataChannelStateChangeEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannelStateChangeEvent::~RTCDataChannelStateChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataChannelState wrapper::impl::org::ortc::RTCDataChannelStateChangeEvent::get_state()
+{
+  return Helper::toWrapper(native_);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeType native)
+{
+  if (!native) return WrapperImplTypePtr();
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStateChangeEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStateChangeEvent.h
new file mode 100644
index 00000000..e5e059ce
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStateChangeEvent.h
@@ -0,0 +1,35 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDataChannelStateChangeEvent.h"
+
+#include <ortc/IDataChannelTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDataChannelStateChangeEvent : public wrapper::org::ortc::RTCDataChannelStateChangeEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDataChannelTypes::States, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDataChannelStateChangeEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDataChannelStateChangeEvent, WrapperType);
+          RTCDataChannelStateChangeEventWeakPtr thisWeak_;
+          NativeType native_;
+
+          RTCDataChannelStateChangeEvent();
+          virtual ~RTCDataChannelStateChangeEvent();
+
+          // properties RTCDataChannelStateChangeEvent
+          virtual wrapper::org::ortc::RTCDataChannelState get_state() override;
+
+          static WrapperImplTypePtr toWrapper(NativeType native);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStats.cpp
new file mode 100644
index 00000000..0f8cf0ce
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStats.cpp
@@ -0,0 +1,167 @@
+
+#include "impl_org_ortc_RTCDataChannelStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannelStats::RTCDataChannelStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataChannelStatsPtr wrapper::org::ortc::RTCDataChannelStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDataChannelStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannelStats::~RTCDataChannelStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCDataChannelStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCDataChannelStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDataChannelStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCDataChannelStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCDataChannelStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDataChannelStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDataChannelStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannelStats::wrapper_init_org_ortc_RTCDataChannelStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannelStats::wrapper_init_org_ortc_RTCDataChannelStats(wrapper::org::ortc::RTCDataChannelStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCDataChannelStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDataChannelStats::wrapper_init_org_ortc_RTCDataChannelStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDataChannelStats::get_label()
+{
+  return native_->mLabel;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDataChannelStats::get_protocol()
+{
+  return native_->mProtocol;
+}
+
+//------------------------------------------------------------------------------
+long wrapper::impl::org::ortc::RTCDataChannelStats::get_dataChannelId()
+{
+  return native_->mDataChannelID;
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataChannelState wrapper::impl::org::ortc::RTCDataChannelStats::get_state()
+{
+  return Helper::toWrapper(native_->mState);
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCDataChannelStats::get_messagesSent()
+{
+  return native_->mMessagesSent;
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCDataChannelStats::get_bytesSent()
+{
+  return native_->mBytesSent;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCDataChannelStats::get_messagesReceived()
+{
+  return native_->mMessagesReceived;
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCDataChannelStats::get_bytesReceived()
+{
+  return native_->mBytesReceived;
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannelStatsPtr wrapper::impl::org::ortc::RTCDataChannelStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCDataChannelStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDataChannelStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataChannelStats::NativeStatsPtr wrapper::impl::org::ortc::RTCDataChannelStats::toNative(wrapper::org::ortc::RTCDataChannelStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCDataChannelStats>(wrapper)->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStats.h
new file mode 100644
index 00000000..69ad67f1
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataChannelStats.h
@@ -0,0 +1,56 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDataChannelStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDataChannelStats : public wrapper::org::ortc::RTCDataChannelStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::DataChannelStats, NativeStats);
+          RTCDataChannelStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCDataChannelStats();
+          virtual ~RTCDataChannelStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCDataChannelStats
+          virtual void wrapper_init_org_ortc_RTCDataChannelStats() override;
+          virtual void wrapper_init_org_ortc_RTCDataChannelStats(wrapper::org::ortc::RTCDataChannelStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCDataChannelStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCDataChannelStats
+          virtual String get_label() override;
+          virtual String get_protocol() override;
+          virtual long get_dataChannelId() override;
+          virtual wrapper::org::ortc::RTCDataChannelState get_state() override;
+          virtual unsigned long get_messagesSent() override;
+          virtual unsigned long long get_bytesSent() override;
+          virtual unsigned long get_messagesReceived() override;
+          virtual unsigned long long get_bytesReceived() override;
+
+          static RTCDataChannelStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCDataChannelStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataTransport.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDataTransport.cpp
new file mode 100644
index 00000000..31437d0d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataTransport.cpp
@@ -0,0 +1,71 @@
+
+#include "impl_org_ortc_RTCDataTransport.h"
+#include "impl_org_ortc_RTCSctpTransport.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataTransport::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataTransport::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDataTransport::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataTransport::RTCDataTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDataTransportPtr wrapper::org::ortc::RTCDataTransport::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDataTransport>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDataTransport::~RTCDataTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  {
+    auto impl = std::dynamic_pointer_cast<RTCSctpTransport>(wrapper);
+    if (impl) return RTCSctpTransport::toNative(impl);
+  }
+
+  {
+    auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+    if (impl) return impl->native_;
+  }
+  return NativeTypePtr();
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDataTransport.h b/ortc/idl/wrapper/impl_org_ortc_RTCDataTransport.h
new file mode 100644
index 00000000..0a5f586f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDataTransport.h
@@ -0,0 +1,33 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDataTransport.h"
+
+#include <ortc/types.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDataTransport : public wrapper::org::ortc::RTCDataTransport
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDataTransport, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDataTransport, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDataTransport, WrapperType);
+          RTCDataTransportWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCDataTransport();
+          virtual ~RTCDataTransport();
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsCertificateBinary.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsCertificateBinary.cpp
new file mode 100644
index 00000000..e0f4d2f5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsCertificateBinary.cpp
@@ -0,0 +1,75 @@
+
+#include "impl_org_ortc_RTCDtlsCertificateBinary.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsCertificateBinary::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsCertificateBinary::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsCertificateBinary::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsCertificateBinary::RTCDtlsCertificateBinary()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsCertificateBinaryPtr wrapper::org::ortc::RTCDtlsCertificateBinary::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDtlsCertificateBinary>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsCertificateBinary::~RTCDtlsCertificateBinary()
+{
+}
+
+//------------------------------------------------------------------------------
+SecureByteBlockPtr wrapper::impl::org::ortc::RTCDtlsCertificateBinary::get_certificate()
+{
+  return native_;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = make_shared<NativeType>(native);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!impl) return NativeTypePtr();
+
+  return impl->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsCertificateBinary.h b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsCertificateBinary.h
new file mode 100644
index 00000000..d8b2a3d2
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsCertificateBinary.h
@@ -0,0 +1,36 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDtlsCertificateBinary.h"
+
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDtlsCertificateBinary : public wrapper::org::ortc::RTCDtlsCertificateBinary
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::zsLib::eventing::SecureByteBlock, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDtlsCertificateBinary, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDtlsCertificateBinary, WrapperType);
+          RTCDtlsCertificateBinaryWeakPtr thisWeak_;
+          SecureByteBlockPtr native_;
+
+          RTCDtlsCertificateBinary();
+          virtual ~RTCDtlsCertificateBinary();
+
+          // properties RTCDtlsCertificateBinary
+          virtual SecureByteBlockPtr get_certificate() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsFingerprint.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsFingerprint.cpp
new file mode 100644
index 00000000..1400ee61
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsFingerprint.cpp
@@ -0,0 +1,109 @@
+
+#include "impl_org_ortc_RTCDtlsFingerprint.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsFingerprint::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsFingerprint::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsFingerprint::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsFingerprint::RTCDtlsFingerprint()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsFingerprintPtr wrapper::org::ortc::RTCDtlsFingerprint::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDtlsFingerprint>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsFingerprint::~RTCDtlsFingerprint()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsFingerprint::wrapper_init_org_ortc_RTCDtlsFingerprint()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsFingerprint::wrapper_init_org_ortc_RTCDtlsFingerprint(wrapper::org::ortc::RTCDtlsFingerprintPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsFingerprint::wrapper_init_org_ortc_RTCDtlsFingerprint(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCDtlsFingerprint::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDtlsFingerprint::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->algorithm = native.mAlgorithm;
+  pThis->value = native.mValue;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mAlgorithm = wrapper->algorithm;
+  result->mValue = wrapper->value;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsFingerprint.h b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsFingerprint.h
new file mode 100644
index 00000000..7cfa2454
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsFingerprint.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDtlsFingerprint.h"
+
+#include <ortc/ICertificate.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDtlsFingerprint : public wrapper::org::ortc::RTCDtlsFingerprint
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ICertificateTypes::Fingerprint, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDtlsFingerprint, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDtlsFingerprint, WrapperType);
+          RTCDtlsFingerprintWeakPtr thisWeak_;
+
+          RTCDtlsFingerprint();
+          virtual ~RTCDtlsFingerprint();
+
+          // methods RTCDtlsFingerprint
+          virtual void wrapper_init_org_ortc_RTCDtlsFingerprint() override;
+          virtual void wrapper_init_org_ortc_RTCDtlsFingerprint(wrapper::org::ortc::RTCDtlsFingerprintPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCDtlsFingerprint(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+          
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsParameters.cpp
new file mode 100644
index 00000000..0d5b3c30
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsParameters.cpp
@@ -0,0 +1,122 @@
+
+#include "impl_org_ortc_RTCDtlsParameters.h"
+#include "impl_org_ortc_RTCDtlsFingerprint.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsParameters::RTCDtlsParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsParametersPtr wrapper::org::ortc::RTCDtlsParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDtlsParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsParameters::~RTCDtlsParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsParameters::wrapper_init_org_ortc_RTCDtlsParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsParameters::wrapper_init_org_ortc_RTCDtlsParameters(wrapper::org::ortc::RTCDtlsParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsParameters::wrapper_init_org_ortc_RTCDtlsParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCDtlsParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCDtlsParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDtlsParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->role = Helper::toWrapper(native.mRole);
+  pThis->fingerprints = make_shared< list< wrapper::org::ortc::RTCDtlsFingerprintPtr > >();
+  for (auto iter = native.mFingerprints.begin(); iter != native.mFingerprints.end(); ++iter) {
+    auto wrapper = RTCDtlsFingerprint::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->fingerprints->push_back(wrapper);
+  }
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mRole = Helper::toNative(wrapper->role);
+  if (wrapper->fingerprints) {
+    for (auto iter = wrapper->fingerprints->begin(); iter != wrapper->fingerprints->end(); ++iter) {
+      auto native = RTCDtlsFingerprint::toNative(*iter);
+      if (!native) continue;
+      result->mFingerprints.push_back(*native);
+    }
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsParameters.h
new file mode 100644
index 00000000..e616bd1d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDtlsParameters.h"
+
+#include <ortc/IDTLSTransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDtlsParameters : public wrapper::org::ortc::RTCDtlsParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDTLSTransportTypes::Parameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDtlsParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDtlsParameters, WrapperType);
+          RTCDtlsParametersWeakPtr thisWeak_;
+
+          RTCDtlsParameters();
+          virtual ~RTCDtlsParameters();
+
+          // methods RTCDtlsParameters
+          virtual void wrapper_init_org_ortc_RTCDtlsParameters() override;
+          virtual void wrapper_init_org_ortc_RTCDtlsParameters(wrapper::org::ortc::RTCDtlsParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCDtlsParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransport.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransport.cpp
new file mode 100644
index 00000000..ca04a996
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransport.cpp
@@ -0,0 +1,217 @@
+
+#include "impl_org_ortc_RTCDtlsTransport.h"
+#include "impl_org_ortc_RTCDtlsParameters.h"
+#include "impl_org_ortc_RTCIceTransport.h"
+#include "impl_org_ortc_RTCCertificate.h"
+#include "impl_org_ortc_RTCDtlsTransportStateChangeEvent.h"
+#include "impl_org_ortc_RTCDtlsCertificateBinary.h"
+#include "impl_org_ortc_ErrorEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsTransport::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsTransport::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsTransport::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsTransport::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsTransport::RTCDtlsTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsTransportPtr wrapper::org::ortc::RTCDtlsTransport::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDtlsTransport>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsTransport::~RTCDtlsTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::RTCDtlsTransport::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsTransport::wrapper_init_org_ortc_RTCDtlsTransport(
+  wrapper::org::ortc::RTCIceTransportPtr iceTransport,
+  shared_ptr< list< wrapper::org::ortc::RTCCertificatePtr > > certificates
+  )
+{
+  ZS_THROW_INVALID_ARGUMENT_IF(!iceTransport);
+
+  list< ::ortc::ICertificatePtr > nativeList;
+  if (certificates) {
+    for (auto iter = certificates->begin(); iter != certificates->end(); ++iter) {
+      auto native = RTCCertificate::toNative(*iter);
+      if (!native) continue;
+      nativeList.push_back(native);
+    }
+  }
+  
+  native_ = IDTLSTransport::create(thisWeak_.lock(), RTCIceTransport::toNative(iceTransport), nativeList);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsParametersPtr wrapper::impl::org::ortc::RTCDtlsTransport::remoteParameters()
+{
+  return RTCDtlsParameters::toWrapper(native_->getRemoteParameters());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::RTCDtlsCertificateBinaryPtr > > wrapper::impl::org::ortc::RTCDtlsTransport::getRemoteCertificates()
+{
+  auto result = make_shared< list< wrapper::org::ortc::RTCDtlsCertificateBinaryPtr > >();
+  auto native = native_->getRemoteCertificates();
+  if (native) {
+    for (auto iter = native->begin(); iter != native->end(); ++iter) {
+      auto wrapper = RTCDtlsCertificateBinary::toWrapper(*iter);
+      if (!wrapper) continue;
+      result->push_back(wrapper);
+    }
+  }
+  return result;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsTransport::start(wrapper::org::ortc::RTCDtlsParametersPtr remoteParameters)
+{
+  ZS_THROW_INVALID_ARGUMENT_IF(!remoteParameters);
+  auto native = RTCDtlsParameters::toNative(remoteParameters);
+  ZS_THROW_INVALID_ARGUMENT_IF(!native);
+  native_->start(*native);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsTransport::stop()
+{
+  native_->stop();
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCDtlsTransport::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::RTCCertificatePtr > > wrapper::impl::org::ortc::RTCDtlsTransport::get_certificates()
+{
+  auto result = make_shared< list< wrapper::org::ortc::RTCCertificatePtr > >();
+  auto native = native_->certificates();
+  if (native) {
+    for (auto iter = native->begin(); iter != native->end(); ++iter) {
+      auto wrapper = RTCCertificate::toWrapper(*iter);
+      if (!wrapper) continue;
+      result->push_back(wrapper);
+    }
+  }
+  return result;
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportPtr wrapper::impl::org::ortc::RTCDtlsTransport::get_transport()
+{
+  return RTCIceTransport::toWrapper(native_->transport());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsTransportState wrapper::impl::org::ortc::RTCDtlsTransport::get_state()
+{
+  return Helper::toWrapper(native_->state());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsParametersPtr wrapper::impl::org::ortc::RTCDtlsTransport::get_localParameters()
+{
+  return RTCDtlsParameters::toWrapper(native_->getLocalParameters());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsTransport::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onDTLSTransportStateChange(
+                                                 IDTLSTransportPtr transport,
+                                                 IDTLSTransport::States state
+                                                 )
+{
+  onStateChange(RTCDtlsTransportStateChangeEvent::toWrapper(Helper::toWrapper(state)));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onDTLSTransportError(
+                                           IDTLSTransportPtr transport,
+                                           ::ortc::ErrorAnyPtr error
+                                           )
+{
+  onError(ErrorEvent::toWrapper(error));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransport.h b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransport.h
new file mode 100644
index 00000000..a3fb390b
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransport.h
@@ -0,0 +1,75 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDtlsTransport.h"
+
+#include <ortc/IDTLSTransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDtlsTransport : public wrapper::org::ortc::RTCDtlsTransport,
+                                  public ::ortc::IDTLSTransportDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDTLSTransport, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDTLSTransport, IDTLSTransport);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDTLSTransportSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDtlsTransport, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDtlsTransport, WrapperType);
+          RTCDtlsTransportWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_{ true };
+          NativeTypeSubscriptionPtr subscription_;
+
+          RTCDtlsTransport();
+          virtual ~RTCDtlsTransport();
+
+          // methods RTCStatsProvider
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+          // methods RTCDtlsTransport
+          virtual void wrapper_init_org_ortc_RTCDtlsTransport(
+            wrapper::org::ortc::RTCIceTransportPtr iceTransport,
+            shared_ptr< list< wrapper::org::ortc::RTCCertificatePtr > > certificates
+            ) override;
+          virtual wrapper::org::ortc::RTCDtlsParametersPtr remoteParameters() override;
+          virtual shared_ptr< list< wrapper::org::ortc::RTCDtlsCertificateBinaryPtr > > getRemoteCertificates() override;
+          virtual void start(wrapper::org::ortc::RTCDtlsParametersPtr remoteParameters) override;
+          virtual void stop() override;
+
+          // properties RTCDtlsTransport
+          virtual uint64_t get_objectId() override;
+          virtual shared_ptr< list< wrapper::org::ortc::RTCCertificatePtr > > get_certificates() override;
+          virtual wrapper::org::ortc::RTCIceTransportPtr get_transport() override;
+          virtual wrapper::org::ortc::RTCDtlsTransportState get_state() override;
+          virtual wrapper::org::ortc::RTCDtlsParametersPtr get_localParameters() override;
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          // IDTLSTransportDelegate
+          virtual void onDTLSTransportStateChange(
+            IDTLSTransportPtr transport,
+            IDTLSTransport::States state
+          ) override;
+
+          virtual void onDTLSTransportError(
+            IDTLSTransportPtr transport,
+            ::ortc::ErrorAnyPtr error
+          ) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp
new file mode 100644
index 00000000..33d44a23
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp
@@ -0,0 +1,56 @@
+
+#include "impl_org_ortc_RTCDtlsTransportStateChangeEvent.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsTransportStateChangeEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtlsTransportStateChangeEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsTransportStateChangeEvent::RTCDtlsTransportStateChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsTransportStateChangeEventPtr wrapper::org::ortc::RTCDtlsTransportStateChangeEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDtlsTransportStateChangeEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsTransportStateChangeEvent::~RTCDtlsTransportStateChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsTransportState wrapper::impl::org::ortc::RTCDtlsTransportStateChangeEvent::get_state()
+{
+  return state_;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(wrapper::org::ortc::RTCDtlsTransportState state)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->state_ = state;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStateChangeEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStateChangeEvent.h
new file mode 100644
index 00000000..15d81b9f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStateChangeEvent.h
@@ -0,0 +1,33 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDtlsTransportStateChangeEvent.h"
+
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDtlsTransportStateChangeEvent : public wrapper::org::ortc::RTCDtlsTransportStateChangeEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(RTCDtlsTransportStateChangeEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDtlsTransportStateChangeEvent, WrapperType);
+          RTCDtlsTransportStateChangeEventWeakPtr thisWeak_;
+          wrapper::org::ortc::RTCDtlsTransportState state_ {wrapper::org::ortc::RTCDtlsTransportState_new};
+
+          RTCDtlsTransportStateChangeEvent();
+          virtual ~RTCDtlsTransportStateChangeEvent();
+
+          // properties RTCDtlsTransportStateChangeEvent
+          virtual wrapper::org::ortc::RTCDtlsTransportState get_state() override;
+
+          static WrapperImplTypePtr toWrapper(wrapper::org::ortc::RTCDtlsTransportState state);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStats.cpp
new file mode 100644
index 00000000..76fdfb02
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStats.cpp
@@ -0,0 +1,129 @@
+
+#include "impl_org_ortc_RTCDtlsTransportStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsTransportStats::RTCDtlsTransportStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsTransportStatsPtr wrapper::org::ortc::RTCDtlsTransportStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDtlsTransportStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsTransportStats::~RTCDtlsTransportStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCDtlsTransportStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCDtlsTransportStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDtlsTransportStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCDtlsTransportStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCDtlsTransportStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDtlsTransportStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDtlsTransportStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsTransportStats::wrapper_init_org_ortc_RTCDtlsTransportStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsTransportStats::wrapper_init_org_ortc_RTCDtlsTransportStats(wrapper::org::ortc::RTCDtlsTransportStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCDtlsTransportStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtlsTransportStats::wrapper_init_org_ortc_RTCDtlsTransportStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDtlsTransportStats::get_localCertificateId()
+{
+  return native_->mLocalCertificateID;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDtlsTransportStats::get_remoteCertificateId()
+{
+  return native_->mRemoteCertificateID;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsTransportStatsPtr wrapper::impl::org::ortc::RTCDtlsTransportStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCDtlsTransportStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDtlsTransportStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtlsTransportStats::NativeStatsPtr wrapper::impl::org::ortc::RTCDtlsTransportStats::toNative(wrapper::org::ortc::RTCDtlsTransportStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCDtlsTransportStats>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStats.h
new file mode 100644
index 00000000..b8f99d29
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtlsTransportStats.h
@@ -0,0 +1,50 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDtlsTransportStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDtlsTransportStats : public wrapper::org::ortc::RTCDtlsTransportStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::DTLSTransportStats, NativeStats);
+          RTCDtlsTransportStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCDtlsTransportStats();
+          virtual ~RTCDtlsTransportStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCDtlsTransportStats
+          virtual void wrapper_init_org_ortc_RTCDtlsTransportStats() override;
+          virtual void wrapper_init_org_ortc_RTCDtlsTransportStats(wrapper::org::ortc::RTCDtlsTransportStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCDtlsTransportStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCDtlsTransportStats
+          virtual String get_localCertificateId() override;
+          virtual String get_remoteCertificateId() override;
+
+          static RTCDtlsTransportStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCDtlsTransportStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtmfSender.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDtmfSender.cpp
new file mode 100644
index 00000000..d3b9db41
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtmfSender.cpp
@@ -0,0 +1,168 @@
+
+#include "impl_org_ortc_RTCDtmfSender.h"
+#include "impl_org_ortc_RTCRtpSender.h"
+#include "impl_org_ortc_RTCDtmfToneChangeEvent.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtmfSender::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtmfSender::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtmfSender::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtmfSender::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtmfSender::RTCDtmfSender()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtmfSenderPtr wrapper::org::ortc::RTCDtmfSender::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDtmfSender>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtmfSender::~RTCDtmfSender()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtmfSender::wrapper_init_org_ortc_RTCDtmfSender(wrapper::org::ortc::RTCRtpSenderPtr sender)
+{
+  native_ = NativeType::create(thisWeak_.lock(), RTCRtpSender::toNative(sender));
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCDtmfSender::canInsertDtmf()
+{
+  return native_->canInsertDTMF();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtmfSender::insertDtmf(String tones)
+{
+  native_->insertDTMF(tones);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtmfSender::insertDtmf(
+  String tones,
+  ::zsLib::Milliseconds duration
+  )
+{
+  native_->insertDTMF(tones, duration);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtmfSender::insertDtmf(
+  String tones,
+  ::zsLib::Milliseconds duration,
+  ::zsLib::Milliseconds interToneGap
+  )
+{
+  native_->insertDTMF(tones, duration, interToneGap);
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCDtmfSender::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpSenderPtr wrapper::impl::org::ortc::RTCDtmfSender::get_sender()
+{
+  return RTCRtpSender::toWrapper(native_->sender());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDtmfSender::get_toneBuffer()
+{
+  return native_->toneBuffer();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Milliseconds wrapper::impl::org::ortc::RTCDtmfSender::get_duration()
+{
+  return native_->duration();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Milliseconds wrapper::impl::org::ortc::RTCDtmfSender::get_interToneGap()
+{
+  return native_->interToneGap();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCDtmfSender::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onDTMFSenderToneChanged(
+  IDTMFSenderPtr sender,
+  String tone
+)
+{
+  onToneChange(RTCDtmfToneChangeEvent::toWrapper(tone));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtmfSender.h b/ortc/idl/wrapper/impl_org_ortc_RTCDtmfSender.h
new file mode 100644
index 00000000..405be85b
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtmfSender.h
@@ -0,0 +1,70 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDtmfSender.h"
+
+#include <ortc/IDTMFSender.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDtmfSender : public wrapper::org::ortc::RTCDtmfSender,
+                               public ::ortc::IDTMFSenderDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDTMFSender, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDTMFSender, IDTMFSender);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDTMFSenderSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDtmfSender, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDtmfSender, WrapperType);
+          RTCDtmfSenderWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_{ true };
+          NativeTypeSubscriptionPtr subscription_;
+
+          RTCDtmfSender();
+          virtual ~RTCDtmfSender();
+
+          // methods RTCDtmfSender
+          virtual void wrapper_init_org_ortc_RTCDtmfSender(wrapper::org::ortc::RTCRtpSenderPtr sender) override;
+          virtual bool canInsertDtmf() override;
+          virtual void insertDtmf(String tones) override;
+          virtual void insertDtmf(
+            String tones,
+            ::zsLib::Milliseconds duration
+            ) override;
+          virtual void insertDtmf(
+            String tones,
+            ::zsLib::Milliseconds duration,
+            ::zsLib::Milliseconds interToneGap
+            ) override;
+
+          // properties RTCDtmfSender
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::RTCRtpSenderPtr get_sender() override;
+          virtual String get_toneBuffer() override;
+          virtual ::zsLib::Milliseconds get_duration() override;
+          virtual ::zsLib::Milliseconds get_interToneGap() override;
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          virtual void onDTMFSenderToneChanged(
+            IDTMFSenderPtr sender,
+            String tone
+          ) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtmfToneChangeEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCDtmfToneChangeEvent.cpp
new file mode 100644
index 00000000..9be1d4a6
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtmfToneChangeEvent.cpp
@@ -0,0 +1,60 @@
+
+#include "impl_org_ortc_RTCDtmfToneChangeEvent.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtmfToneChangeEvent::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtmfToneChangeEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCDtmfToneChangeEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtmfToneChangeEvent::RTCDtmfToneChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtmfToneChangeEventPtr wrapper::org::ortc::RTCDtmfToneChangeEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCDtmfToneChangeEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCDtmfToneChangeEvent::~RTCDtmfToneChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCDtmfToneChangeEvent::get_tone()
+{
+  return native_;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeType native)
+{
+  if (!native) return WrapperImplTypePtr();
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCDtmfToneChangeEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCDtmfToneChangeEvent.h
new file mode 100644
index 00000000..1ae5b621
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCDtmfToneChangeEvent.h
@@ -0,0 +1,34 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCDtmfToneChangeEvent.h"
+
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCDtmfToneChangeEvent : public wrapper::org::ortc::RTCDtmfToneChangeEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(String, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCDtmfToneChangeEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCDtmfToneChangeEvent, WrapperType);
+          RTCDtmfToneChangeEventWeakPtr thisWeak_;
+          NativeType native_;
+
+          RTCDtmfToneChangeEvent();
+          virtual ~RTCDtmfToneChangeEvent();
+
+          // properties RTCDtmfToneChangeEvent
+          virtual String get_tone() override;
+
+          static WrapperImplTypePtr toWrapper(NativeType native);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidate.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidate.cpp
new file mode 100644
index 00000000..d75c841f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidate.cpp
@@ -0,0 +1,165 @@
+
+#include "impl_org_ortc_RTCIceCandidate.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidate::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidate::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidate::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidate::RTCIceCandidate()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePtr wrapper::org::ortc::RTCIceCandidate::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceCandidate>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidate::~RTCIceCandidate()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidate::wrapper_init_org_ortc_RTCIceCandidate()
+{
+  native_ = make_shared< NativeType >();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceCandidate::toJson()
+{
+  return Json::toWrapper(native_->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidate::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceComponent wrapper::impl::org::ortc::RTCIceCandidate::get_component()
+{
+  return Helper::toWrapper(native_->mComponent);
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidate::get_interfaceType()
+{
+  return native_->mInterfaceType;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidate::get_foundation()
+{
+  return native_->mFoundation;
+}
+
+//------------------------------------------------------------------------------
+uint32_t wrapper::impl::org::ortc::RTCIceCandidate::get_priority()
+{
+  return native_->mPriority;
+}
+
+//------------------------------------------------------------------------------
+uint32_t wrapper::impl::org::ortc::RTCIceCandidate::get_unfreezePriority()
+{
+  return native_->mUnfreezePriority;
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceProtocol wrapper::impl::org::ortc::RTCIceCandidate::get_protocol()
+{
+  return Helper::toWrapper(native_->mProtocol);
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidate::get_ip()
+{
+  return native_->mIP;
+}
+
+//------------------------------------------------------------------------------
+uint16_t wrapper::impl::org::ortc::RTCIceCandidate::get_port()
+{
+  return native_->mPort;
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidateType wrapper::impl::org::ortc::RTCIceCandidate::get_candidateType()
+{
+  return Helper::toWrapper(native_->mCandidateType);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTcpCandidateType wrapper::impl::org::ortc::RTCIceCandidate::get_tcpType()
+{
+  return Helper::toWrapper(native_->mTCPType);
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidate::get_relatedAddress()
+{
+  return native_->mRelatedAddress;
+}
+
+//------------------------------------------------------------------------------
+uint16_t wrapper::impl::org::ortc::RTCIceCandidate::get_relatedPort()
+{
+  return native_->mRelatedPort;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  return std::dynamic_pointer_cast<WrapperImplType>(wrapper)->native_;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(wrapper::org::ortc::RTCIceGathererCandidatePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+
+  return result->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidate.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidate.h
new file mode 100644
index 00000000..f54e0b1b
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidate.h
@@ -0,0 +1,55 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceCandidate.h"
+
+#include <ortc/IICETypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceCandidate : public wrapper::org::ortc::RTCIceCandidate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETypes::Candidate, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceCandidate, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceCandidate, WrapperType);
+          RTCIceCandidateWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCIceCandidate();
+          virtual ~RTCIceCandidate();
+
+          // methods RTCIceGathererCandidate
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCIceGathererCandidate
+          virtual wrapper::org::ortc::RTCIceComponent get_component() override;
+          virtual void wrapper_init_org_ortc_RTCIceCandidate() override;
+
+          // properties RTCIceCandidate
+          virtual String get_interfaceType() override;
+          virtual String get_foundation() override;
+          virtual uint32_t get_priority() override;
+          virtual uint32_t get_unfreezePriority() override;
+          virtual wrapper::org::ortc::RTCIceProtocol get_protocol() override;
+          virtual String get_ip() override;
+          virtual uint16_t get_port() override;
+          virtual wrapper::org::ortc::RTCIceCandidateType get_candidateType() override;
+          virtual wrapper::org::ortc::RTCIceTcpCandidateType get_tcpType() override;
+          virtual String get_relatedAddress() override;
+          virtual uint16_t get_relatedPort() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          static NativeTypePtr toNative(wrapper::org::ortc::RTCIceGathererCandidatePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateAttributes.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateAttributes.cpp
new file mode 100644
index 00000000..4e8ce48d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateAttributes.cpp
@@ -0,0 +1,161 @@
+
+#include "impl_org_ortc_RTCIceCandidateAttributes.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidateAttributes::RTCIceCandidateAttributes()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidateAttributesPtr wrapper::org::ortc::RTCIceCandidateAttributes::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceCandidateAttributes>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidateAttributes::~RTCIceCandidateAttributes()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceCandidateAttributes::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCIceCandidateAttributes"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidateAttributes::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidateAttributes::wrapper_init_org_ortc_RTCIceCandidateAttributes()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidateAttributes::wrapper_init_org_ortc_RTCIceCandidateAttributes(wrapper::org::ortc::RTCIceCandidateAttributesPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCIceCandidateAttributes();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidateAttributes::wrapper_init_org_ortc_RTCIceCandidateAttributes(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_relatedId()
+{
+  return native_->mRelatedID;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_ipAddress()
+{
+  return native_->mIPAddress;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_portNumber()
+{
+  return native_->mPortNumber;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_transport()
+{
+  return native_->mTransport;
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidateType wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_candidateType()
+{
+  return Helper::toWrapper(native_->mCandidateType);
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_priority()
+{
+  return native_->mPriority;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidateAttributes::get_addressSourceUrl()
+{
+  return native_->mAddressSourceURL;
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidateAttributesPtr wrapper::impl::org::ortc::RTCIceCandidateAttributes::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCIceCandidateAttributesPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceCandidateAttributes>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidateAttributes::NativeStatsPtr wrapper::impl::org::ortc::RTCIceCandidateAttributes::toNative(wrapper::org::ortc::RTCIceCandidateAttributesPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCIceCandidateAttributes>(wrapper)->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateAttributes.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateAttributes.h
new file mode 100644
index 00000000..c8a458f4
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateAttributes.h
@@ -0,0 +1,55 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceCandidateAttributes.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceCandidateAttributes : public wrapper::org::ortc::RTCIceCandidateAttributes
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::ICECandidateAttributes, NativeStats);
+          RTCIceCandidateAttributesWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCIceCandidateAttributes();
+          virtual ~RTCIceCandidateAttributes();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCIceCandidateAttributes
+          virtual void wrapper_init_org_ortc_RTCIceCandidateAttributes() override;
+          virtual void wrapper_init_org_ortc_RTCIceCandidateAttributes(wrapper::org::ortc::RTCIceCandidateAttributesPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCIceCandidateAttributes(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCIceCandidateAttributes
+          virtual String get_relatedId() override;
+          virtual String get_ipAddress() override;
+          virtual unsigned long get_portNumber() override;
+          virtual String get_transport() override;
+          virtual wrapper::org::ortc::RTCIceCandidateType get_candidateType() override;
+          virtual unsigned long get_priority() override;
+          virtual String get_addressSourceUrl() override;
+
+          static RTCIceCandidateAttributesPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCIceCandidateAttributesPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateComplete.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateComplete.cpp
new file mode 100644
index 00000000..eb937f8c
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateComplete.cpp
@@ -0,0 +1,106 @@
+
+#include "impl_org_ortc_RTCIceCandidateComplete.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidateComplete::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidateComplete::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidateComplete::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidateComplete::RTCIceCandidateComplete()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidateCompletePtr wrapper::org::ortc::RTCIceCandidateComplete::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceCandidateComplete>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidateComplete::~RTCIceCandidateComplete()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidateComplete::wrapper_init_org_ortc_RTCIceCandidateComplete()
+{
+  native_ = make_shared< NativeType >();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceCandidateComplete::toJson()
+{
+  return Json::toWrapper(native_->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidateComplete::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceComponent wrapper::impl::org::ortc::RTCIceCandidateComplete::get_component()
+{
+  return Helper::toWrapper(native_->mComponent);
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCIceCandidateComplete::get_complete()
+{
+  return native_->mComplete;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  return std::dynamic_pointer_cast<WrapperImplType>(wrapper)->native_;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(wrapper::org::ortc::RTCIceGathererCandidatePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+
+  return result->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateComplete.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateComplete.h
new file mode 100644
index 00000000..4c15367c
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidateComplete.h
@@ -0,0 +1,45 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceCandidateComplete.h"
+
+#include <ortc/IICETypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceCandidateComplete : public wrapper::org::ortc::RTCIceCandidateComplete
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETypes::CandidateComplete, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceCandidateComplete, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceCandidateComplete, WrapperType);
+          RTCIceCandidateCompleteWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCIceCandidateComplete();
+          virtual ~RTCIceCandidateComplete();
+
+          // methods RTCIceGathererCandidate
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCIceGathererCandidate
+          virtual wrapper::org::ortc::RTCIceComponent get_component() override;
+          virtual void wrapper_init_org_ortc_RTCIceCandidateComplete() override;
+
+          // properties RTCIceCandidateComplete
+          virtual bool get_complete() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          static NativeTypePtr toNative(wrapper::org::ortc::RTCIceGathererCandidatePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePair.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePair.cpp
new file mode 100644
index 00000000..b41b3696
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePair.cpp
@@ -0,0 +1,128 @@
+
+#include "impl_org_ortc_RTCIceCandidatePair.h"
+#include "impl_org_ortc_RTCIceCandidate.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidatePair::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidatePair::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidatePair::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidatePair::RTCIceCandidatePair()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePairPtr wrapper::org::ortc::RTCIceCandidatePair::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceCandidatePair>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidatePair::~RTCIceCandidatePair()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidatePair::wrapper_init_org_ortc_RTCIceCandidatePair()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidatePair::wrapper_init_org_ortc_RTCIceCandidatePair(wrapper::org::ortc::RTCIceCandidatePairPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidatePair::wrapper_init_org_ortc_RTCIceCandidatePair(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceCandidatePair::toJson()
+{
+  return Json::toWrapper(native_->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidatePair::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePtr wrapper::impl::org::ortc::RTCIceCandidatePair::get_local()
+{
+  return RTCIceCandidate::toWrapper(native_->mLocal);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidatePair::set_local(wrapper::org::ortc::RTCIceCandidatePtr value)
+{
+  native_->mLocal = RTCIceCandidate::toNative(value);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePtr wrapper::impl::org::ortc::RTCIceCandidatePair::get_remote()
+{
+  return RTCIceCandidate::toWrapper(native_->mRemote);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidatePair::set_remote(wrapper::org::ortc::RTCIceCandidatePtr value)
+{
+  native_->mRemote = RTCIceCandidate::toNative(value);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!impl) return NativeTypePtr();
+
+  return impl->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePair.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePair.h
new file mode 100644
index 00000000..a5f53b69
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePair.h
@@ -0,0 +1,46 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceCandidatePair.h"
+
+#include <ortc/IICETransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceCandidatePair : public wrapper::org::ortc::RTCIceCandidatePair
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETransportTypes::CandidatePair, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceCandidatePair, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceCandidatePair, WrapperType);
+          RTCIceCandidatePairWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCIceCandidatePair();
+          virtual ~RTCIceCandidatePair();
+
+          // methods RTCIceCandidatePair
+          virtual void wrapper_init_org_ortc_RTCIceCandidatePair() override;
+          virtual void wrapper_init_org_ortc_RTCIceCandidatePair(wrapper::org::ortc::RTCIceCandidatePairPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCIceCandidatePair(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCIceCandidatePair
+          virtual wrapper::org::ortc::RTCIceCandidatePtr get_local() override;
+          virtual void set_local(wrapper::org::ortc::RTCIceCandidatePtr value) override;
+          virtual wrapper::org::ortc::RTCIceCandidatePtr get_remote() override;
+          virtual void set_remote(wrapper::org::ortc::RTCIceCandidatePtr value) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp
new file mode 100644
index 00000000..51afe624
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp
@@ -0,0 +1,57 @@
+
+#include "impl_org_ortc_RTCIceCandidatePairChangeEvent.h"
+#include "impl_org_ortc_RTCIceCandidatePair.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidatePairChangeEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceCandidatePairChangeEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidatePairChangeEvent::RTCIceCandidatePairChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePairChangeEventPtr wrapper::org::ortc::RTCIceCandidatePairChangeEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceCandidatePairChangeEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidatePairChangeEvent::~RTCIceCandidatePairChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePairPtr wrapper::impl::org::ortc::RTCIceCandidatePairChangeEvent::get_candidatePair()
+{
+  return RTCIceCandidatePair::toWrapper(candidatePair_);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(::ortc::IICETransportTypes::CandidatePairPtr candidatePair)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->candidatePair_ = candidatePair;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairChangeEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairChangeEvent.h
new file mode 100644
index 00000000..7aee89d5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairChangeEvent.h
@@ -0,0 +1,34 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceCandidatePairChangeEvent.h"
+
+#include <ortc/IICETransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceCandidatePairChangeEvent : public wrapper::org::ortc::RTCIceCandidatePairChangeEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceCandidatePairChangeEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceCandidatePairChangeEvent, WrapperType);
+          RTCIceCandidatePairChangeEventWeakPtr thisWeak_;
+          ::ortc::IICETransportTypes::CandidatePairPtr candidatePair_;
+
+          RTCIceCandidatePairChangeEvent();
+          virtual ~RTCIceCandidatePairChangeEvent();
+
+          // properties RTCIceCandidatePairChangeEvent
+          virtual wrapper::org::ortc::RTCIceCandidatePairPtr get_candidatePair() override;
+
+          static WrapperImplTypePtr toWrapper(::ortc::IICETransportTypes::CandidatePairPtr candidatePair);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairStats.cpp
new file mode 100644
index 00000000..6be7dc40
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairStats.cpp
@@ -0,0 +1,196 @@
+
+#include "impl_org_ortc_RTCIceCandidatePairStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidatePairStats::RTCIceCandidatePairStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePairStatsPtr wrapper::org::ortc::RTCIceCandidatePairStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceCandidatePairStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidatePairStats::~RTCIceCandidatePairStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceCandidatePairStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCIceCandidatePairStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidatePairStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidatePairStats::wrapper_init_org_ortc_RTCIceCandidatePairStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidatePairStats::wrapper_init_org_ortc_RTCIceCandidatePairStats(wrapper::org::ortc::RTCIceCandidatePairStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCIceCandidatePairStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceCandidatePairStats::wrapper_init_org_ortc_RTCIceCandidatePairStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_transportId()
+{
+  return native_->mTransportID;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_localCandidateId()
+{
+  return native_->mLocalCandidateID;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_remoteCandidateId()
+{
+  return native_->mRemoteCandidateID;
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePairState wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_state()
+{
+  return Helper::toWrapper(native_->mState);
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_priority()
+{
+  return native_->mPriority;
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_nominated()
+{
+  return native_->mNominated;
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_writable()
+{
+  return native_->mWritable;
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_readable()
+{
+  return native_->mReadable;
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_bytesSent()
+{
+  return native_->mBytesSent;
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_bytesReceived()
+{
+  return native_->mBytesReceived;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_roundTripTime()
+{
+  return native_->mRoundTripTime;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_availableOutgoingBitrate()
+{
+  return native_->mAvailableOutgoingBitrate;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCIceCandidatePairStats::get_availableIncomingBitrate()
+{
+  return native_->mAvailableIncomingBitrate;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidatePairStatsPtr wrapper::impl::org::ortc::RTCIceCandidatePairStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCIceCandidatePairStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceCandidatePairStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceCandidatePairStats::NativeStatsPtr wrapper::impl::org::ortc::RTCIceCandidatePairStats::toNative(wrapper::org::ortc::RTCIceCandidatePairStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCIceCandidatePairStats>(wrapper)->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairStats.h
new file mode 100644
index 00000000..49bb76f5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceCandidatePairStats.h
@@ -0,0 +1,61 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceCandidatePairStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceCandidatePairStats : public wrapper::org::ortc::RTCIceCandidatePairStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::ICECandidatePairStats, NativeStats);
+          RTCIceCandidatePairStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCIceCandidatePairStats();
+          virtual ~RTCIceCandidatePairStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCIceCandidatePairStats
+          virtual void wrapper_init_org_ortc_RTCIceCandidatePairStats() override;
+          virtual void wrapper_init_org_ortc_RTCIceCandidatePairStats(wrapper::org::ortc::RTCIceCandidatePairStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCIceCandidatePairStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCIceCandidatePairStats
+          virtual String get_transportId() override;
+          virtual String get_localCandidateId() override;
+          virtual String get_remoteCandidateId() override;
+          virtual wrapper::org::ortc::RTCIceCandidatePairState get_state() override;
+          virtual unsigned long long get_priority() override;
+          virtual bool get_nominated() override;
+          virtual bool get_writable() override;
+          virtual bool get_readable() override;
+          virtual unsigned long long get_bytesSent() override;
+          virtual unsigned long long get_bytesReceived() override;
+          virtual double get_roundTripTime() override;
+          virtual double get_availableOutgoingBitrate() override;
+          virtual double get_availableIncomingBitrate() override;
+
+          static RTCIceCandidatePairStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCIceCandidatePairStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherInterfacePolicy.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherInterfacePolicy.cpp
new file mode 100644
index 00000000..9aef9cae
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherInterfacePolicy.cpp
@@ -0,0 +1,106 @@
+
+#include "impl_org_ortc_RTCIceGatherInterfacePolicy.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::RTCIceGatherInterfacePolicy()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGatherInterfacePolicyPtr wrapper::org::ortc::RTCIceGatherInterfacePolicy::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::~RTCIceGatherInterfacePolicy()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::wrapper_init_org_ortc_RTCIceGatherInterfacePolicy()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::wrapper_init_org_ortc_RTCIceGatherInterfacePolicy(wrapper::org::ortc::RTCIceGatherInterfacePolicyPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::wrapper_init_org_ortc_RTCIceGatherInterfacePolicy(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::WrapperImplTypePtr wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::WrapperImplTypePtr wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->interfaceType = native.mInterfaceType;
+  pThis->gatherPolicy = Helper::toWrapper(native.mGatherPolicy);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::NativeTypePtr wrapper::impl::org::ortc::RTCIceGatherInterfacePolicy::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mInterfaceType = wrapper->interfaceType;
+  result->mGatherPolicy = Helper::toNative(wrapper->gatherPolicy);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherInterfacePolicy.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherInterfacePolicy.h
new file mode 100644
index 00000000..f31f30aa
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherInterfacePolicy.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceGatherInterfacePolicy.h"
+
+#include <ortc/IICEGatherer.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceGatherInterfacePolicy : public wrapper::org::ortc::RTCIceGatherInterfacePolicy
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICEGathererTypes::InterfacePolicy, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceGatherInterfacePolicy, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceGatherInterfacePolicy, WrapperType);
+
+          RTCIceGatherInterfacePolicyWeakPtr thisWeak_;
+
+          RTCIceGatherInterfacePolicy();
+          virtual ~RTCIceGatherInterfacePolicy();
+
+          // methods RTCIceGatherInterfacePolicy
+          virtual void wrapper_init_org_ortc_RTCIceGatherInterfacePolicy() override;
+          virtual void wrapper_init_org_ortc_RTCIceGatherInterfacePolicy(wrapper::org::ortc::RTCIceGatherInterfacePolicyPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCIceGatherInterfacePolicy(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherOptions.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherOptions.cpp
new file mode 100644
index 00000000..c6e1b882
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherOptions.cpp
@@ -0,0 +1,127 @@
+
+#include "impl_org_ortc_RTCIceGatherOptions.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_RTCIceGatherInterfacePolicy.h"
+#include "impl_org_ortc_RTCIceServer.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherOptions::RTCIceGatherOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGatherOptionsPtr wrapper::org::ortc::RTCIceGatherOptions::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceGatherOptions>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherOptions::~RTCIceGatherOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherOptions::wrapper_init_org_ortc_RTCIceGatherOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherOptions::wrapper_init_org_ortc_RTCIceGatherOptions(wrapper::org::ortc::RTCIceGatherOptionsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherOptions::wrapper_init_org_ortc_RTCIceGatherOptions(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceGatherOptions::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCIceGatherOptions"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceGatherOptions::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherOptions::WrapperImplTypePtr wrapper::impl::org::ortc::RTCIceGatherOptions::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherOptions::WrapperImplTypePtr wrapper::impl::org::ortc::RTCIceGatherOptions::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->continuousGathering = native.mContinuousGathering;
+  pThis->interfacePolicies = make_shared< list<wrapper::org::ortc::RTCIceGatherInterfacePolicyPtr> >();
+  for (auto iter = native.mInterfacePolicies.begin(); iter != native.mInterfacePolicies.end(); ++iter) {
+    pThis->interfacePolicies->push_back(RTCIceGatherInterfacePolicy::toWrapper(*iter));
+  }
+  pThis->iceServers = make_shared< list<wrapper::org::ortc::RTCIceServerPtr> >();
+  for (auto iter = native.mICEServers.begin(); iter != native.mICEServers.end(); ++iter) {
+    pThis->iceServers->push_back(RTCIceServer::toWrapper(*iter));
+  }
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherOptions::NativeTypePtr wrapper::impl::org::ortc::RTCIceGatherOptions::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mContinuousGathering = wrapper->continuousGathering;
+  if (wrapper->interfacePolicies) {
+    for (auto iter = wrapper->interfacePolicies->begin(); iter != wrapper->interfacePolicies->end(); ++iter) {
+      auto value = RTCIceGatherInterfacePolicy::toNative(*iter);
+      if (!value) continue;
+      result->mInterfacePolicies.push_back(*value);
+    }
+  }
+  if (wrapper->iceServers) {
+    for (auto iter = wrapper->iceServers->begin(); iter != wrapper->iceServers->end(); ++iter) {
+      auto value = RTCIceServer::toNative(*iter);
+      if (!value) continue;
+      result->mICEServers.push_back(*value);
+    }
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherOptions.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherOptions.h
new file mode 100644
index 00000000..2d9ea690
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherOptions.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceGatherOptions.h"
+
+#include <ortc/IICEGatherer.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceGatherOptions : public wrapper::org::ortc::RTCIceGatherOptions
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICEGathererTypes::Options, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceGatherOptions, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceGatherOptions, WrapperType);
+          RTCIceGatherOptionsWeakPtr thisWeak_;
+
+          RTCIceGatherOptions();
+          virtual ~RTCIceGatherOptions();
+
+          // methods RTCIceGatherOptions
+          virtual void wrapper_init_org_ortc_RTCIceGatherOptions() override;
+          virtual void wrapper_init_org_ortc_RTCIceGatherOptions(wrapper::org::ortc::RTCIceGatherOptionsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCIceGatherOptions(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherer.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherer.cpp
new file mode 100644
index 00000000..4bc62d7c
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherer.cpp
@@ -0,0 +1,227 @@
+
+#include "impl_org_ortc_RTCIceGatherer.h"
+#include "impl_org_ortc_RTCIceCandidate.h"
+#include "impl_org_ortc_RTCIceParameters.h"
+#include "impl_org_ortc_RTCIceGatherOptions.h"
+#include "impl_org_ortc_RTCIceGathererStateChangeEvent.h"
+#include "impl_org_ortc_RTCIceGathererCandidateEvent.h"
+#include "impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h"
+#include "impl_org_ortc_RTCIceGathererIceErrorEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGatherer::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGatherer::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGatherer::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGatherer::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherer::RTCIceGatherer()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererPtr wrapper::org::ortc::RTCIceGatherer::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceGatherer>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGatherer::~RTCIceGatherer()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::RTCIceGatherer::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherer::wrapper_init_org_ortc_RTCIceGatherer(wrapper::org::ortc::RTCIceGatherOptionsPtr options)
+{
+  auto native = RTCIceGatherOptions::toNative(options);
+  ZS_THROW_INVALID_ARGUMENT_IF(!native);
+
+  native_ = NativeType::create(thisWeak_.lock(), *native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererPtr wrapper::impl::org::ortc::RTCIceGatherer::createAssociatedGatherer()
+{
+  return RTCIceGatherer::toWrapper(native_->createAssociatedGatherer(::ortc::IICEGathererDelegatePtr()));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherer::gather()
+{
+  native_->gather();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherer::gather(wrapper::org::ortc::RTCIceGatherOptionsPtr options)
+{
+  auto native = RTCIceGatherOptions::toNative(options);
+  if (!native) {
+    gather();
+    return;
+  }
+  native_->gather(*native);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherer::close()
+{
+  native_->close();
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCIceGatherer::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceComponent wrapper::impl::org::ortc::RTCIceGatherer::get_component()
+{
+  return Helper::toWrapper(native_->component());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererState wrapper::impl::org::ortc::RTCIceGatherer::get_state()
+{
+  return Helper::toWrapper(native_->state());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceParametersPtr wrapper::impl::org::ortc::RTCIceGatherer::get_localParameters()
+{
+  return RTCIceParameters::toWrapper(native_->getLocalParameters());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::RTCIceCandidatePtr > > wrapper::impl::org::ortc::RTCIceGatherer::get_localCandidates()
+{
+  auto result = make_shared< list< wrapper::org::ortc::RTCIceCandidatePtr > >();
+
+  auto nativeList = native_->getLocalCandidates();
+  if (nativeList) {
+    for (auto iter = nativeList->begin(); iter != nativeList->end(); ++iter) {
+      auto wrapper = RTCIceCandidate::toWrapper(make_shared<::ortc::IICETypes::Candidate>(*iter));
+      if (!wrapper) continue;
+      result->push_back(wrapper);
+    }
+  }
+  return result;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGatherer::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onICEGathererStateChange(
+  IICEGathererPtr gatherer,
+  IICEGatherer::States state
+)
+{
+  onStateChange(RTCIceGathererStateChangeEvent::toWrapper(state));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onICEGathererLocalCandidate(
+  IICEGathererPtr gatherer,
+  CandidatePtr candidate
+) 
+{
+  onLocalCandidate(RTCIceGathererCandidateEvent::toWrapper(candidate));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onICEGathererLocalCandidateComplete(
+  IICEGathererPtr gatherer,
+  CandidateCompletePtr candidate
+) 
+{
+  onLocalCandidateComplete(RTCIceGathererCandidateCompleteEvent::toWrapper(candidate));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onICEGathererLocalCandidateGone(
+  IICEGathererPtr gatherer,
+  CandidatePtr candidate
+) 
+{
+  onLocalCandidateGone(RTCIceGathererCandidateEvent::toWrapper(candidate));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onICEGathererError(
+  IICEGathererPtr gatherer,
+  ErrorEventPtr errorEvent
+) 
+{
+  onError(RTCIceGathererIceErrorEvent::toWrapper(errorEvent));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherer.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherer.h
new file mode 100644
index 00000000..6dc1236f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGatherer.h
@@ -0,0 +1,86 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceGatherer.h"
+
+#include <ortc/IICEGatherer.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceGatherer : public wrapper::org::ortc::RTCIceGatherer,
+                                public ::ortc::IICEGathererDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICEGatherer, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICEGatherer, IICEGatherer);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICEGathererSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceGatherer, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceGatherer, WrapperType);
+          RTCIceGathererWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_{ true };
+          NativeTypeSubscriptionPtr subscription_;
+
+          RTCIceGatherer();
+          virtual ~RTCIceGatherer();
+
+          // methods RTCStatsProvider
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+          // methods RTCIceGatherer
+          virtual void wrapper_init_org_ortc_RTCIceGatherer(wrapper::org::ortc::RTCIceGatherOptionsPtr options) override;
+          virtual wrapper::org::ortc::RTCIceGathererPtr createAssociatedGatherer() override;
+          virtual void gather() override;
+          virtual void gather(wrapper::org::ortc::RTCIceGatherOptionsPtr options) override;
+          virtual void close() override;
+
+          // properties RTCIceGatherer
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::RTCIceComponent get_component() override;
+          virtual wrapper::org::ortc::RTCIceGathererState get_state() override;
+          virtual wrapper::org::ortc::RTCIceParametersPtr get_localParameters() override;
+          virtual shared_ptr< list< wrapper::org::ortc::RTCIceCandidatePtr > > get_localCandidates() override;
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          virtual void onICEGathererStateChange(
+            IICEGathererPtr gatherer,
+            IICEGatherer::States state
+          ) override;
+
+          virtual void onICEGathererLocalCandidate(
+            IICEGathererPtr gatherer,
+            CandidatePtr candidate
+          ) override;
+
+          virtual void onICEGathererLocalCandidateComplete(
+            IICEGathererPtr gatherer,
+            CandidateCompletePtr candidate
+          ) override;
+
+          virtual void onICEGathererLocalCandidateGone(
+            IICEGathererPtr gatherer,
+            CandidatePtr candidate
+          ) override;
+
+          virtual void onICEGathererError(
+            IICEGathererPtr gatherer,
+            ErrorEventPtr errorEvent
+          ) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidate.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidate.cpp
new file mode 100644
index 00000000..f63915db
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidate.cpp
@@ -0,0 +1,134 @@
+
+#include "impl_org_ortc_RTCIceGathererCandidate.h"
+#include "impl_org_ortc_RTCIceCandidate.h"
+#include "impl_org_ortc_RTCIceCandidateComplete.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererCandidate::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererCandidate::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererCandidate::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererCandidate::RTCIceGathererCandidate()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererCandidatePtr wrapper::org::ortc::RTCIceGathererCandidate::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceGathererCandidate>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererCandidate::~RTCIceGathererCandidate()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererCandidatePtr wrapper::org::ortc::RTCIceGathererCandidate::create(wrapper::org::ortc::JsonPtr json)
+{
+  auto result = ::ortc::IICETypes::GatherCandidate::create(impl::org::ortc::Json::toNative(json));
+  {
+    auto native = std::dynamic_pointer_cast<::ortc::IICETypes::Candidate>(result);
+    if (native) return wrapper::impl::org::ortc::RTCIceCandidate::toWrapper(native);
+  }
+  {
+    auto native = std::dynamic_pointer_cast<::ortc::IICETypes::CandidateComplete>(result);
+    if (native) return wrapper::impl::org::ortc::RTCIceCandidateComplete::toWrapper(native);
+  }
+  return WrapperImplTypePtr();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceGathererCandidate::toJson()
+{
+  {
+    auto native = std::dynamic_pointer_cast<::ortc::IICETypes::Candidate>(native_);
+    if (native) return Json::toWrapper(native->createElement());
+  }
+  {
+    auto native = std::dynamic_pointer_cast<::ortc::IICETypes::CandidateComplete>(native_);
+    if (native) return Json::toWrapper(native->createElement());
+  }
+  return JsonPtr();
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceGathererCandidate::hash()
+{
+  {
+    auto native = std::dynamic_pointer_cast<::ortc::IICETypes::Candidate>(native_);
+    if (native) return native->hash();
+  }
+  {
+    auto native = std::dynamic_pointer_cast<::ortc::IICETypes::CandidateComplete>(native_);
+    if (native) return native->hash();
+  }
+  return String();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceComponent wrapper::impl::org::ortc::RTCIceGathererCandidate::get_component()
+{
+  return Helper::toWrapper(native_->mComponent);
+}
+
+//------------------------------------------------------------------------------
+WrapperTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperTypePtr();
+
+  {
+    auto converted = std::dynamic_pointer_cast<::ortc::IICETypes::Candidate>(native);
+    if (converted) return RTCIceCandidate::toWrapper(converted);
+  }
+  {
+    auto converted = std::dynamic_pointer_cast<::ortc::IICETypes::CandidateComplete>(native);
+    if (converted) return RTCIceCandidateComplete::toWrapper(converted);
+  }
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  {
+    wrapper::org::ortc::RTCIceCandidatePtr impl = std::dynamic_pointer_cast<wrapper::impl::org::ortc::RTCIceCandidate>(wrapper);
+    if (impl) return RTCIceCandidate::toNative(impl);
+  }
+
+  {
+    wrapper::org::ortc::RTCIceCandidateCompletePtr impl = std::dynamic_pointer_cast<wrapper::impl::org::ortc::RTCIceCandidateComplete>(wrapper);
+    if (impl) return RTCIceCandidateComplete::toNative(impl);
+  }
+
+  return std::dynamic_pointer_cast<WrapperImplType>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidate.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidate.h
new file mode 100644
index 00000000..18b23f25
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidate.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceGathererCandidate.h"
+
+#include <ortc/IICETypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceGathererCandidate : public wrapper::org::ortc::RTCIceGathererCandidate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETypes::GatherCandidate, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceGathererCandidate, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceGathererCandidate, WrapperType);
+          RTCIceGathererCandidateWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCIceGathererCandidate();
+          virtual ~RTCIceGathererCandidate();
+
+          // methods RTCIceGathererCandidate
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCIceGathererCandidate
+          virtual wrapper::org::ortc::RTCIceComponent get_component() override;
+
+          static WrapperTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp
new file mode 100644
index 00000000..d44c9ea3
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp
@@ -0,0 +1,57 @@
+
+#include "impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h"
+#include "impl_org_ortc_RTCIceCandidateComplete.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererCandidateCompleteEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererCandidateCompleteEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererCandidateCompleteEvent::RTCIceGathererCandidateCompleteEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererCandidateCompleteEventPtr wrapper::org::ortc::RTCIceGathererCandidateCompleteEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceGathererCandidateCompleteEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererCandidateCompleteEvent::~RTCIceGathererCandidateCompleteEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidateCompletePtr wrapper::impl::org::ortc::RTCIceGathererCandidateCompleteEvent::get_candidate()
+{
+  return candidate_;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(::ortc::IICEGathererTypes::CandidateCompletePtr candidate)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->candidate_ = RTCIceCandidateComplete::toWrapper(candidate);
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h
new file mode 100644
index 00000000..367e38e6
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h
@@ -0,0 +1,34 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceGathererCandidateCompleteEvent.h"
+
+#include <ortc/IICEGatherer.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceGathererCandidateCompleteEvent : public wrapper::org::ortc::RTCIceGathererCandidateCompleteEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceGathererCandidateCompleteEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceGathererCandidateCompleteEvent, WrapperType);
+          RTCIceGathererCandidateCompleteEventWeakPtr thisWeak_;
+          wrapper::org::ortc::RTCIceCandidateCompletePtr candidate_;
+
+          RTCIceGathererCandidateCompleteEvent();
+          virtual ~RTCIceGathererCandidateCompleteEvent();
+
+          // properties RTCIceGathererCandidateCompleteEvent
+          virtual wrapper::org::ortc::RTCIceCandidateCompletePtr get_candidate() override;
+
+          static WrapperImplTypePtr toWrapper(::ortc::IICEGathererTypes::CandidateCompletePtr candidate);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateEvent.cpp
new file mode 100644
index 00000000..ec9c233e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateEvent.cpp
@@ -0,0 +1,67 @@
+
+#include "impl_org_ortc_RTCIceGathererCandidateEvent.h"
+#include "impl_org_ortc_RTCIceCandidate.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererCandidateEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererCandidateEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererCandidateEvent::RTCIceGathererCandidateEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererCandidateEventPtr wrapper::org::ortc::RTCIceGathererCandidateEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceGathererCandidateEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererCandidateEvent::~RTCIceGathererCandidateEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePtr wrapper::impl::org::ortc::RTCIceGathererCandidateEvent::get_candidate()
+{
+  return candidate_;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceGathererCandidateEvent::get_url()
+{
+  return url_;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(
+  ::ortc::IICEGathererTypes::CandidatePtr candidate,
+  const String &url
+)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->candidate_ = RTCIceCandidate::toWrapper(candidate);
+  pThis->url_ = url;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateEvent.h
new file mode 100644
index 00000000..7ff17ace
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererCandidateEvent.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceGathererCandidateEvent.h"
+
+#include <ortc/IICEGatherer.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceGathererCandidateEvent : public wrapper::org::ortc::RTCIceGathererCandidateEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceGathererCandidateEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceGathererCandidateEvent, WrapperType);
+          RTCIceGathererCandidateEventWeakPtr thisWeak_;
+          wrapper::org::ortc::RTCIceCandidatePtr candidate_;
+          String url_;
+
+          RTCIceGathererCandidateEvent();
+          virtual ~RTCIceGathererCandidateEvent();
+
+          // properties RTCIceGathererCandidateEvent
+          virtual wrapper::org::ortc::RTCIceCandidatePtr get_candidate() override;
+          virtual String get_url() override;
+
+          static WrapperImplTypePtr toWrapper(
+            ::ortc::IICEGathererTypes::CandidatePtr candidate,
+            const String &url = String()
+          );
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererIceErrorEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererIceErrorEvent.cpp
new file mode 100644
index 00000000..fe02e365
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererIceErrorEvent.cpp
@@ -0,0 +1,77 @@
+
+#include "impl_org_ortc_RTCIceGathererIceErrorEvent.h"
+#include "impl_org_ortc_RTCIceCandidate.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererIceErrorEvent::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererIceErrorEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererIceErrorEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererIceErrorEvent::RTCIceGathererIceErrorEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererIceErrorEventPtr wrapper::org::ortc::RTCIceGathererIceErrorEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceGathererIceErrorEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererIceErrorEvent::~RTCIceGathererIceErrorEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePtr wrapper::impl::org::ortc::RTCIceGathererIceErrorEvent::get_hostCandidate()
+{
+  return RTCIceCandidate::toWrapper(native_->mHostCandidate);
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceGathererIceErrorEvent::get_url()
+{
+  return native_->mURL;
+}
+
+//------------------------------------------------------------------------------
+uint16_t wrapper::impl::org::ortc::RTCIceGathererIceErrorEvent::get_errorCode()
+{
+  return native_->mErrorCode;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceGathererIceErrorEvent::get_errorText()
+{
+  return native_->mErrorText;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererIceErrorEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererIceErrorEvent.h
new file mode 100644
index 00000000..b1e6b64a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererIceErrorEvent.h
@@ -0,0 +1,38 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceGathererIceErrorEvent.h"
+
+#include <ortc/IICEGatherer.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceGathererIceErrorEvent : public wrapper::org::ortc::RTCIceGathererIceErrorEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICEGathererTypes::ErrorEvent, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceGathererIceErrorEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceGathererIceErrorEvent, WrapperType);
+          RTCIceGathererIceErrorEventWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCIceGathererIceErrorEvent();
+          virtual ~RTCIceGathererIceErrorEvent();
+
+          // properties RTCIceGathererIceErrorEvent
+          virtual wrapper::org::ortc::RTCIceCandidatePtr get_hostCandidate() override;
+          virtual String get_url() override;
+          virtual uint16_t get_errorCode() override;
+          virtual String get_errorText() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStateChangeEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStateChangeEvent.cpp
new file mode 100644
index 00000000..2b449f01
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStateChangeEvent.cpp
@@ -0,0 +1,58 @@
+
+#include "impl_org_ortc_RTCIceGathererStateChangeEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererStateChangeEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceGathererStateChangeEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererStateChangeEvent::RTCIceGathererStateChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererStateChangeEventPtr wrapper::org::ortc::RTCIceGathererStateChangeEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceGathererStateChangeEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererStateChangeEvent::~RTCIceGathererStateChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererState wrapper::impl::org::ortc::RTCIceGathererStateChangeEvent::get_state()
+{
+  return Helper::toWrapper(state_);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(::ortc::IICEGathererTypes::States state)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->state_ = state;
+  return pThis;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStateChangeEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStateChangeEvent.h
new file mode 100644
index 00000000..24b4173c
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStateChangeEvent.h
@@ -0,0 +1,34 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceGathererStateChangeEvent.h"
+
+#include <ortc/IICEGatherer.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceGathererStateChangeEvent : public wrapper::org::ortc::RTCIceGathererStateChangeEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceGathererStateChangeEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceGathererStateChangeEvent, WrapperType);
+          RTCIceGathererStateChangeEventWeakPtr thisWeak_;
+          ::ortc::IICEGathererTypes::States state_ { ::ortc::IICEGathererTypes::State_First};
+
+          RTCIceGathererStateChangeEvent();
+          virtual ~RTCIceGathererStateChangeEvent();
+
+          // properties RTCIceGathererStateChangeEvent
+          virtual wrapper::org::ortc::RTCIceGathererState get_state() override;
+
+          static WrapperImplTypePtr toWrapper(::ortc::IICEGathererTypes::States state);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStats.cpp
new file mode 100644
index 00000000..6fe2f658
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStats.cpp
@@ -0,0 +1,136 @@
+
+#include "impl_org_ortc_RTCIceGathererStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererStats::RTCIceGathererStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererStatsPtr wrapper::org::ortc::RTCIceGathererStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceGathererStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererStats::~RTCIceGathererStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceGathererStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCIceGathererStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceGathererStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCIceGathererStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCIceGathererStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceGathererStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceGathererStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGathererStats::wrapper_init_org_ortc_RTCIceGathererStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGathererStats::wrapper_init_org_ortc_RTCIceGathererStats(wrapper::org::ortc::RTCIceGathererStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCIceGathererStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceGathererStats::wrapper_init_org_ortc_RTCIceGathererStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCIceGathererStats::get_bytesSent()
+{
+  return native_->mBytesSent;
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCIceGathererStats::get_bytesReceived()
+{
+  return native_->mBytesReceived;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceGathererStats::get_rtcpGathererStatsId()
+{
+  return native_->mRTCPGathererStatsID;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererStatsPtr wrapper::impl::org::ortc::RTCIceGathererStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCIceGathererStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceGathererStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceGathererStats::NativeStatsPtr wrapper::impl::org::ortc::RTCIceGathererStats::toNative(wrapper::org::ortc::RTCIceGathererStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCIceGathererStats>(wrapper)->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStats.h
new file mode 100644
index 00000000..798411ad
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceGathererStats.h
@@ -0,0 +1,51 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceGathererStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceGathererStats : public wrapper::org::ortc::RTCIceGathererStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::ICEGathererStats, NativeStats);
+          RTCIceGathererStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCIceGathererStats();
+          virtual ~RTCIceGathererStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCIceGathererStats
+          virtual void wrapper_init_org_ortc_RTCIceGathererStats() override;
+          virtual void wrapper_init_org_ortc_RTCIceGathererStats(wrapper::org::ortc::RTCIceGathererStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCIceGathererStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCIceGathererStats
+          virtual unsigned long long get_bytesSent() override;
+          virtual unsigned long long get_bytesReceived() override;
+          virtual String get_rtcpGathererStatsId() override;
+
+          static RTCIceGathererStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCIceGathererStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceParameters.cpp
new file mode 100644
index 00000000..1f695f12
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceParameters.cpp
@@ -0,0 +1,113 @@
+
+#include "impl_org_ortc_RTCIceParameters.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceParameters::RTCIceParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceParametersPtr wrapper::org::ortc::RTCIceParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceParameters::~RTCIceParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceParameters::wrapper_init_org_ortc_RTCIceParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceParameters::wrapper_init_org_ortc_RTCIceParameters(wrapper::org::ortc::RTCIceParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceParameters::wrapper_init_org_ortc_RTCIceParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCIceParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->useUnfreezePriority = native.mUseUnfreezePriority;
+  pThis->usernameFragment = native.mUsernameFragment;
+  pThis->password = native.mPassword;
+  pThis->iceLite = native.mICELite;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mUseUnfreezePriority = wrapper->useUnfreezePriority;
+  result->mUsernameFragment = wrapper->usernameFragment;
+  result->mPassword = wrapper->password;
+  result->mICELite = wrapper->iceLite;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceParameters.h
new file mode 100644
index 00000000..8c5b4ea1
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceParameters.h"
+
+#include <ortc/IICETypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceParameters : public wrapper::org::ortc::RTCIceParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETypes::Parameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceParameters, WrapperType);
+          RTCIceParametersWeakPtr thisWeak_;
+
+          RTCIceParameters();
+          virtual ~RTCIceParameters();
+
+          // methods RTCIceParameters
+          virtual void wrapper_init_org_ortc_RTCIceParameters() override;
+          virtual void wrapper_init_org_ortc_RTCIceParameters(wrapper::org::ortc::RTCIceParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCIceParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceServer.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceServer.cpp
new file mode 100644
index 00000000..d4a21b17
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceServer.cpp
@@ -0,0 +1,112 @@
+
+#include "impl_org_ortc_RTCIceServer.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceServer::RTCIceServer()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceServerPtr wrapper::org::ortc::RTCIceServer::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceServer>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceServer::~RTCIceServer()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceServer::wrapper_init_org_ortc_RTCIceServer()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceServer::wrapper_init_org_ortc_RTCIceServer(wrapper::org::ortc::RTCIceServerPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceServer::wrapper_init_org_ortc_RTCIceServer(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceServer::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCIceServer"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceServer::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceServer::WrapperImplTypePtr wrapper::impl::org::ortc::RTCIceServer::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceServer::WrapperImplTypePtr wrapper::impl::org::ortc::RTCIceServer::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->urls = make_shared< list<String> >(native.mURLs);
+  pThis->username = native.mUserName;
+  pThis->credential = native.mCredential;
+  pThis->credentialType = Helper::toWrapper(native.mCredentialType);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceServer::NativeTypePtr wrapper::impl::org::ortc::RTCIceServer::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  if (wrapper->urls) {
+    result->mURLs = *(wrapper->urls);
+  }
+  result->mUserName = wrapper->username;
+  result->mCredential = wrapper->credential;
+  result->mCredentialType = Helper::toNative(wrapper->credentialType);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceServer.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceServer.h
new file mode 100644
index 00000000..0cd07282
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceServer.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceServer.h"
+
+#include <ortc/IICEGatherer.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceServer : public wrapper::org::ortc::RTCIceServer
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICEGathererTypes::Server, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceServer, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceServer, WrapperType);
+          RTCIceServerWeakPtr thisWeak_;
+
+          RTCIceServer();
+          virtual ~RTCIceServer();
+
+          // methods RTCIceServer
+          virtual void wrapper_init_org_ortc_RTCIceServer() override;
+          virtual void wrapper_init_org_ortc_RTCIceServer(wrapper::org::ortc::RTCIceServerPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCIceServer(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceTransport.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransport.cpp
new file mode 100644
index 00000000..6a6517bd
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransport.cpp
@@ -0,0 +1,320 @@
+
+#include "impl_org_ortc_RTCIceTransport.h"
+#include "impl_org_ortc_RTCIceParameters.h"
+#include "impl_org_ortc_RTCIceCandidate.h"
+#include "impl_org_ortc_RTCIceCandidatePair.h"
+#include "impl_org_ortc_RTCIceGatherer.h"
+#include "impl_org_ortc_RTCIceGathererCandidate.h"
+#include "impl_org_ortc_RTCIceParameters.h"
+#include "impl_org_ortc_RTCIceTransportOptions.h"
+#include "impl_org_ortc_RTCIceTransportStateChangeEvent.h"
+#include "impl_org_ortc_RTCIceCandidatePairChangeEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransport::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransport::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransport::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransport::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransport::RTCIceTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportPtr wrapper::org::ortc::RTCIceTransport::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceTransport>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransport::~RTCIceTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::RTCIceTransport::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::wrapper_init_org_ortc_RTCIceTransport()
+{
+  native_ = NativeType::create(thisWeak_.lock());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::wrapper_init_org_ortc_RTCIceTransport(wrapper::org::ortc::RTCIceGathererPtr gatherer)
+{
+  native_ = NativeType::create(thisWeak_.lock(), RTCIceGatherer::toNative(gatherer));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::start(
+  wrapper::org::ortc::RTCIceGathererPtr gatherer,
+  wrapper::org::ortc::RTCIceParametersPtr remoteParameters
+  )
+{
+  auto nativeParams = RTCIceParameters::toNative(remoteParameters);
+  ZS_THROW_INVALID_ARGUMENT_IF(!nativeParams);
+
+  native_->start(RTCIceGatherer::toNative(gatherer), *nativeParams);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::start(
+  wrapper::org::ortc::RTCIceGathererPtr gatherer,
+  wrapper::org::ortc::RTCIceParametersPtr remoteParameters,
+  wrapper::org::ortc::RTCIceRole role
+  )
+{
+  auto nativeParams = RTCIceParameters::toNative(remoteParameters);
+  ZS_THROW_INVALID_ARGUMENT_IF(!nativeParams);
+
+  ::ortc::IICETransport::Options optionalOptions;
+  optionalOptions.mRole = Helper::toNative(role);
+
+  native_->start(RTCIceGatherer::toNative(gatherer), *nativeParams, optionalOptions);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::start(
+  wrapper::org::ortc::RTCIceGathererPtr gatherer,
+  wrapper::org::ortc::RTCIceParametersPtr remoteParameters,
+  wrapper::org::ortc::RTCIceTransportOptionsPtr options
+  )
+{
+  auto nativeParams = RTCIceParameters::toNative(remoteParameters);
+  ZS_THROW_INVALID_ARGUMENT_IF(!nativeParams);
+
+  auto nativeOptions = RTCIceTransportOptions::toNative(options);
+  Optional<::ortc::IICETransport::Options> optionalOptions;
+  if (nativeOptions) {
+    optionalOptions = *nativeOptions;
+  }
+
+  native_->start(RTCIceGatherer::toNative(gatherer), *nativeParams, optionalOptions);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::stop()
+{
+  native_->stop();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportPtr wrapper::impl::org::ortc::RTCIceTransport::createAssociatedTransport()
+{
+  return RTCIceTransport::toWrapper(native_->createAssociatedTransport(::ortc::IICETransportDelegatePtr()));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::addRemoteCandidate(wrapper::org::ortc::RTCIceGathererCandidatePtr remoteCandidate)
+{
+  auto native = RTCIceGathererCandidate::toNative(remoteCandidate);
+  if (!native) return;
+  native_->addRemoteCandidate(*native);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::setRemoteCandidates(shared_ptr< list< wrapper::org::ortc::RTCIceCandidatePtr > > remoteCandidates)
+{
+  list< ::ortc::IICETypes::Candidate > nativeList;
+  if (remoteCandidates) {
+    for (auto iter = remoteCandidates->begin(); iter != remoteCandidates->end(); ++iter) {
+      auto native = RTCIceCandidate::toNative(*iter);
+      if (!native) continue;
+      nativeList.push_back(*native);
+    }
+  }
+  native_->setRemoteCandidates(nativeList);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::removeRemoteCandidate(wrapper::org::ortc::RTCIceGathererCandidatePtr remoteCandidate)
+{
+  auto native = RTCIceGathererCandidate::toNative(remoteCandidate);
+  if (!native) return;
+  native_->removeRemoteCandidate(*native);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::keepWarm(wrapper::org::ortc::RTCIceCandidatePairPtr candidatePair)
+{
+  auto native = RTCIceCandidatePair::toNative(candidatePair);
+  if (!native) return;
+  native_->keepWarm(*native);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::keepWarm(
+  wrapper::org::ortc::RTCIceCandidatePairPtr candidatePair,
+  bool keepWarm
+  )
+{
+  auto native = RTCIceCandidatePair::toNative(candidatePair);
+  if (!native) return;
+  native_->keepWarm(*native, keepWarm);
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCIceTransport::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererPtr wrapper::impl::org::ortc::RTCIceTransport::get_gatherer()
+{
+  return RTCIceGatherer::toWrapper(native_->iceGatherer());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceRole wrapper::impl::org::ortc::RTCIceTransport::get_role()
+{
+  return Helper::toWrapper(native_->role());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceComponent wrapper::impl::org::ortc::RTCIceTransport::get_component()
+{
+  return Helper::toWrapper(native_->component());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportState wrapper::impl::org::ortc::RTCIceTransport::get_state()
+{
+  return Helper::toWrapper(native_->state());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::RTCIceCandidatePtr > > wrapper::impl::org::ortc::RTCIceTransport::get_remoteCandidates()
+{
+  auto result = make_shared< list< wrapper::org::ortc::RTCIceCandidatePtr > >();
+  auto native = native_->getRemoteCandidates();
+  if (native) {
+    for (auto iter = native->begin(); iter != native->end(); ++iter) {
+      auto wrapper = RTCIceCandidate::toWrapper(make_shared<::ortc::IICETypes::Candidate>(*iter));
+      if (!wrapper) continue;
+      result->push_back(wrapper);
+    }
+  }
+  return result;
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceCandidatePairPtr wrapper::impl::org::ortc::RTCIceTransport::get_selectedCandidatePair()
+{
+  return RTCIceCandidatePair::toWrapper(native_->getSelectedCandidatePair());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceParametersPtr wrapper::impl::org::ortc::RTCIceTransport::get_remoteParameters()
+{
+  return RTCIceParameters::toWrapper(native_->getRemoteParameters());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransport::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onICETransportStateChange(
+  IICETransportPtr transport,
+  IICETransport::States state
+)
+{
+  onStateChange(RTCIceTransportStateChangeEvent::toWrapper(state));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onICETransportCandidatePairAvailable(
+  IICETransportPtr transport,
+  CandidatePairPtr candidatePair
+)
+{
+  onCandidatePairAvailable(RTCIceCandidatePairChangeEvent::toWrapper(candidatePair));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onICETransportCandidatePairGone(
+  IICETransportPtr transport,
+  CandidatePairPtr candidatePair
+)
+{
+  onCandidatePairGone(RTCIceCandidatePairChangeEvent::toWrapper(candidatePair));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onICETransportCandidatePairChanged(
+  IICETransportPtr transport,
+  CandidatePairPtr candidatePair
+)
+{
+  onCandidatePairChange(RTCIceCandidatePairChangeEvent::toWrapper(candidatePair));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceTransport.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransport.h
new file mode 100644
index 00000000..16de14cb
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransport.h
@@ -0,0 +1,103 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceTransport.h"
+
+#include <ortc/IICETransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceTransport : public wrapper::org::ortc::RTCIceTransport,
+                                 public ::ortc::IICETransportDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETransport, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETransport, IICETransport);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETransportSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceTransport, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceTransport, WrapperType);
+          RTCIceTransportWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_{ true };
+          NativeTypeSubscriptionPtr subscription_;
+
+          RTCIceTransport();
+          virtual ~RTCIceTransport();
+
+          // methods RTCStatsProvider
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+          // methods RTCIceTransport
+          virtual void wrapper_init_org_ortc_RTCIceTransport() override;
+          virtual void wrapper_init_org_ortc_RTCIceTransport(wrapper::org::ortc::RTCIceGathererPtr gatherer) override;
+          virtual void start(
+            wrapper::org::ortc::RTCIceGathererPtr gatherer,
+            wrapper::org::ortc::RTCIceParametersPtr remoteParameters
+            ) override;
+          virtual void start(
+            wrapper::org::ortc::RTCIceGathererPtr gatherer,
+            wrapper::org::ortc::RTCIceParametersPtr remoteParameters,
+            wrapper::org::ortc::RTCIceRole role
+            ) override;
+          virtual void start(
+            wrapper::org::ortc::RTCIceGathererPtr gatherer,
+            wrapper::org::ortc::RTCIceParametersPtr remoteParameters,
+            wrapper::org::ortc::RTCIceTransportOptionsPtr options
+            ) override;
+          virtual void stop() override;
+          virtual wrapper::org::ortc::RTCIceTransportPtr createAssociatedTransport() override;
+          virtual void addRemoteCandidate(wrapper::org::ortc::RTCIceGathererCandidatePtr remoteCandidate) override;
+          virtual void setRemoteCandidates(shared_ptr< list< wrapper::org::ortc::RTCIceCandidatePtr > > remoteCandidates) override;
+          virtual void removeRemoteCandidate(wrapper::org::ortc::RTCIceGathererCandidatePtr remoteCandidate) override;
+          virtual void keepWarm(wrapper::org::ortc::RTCIceCandidatePairPtr candidatePair) override;
+          virtual void keepWarm(
+            wrapper::org::ortc::RTCIceCandidatePairPtr candidatePair,
+            bool keepWarm
+            ) override;
+
+          // properties RTCIceTransport
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::RTCIceGathererPtr get_gatherer() override;
+          virtual wrapper::org::ortc::RTCIceRole get_role() override;
+          virtual wrapper::org::ortc::RTCIceComponent get_component() override;
+          virtual wrapper::org::ortc::RTCIceTransportState get_state() override;
+          virtual shared_ptr< list< wrapper::org::ortc::RTCIceCandidatePtr > > get_remoteCandidates() override;
+          virtual wrapper::org::ortc::RTCIceCandidatePairPtr get_selectedCandidatePair() override;
+          virtual wrapper::org::ortc::RTCIceParametersPtr get_remoteParameters() override;
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          virtual void onICETransportStateChange(
+            IICETransportPtr transport,
+            IICETransport::States state
+          ) override;
+          virtual void onICETransportCandidatePairAvailable(
+            IICETransportPtr transport,
+            CandidatePairPtr candidatePair
+          ) override;
+          virtual void onICETransportCandidatePairGone(
+            IICETransportPtr transport,
+            CandidatePairPtr candidatePair
+          ) override;
+
+          virtual void onICETransportCandidatePairChanged(
+            IICETransportPtr transport,
+            CandidatePairPtr candidatePair
+          ) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportController.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportController.cpp
new file mode 100644
index 00000000..1f03280f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportController.cpp
@@ -0,0 +1,107 @@
+
+#include "impl_org_ortc_RTCIceTransportController.h"
+#include "impl_org_ortc_RTCIceTransport.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransportController::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransportController::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransportController::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransportController::RTCIceTransportController()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportControllerPtr wrapper::org::ortc::RTCIceTransportController::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceTransportController>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransportController::~RTCIceTransportController()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransportController::wrapper_init_org_ortc_RTCIceTransportController()
+{
+  native_ = NativeType::create();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransportController::addTransport(wrapper::org::ortc::RTCIceTransportPtr transport)
+{
+  return native_->addTransport(RTCIceTransport::toNative(transport));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransportController::addTransport(
+  wrapper::org::ortc::RTCIceTransportPtr transport,
+  uint64_t index
+  )
+{
+  size_t native = SafeInt<size_t>(index);
+  return native_->addTransport(RTCIceTransport::toNative(transport), native);
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCIceTransportController::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::RTCIceTransportPtr > > wrapper::impl::org::ortc::RTCIceTransportController::get_transports()
+{
+  auto result = make_shared< list< wrapper::org::ortc::RTCIceTransportPtr > >();
+  auto native = native_->getTransports();
+  for (auto iter = native.begin(); iter != native.end(); ++iter) {
+    auto wrapper = RTCIceTransport::toWrapper(*iter);
+    if (!wrapper) continue;
+    result->push_back(wrapper);
+  }
+  return result;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportController.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportController.h
new file mode 100644
index 00000000..3e9c73f6
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportController.h
@@ -0,0 +1,47 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceTransportController.h"
+
+#include <ortc/IICETransportController.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceTransportController : public wrapper::org::ortc::RTCIceTransportController
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETransportController, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETransportController, IICETransportController);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceTransportController, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceTransportController, WrapperType);
+
+          RTCIceTransportControllerWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCIceTransportController();
+          virtual ~RTCIceTransportController();
+
+          // methods RTCIceTransportController
+          virtual void wrapper_init_org_ortc_RTCIceTransportController() override;
+          virtual void addTransport(wrapper::org::ortc::RTCIceTransportPtr transport) override;
+          virtual void addTransport(
+            wrapper::org::ortc::RTCIceTransportPtr transport,
+            uint64_t index
+            ) override;
+
+          // properties RTCIceTransportController
+          virtual uint64_t get_objectId() override;
+          virtual shared_ptr< list< wrapper::org::ortc::RTCIceTransportPtr > > get_transports() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportOptions.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportOptions.cpp
new file mode 100644
index 00000000..7b2be74c
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportOptions.cpp
@@ -0,0 +1,110 @@
+
+#include "impl_org_ortc_RTCIceTransportOptions.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransportOptions::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransportOptions::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransportOptions::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransportOptions::RTCIceTransportOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportOptionsPtr wrapper::org::ortc::RTCIceTransportOptions::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceTransportOptions>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransportOptions::~RTCIceTransportOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransportOptions::wrapper_init_org_ortc_RTCIceTransportOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransportOptions::wrapper_init_org_ortc_RTCIceTransportOptions(wrapper::org::ortc::RTCIceTransportOptionsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransportOptions::wrapper_init_org_ortc_RTCIceTransportOptions(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceTransportOptions::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCIceTransportOptions"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceTransportOptions::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->aggressiveIce = native.mAggressiveICE;
+  pThis->role = Helper::toWrapper(native.mRole);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mAggressiveICE = wrapper->aggressiveIce;
+  result->mRole = Helper::toNative(wrapper->role);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportOptions.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportOptions.h
new file mode 100644
index 00000000..c789f14b
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportOptions.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceTransportOptions.h"
+
+#include <ortc/IICETransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceTransportOptions : public wrapper::org::ortc::RTCIceTransportOptions
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IICETransportTypes::Options, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceTransportOptions, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceTransportOptions, WrapperType);
+          RTCIceTransportOptionsWeakPtr thisWeak_;
+
+          RTCIceTransportOptions();
+          virtual ~RTCIceTransportOptions();
+
+          // methods RTCIceTransportOptions
+          virtual void wrapper_init_org_ortc_RTCIceTransportOptions() override;
+          virtual void wrapper_init_org_ortc_RTCIceTransportOptions(wrapper::org::ortc::RTCIceTransportOptionsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCIceTransportOptions(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStateChangeEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStateChangeEvent.cpp
new file mode 100644
index 00000000..37dd8f61
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStateChangeEvent.cpp
@@ -0,0 +1,57 @@
+
+#include "impl_org_ortc_RTCIceTransportStateChangeEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransportStateChangeEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCIceTransportStateChangeEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransportStateChangeEvent::RTCIceTransportStateChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportStateChangeEventPtr wrapper::org::ortc::RTCIceTransportStateChangeEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceTransportStateChangeEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransportStateChangeEvent::~RTCIceTransportStateChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportState wrapper::impl::org::ortc::RTCIceTransportStateChangeEvent::get_state()
+{
+  return Helper::toWrapper(state_);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(::ortc::IICETransportTypes::States state)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->state_ = state;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStateChangeEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStateChangeEvent.h
new file mode 100644
index 00000000..bebeb857
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStateChangeEvent.h
@@ -0,0 +1,34 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceTransportStateChangeEvent.h"
+
+#include <ortc/IICETransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceTransportStateChangeEvent : public wrapper::org::ortc::RTCIceTransportStateChangeEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(RTCIceTransportStateChangeEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCIceTransportStateChangeEvent, WrapperType);
+          RTCIceTransportStateChangeEventWeakPtr thisWeak_;
+          ::ortc::IICETransportTypes::States state_ { ::ortc::IICETransportTypes::State_First};
+
+          RTCIceTransportStateChangeEvent();
+          virtual ~RTCIceTransportStateChangeEvent();
+
+          // properties RTCIceTransportStateChangeEvent
+          virtual wrapper::org::ortc::RTCIceTransportState get_state() override;
+
+          static WrapperImplTypePtr toWrapper(::ortc::IICETransportTypes::States state);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStats.cpp
new file mode 100644
index 00000000..7be89d15
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStats.cpp
@@ -0,0 +1,148 @@
+
+#include "impl_org_ortc_RTCIceTransportStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransportStats::RTCIceTransportStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportStatsPtr wrapper::org::ortc::RTCIceTransportStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceTransportStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransportStats::~RTCIceTransportStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCIceTransportStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCIceTransportStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceTransportStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCIceTransportStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCIceTransportStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceTransportStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceTransportStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransportStats::wrapper_init_org_ortc_RTCIceTransportStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransportStats::wrapper_init_org_ortc_RTCIceTransportStats(wrapper::org::ortc::RTCIceTransportStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCIceTransportStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIceTransportStats::wrapper_init_org_ortc_RTCIceTransportStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCIceTransportStats::get_bytesSent()
+{
+  return native_->mBytesSent;
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCIceTransportStats::get_bytesReceived()
+{
+  return native_->mBytesReceived;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceTransportStats::get_rtcpTransportStatsId()
+{
+  return native_->mRTCPTransportStatsID;
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCIceTransportStats::get_activeConnection()
+{
+  return native_->mActiveConnection;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCIceTransportStats::get_selectedCandidatePairId()
+{
+  return native_->mSelectedCandidatePairID;
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransportStatsPtr wrapper::impl::org::ortc::RTCIceTransportStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCIceTransportStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIceTransportStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIceTransportStats::NativeStatsPtr wrapper::impl::org::ortc::RTCIceTransportStats::toNative(wrapper::org::ortc::RTCIceTransportStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCIceTransportStats>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStats.h
new file mode 100644
index 00000000..a86c8dc5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIceTransportStats.h
@@ -0,0 +1,53 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIceTransportStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIceTransportStats : public wrapper::org::ortc::RTCIceTransportStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::ICETransportStats, NativeStats);
+          RTCIceTransportStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCIceTransportStats();
+          virtual ~RTCIceTransportStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCIceTransportStats
+          virtual void wrapper_init_org_ortc_RTCIceTransportStats() override;
+          virtual void wrapper_init_org_ortc_RTCIceTransportStats(wrapper::org::ortc::RTCIceTransportStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCIceTransportStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCIceTransportStats
+          virtual unsigned long long get_bytesSent() override;
+          virtual unsigned long long get_bytesReceived() override;
+          virtual String get_rtcpTransportStatsId() override;
+          virtual bool get_activeConnection() override;
+          virtual String get_selectedCandidatePairId() override;
+
+          static RTCIceTransportStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCIceTransportStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIdentity.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIdentity.cpp
new file mode 100644
index 00000000..ae8d181e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIdentity.cpp
@@ -0,0 +1,150 @@
+
+#include "impl_org_ortc_RTCIdentity.h"
+#include "impl_org_ortc_RTCIdentityAssertion.h"
+#include "impl_org_ortc_RTCIdentityResult.h"
+#include "impl_org_ortc_RTCIdentityError.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentity::RTCIdentity()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIdentityPtr wrapper::org::ortc::RTCIdentity::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIdentity>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentity::~RTCIdentity()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIdentity::wrapper_init_org_ortc_RTCIdentity(wrapper::org::ortc::RTCDtlsTransportPtr transport)
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCIdentityResultPtr > > wrapper::impl::org::ortc::RTCIdentity::getIdentityAssertion(String provider)
+{
+  return getIdentityAssertion(provider, String(), String());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCIdentityResultPtr > > wrapper::impl::org::ortc::RTCIdentity::getIdentityAssertion(
+  String provider,
+  String protocol
+  )
+{
+  return getIdentityAssertion(provider, protocol, String());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCIdentityResultPtr > > wrapper::impl::org::ortc::RTCIdentity::getIdentityAssertion(
+  String provider,
+  String protocol,
+  String username
+  )
+{
+  typedef PromiseWithHolderPtr< wrapper::org::ortc::RTCIdentityResultPtr > PromiseWithType;
+
+  auto result = PromiseWithType::create(Helper::getGuiQueue());
+
+  if (protocol.isEmpty()) {
+    protocol = "default";
+  }
+
+  auto promise = native_->getIdentityAssertion(provider, protocol, username.hasData() ? username.c_str() : NULL);
+
+  promise->thenClosure([promise, result] {
+    if (promise->isRejected()) {
+      typedef AnyHolder< RTCIdentityErrorPtr > AnyHolderType;
+
+      auto nativeReason = promise->reason();
+      if (nativeReason) {
+        auto reason = make_shared<AnyHolderType>();
+        reason->value_ = RTCIdentityError::toWrapper(nativeReason);
+        result->reject(reason);
+        return;
+      }
+      Helper::reject(promise, result);
+      return;
+    }
+    result->resolve(RTCIdentityResult::toWrapper(promise->value()));
+  });
+  promise->background();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCIdentityAssertionPtr > > wrapper::impl::org::ortc::RTCIdentity::setIdentityAssertion(String assertion)
+{
+  ZS_DECLARE_TYPEDEF_PTR(PromiseWithHolderPtr< wrapper::org::ortc::RTCIdentityAssertionPtr >, PromiseWithType);
+
+  auto promise = native_->setIdentityAssertion(assertion);
+  if (!promise) return PromiseWithTypePtr();
+
+  auto result = PromiseWithType::create(Helper::getGuiQueue());
+
+  promise->thenClosure([promise, result] {
+    if (promise->isRejected()) {
+      Helper::reject(promise, result);
+      return;
+    }
+    result->resolve(RTCIdentityAssertion::toWrapper(promise->value()));
+  });
+  promise->background();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCIdentity::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIdentityAssertionPtr wrapper::impl::org::ortc::RTCIdentity::get_peerIdentity()
+{
+  return RTCIdentityAssertion::toWrapper(native_->peerIdentity());
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityPtr wrapper::impl::org::ortc::RTCIdentity::toWrapper(NativeIdentityPtr native)
+{
+  if (!native) return RTCIdentityPtr();
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIdentity>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentity::NativeIdentityPtr wrapper::impl::org::ortc::RTCIdentity::toNative(wrapper::org::ortc::RTCIdentityPtr wrapper)
+{
+  if (!wrapper) return NativeIdentityPtr();
+  return std::dynamic_pointer_cast<wrapper::impl::org::ortc::RTCIdentity>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIdentity.h b/ortc/idl/wrapper/impl_org_ortc_RTCIdentity.h
new file mode 100644
index 00000000..380cdb7d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIdentity.h
@@ -0,0 +1,49 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIdentity.h"
+
+#include <ortc/IIdentity.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIdentity : public wrapper::org::ortc::RTCIdentity
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IIdentity, NativeIdentity);
+          RTCIdentityWeakPtr thisWeak_;
+          NativeIdentityPtr native_;
+
+          RTCIdentity();
+          virtual ~RTCIdentity();
+
+          // methods RTCIdentity
+          virtual void wrapper_init_org_ortc_RTCIdentity(wrapper::org::ortc::RTCDtlsTransportPtr transport) override;
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCIdentityResultPtr > > getIdentityAssertion(String provider) override;
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCIdentityResultPtr > > getIdentityAssertion(
+            String provider,
+            String protocol
+            ) override;
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCIdentityResultPtr > > getIdentityAssertion(
+            String provider,
+            String protocol,
+            String username
+            ) override;
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCIdentityAssertionPtr > > setIdentityAssertion(String assertion) override;
+
+          // properties RTCIdentity
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::RTCIdentityAssertionPtr get_peerIdentity() override;
+
+          static RTCIdentityPtr toWrapper(NativeIdentityPtr native);
+          static NativeIdentityPtr toNative(wrapper::org::ortc::RTCIdentityPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIdentityAssertion.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityAssertion.cpp
new file mode 100644
index 00000000..db2a1baf
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityAssertion.cpp
@@ -0,0 +1,73 @@
+
+#include "impl_org_ortc_RTCIdentityAssertion.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityAssertion::RTCIdentityAssertion()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIdentityAssertionPtr wrapper::org::ortc::RTCIdentityAssertion::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIdentityAssertion>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityAssertion::~RTCIdentityAssertion()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIdentityAssertion::wrapper_init_org_ortc_RTCIdentityAssertion()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityAssertionPtr wrapper::impl::org::ortc::RTCIdentityAssertion::toWrapper(NativeAssertionPtr native)
+{
+  if (!native) return RTCIdentityAssertionPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityAssertionPtr wrapper::impl::org::ortc::RTCIdentityAssertion::toWrapper(const NativeAssertion &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIdentityAssertion>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->idp = native.mIDP;
+  pThis->name = native.mName;
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityAssertion::NativeAssertionPtr wrapper::impl::org::ortc::RTCIdentityAssertion::toNative(wrapper::org::ortc::RTCIdentityAssertionPtr wrapper)
+{
+  if (!wrapper) return NativeAssertionPtr();
+
+  auto result = make_shared<NativeAssertion>();
+  result->mIDP = wrapper->idp;
+  result->mName = wrapper->name;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIdentityAssertion.h b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityAssertion.h
new file mode 100644
index 00000000..286f1fd5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityAssertion.h
@@ -0,0 +1,32 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIdentityAssertion.h"
+
+#include <ortc/IIdentity.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIdentityAssertion : public wrapper::org::ortc::RTCIdentityAssertion
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IIdentityTypes::Assertion, NativeAssertion);
+          RTCIdentityAssertionWeakPtr thisWeak_;
+
+          RTCIdentityAssertion();
+          virtual ~RTCIdentityAssertion();
+          virtual void wrapper_init_org_ortc_RTCIdentityAssertion() override;
+
+          static RTCIdentityAssertionPtr toWrapper(NativeAssertionPtr native);
+          static RTCIdentityAssertionPtr toWrapper(const NativeAssertion &native);
+          static NativeAssertionPtr toNative(wrapper::org::ortc::RTCIdentityAssertionPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIdentityError.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityError.cpp
new file mode 100644
index 00000000..8533f560
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityError.cpp
@@ -0,0 +1,74 @@
+
+#include "impl_org_ortc_RTCIdentityError.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityError::RTCIdentityError()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIdentityErrorPtr wrapper::org::ortc::RTCIdentityError::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIdentityError>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityError::~RTCIdentityError()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIdentityError::wrapper_init_org_ortc_RTCIdentityError()
+{
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityErrorPtr wrapper::impl::org::ortc::RTCIdentityError::toWrapper(NativeErrorPtr native)
+{
+  if (!native) return RTCIdentityErrorPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityErrorPtr wrapper::impl::org::ortc::RTCIdentityError::toWrapper(const NativeError &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIdentityError>();
+  pThis->thisWeak_ = pThis;
+  pThis->idp = native.mIDP;
+  pThis->protocol = native.mProtocol;
+  pThis->loginUrl = native.mLoginURL;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityError::NativeErrorPtr wrapper::impl::org::ortc::RTCIdentityError::toWrapper(wrapper::org::ortc::RTCIdentityErrorPtr wrapper)
+{
+  if (!wrapper) return NativeErrorPtr();
+
+  auto result = make_shared<NativeError>();
+  result->mIDP = wrapper->idp;
+  result->mProtocol = wrapper->protocol;
+  result->mLoginURL = wrapper->loginUrl;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIdentityError.h b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityError.h
new file mode 100644
index 00000000..1b3e2348
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityError.h
@@ -0,0 +1,33 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIdentityError.h"
+
+#include <ortc/IIdentity.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIdentityError : public wrapper::org::ortc::RTCIdentityError
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IIdentityTypes::Error, NativeError);
+
+          RTCIdentityErrorWeakPtr thisWeak_;
+
+          RTCIdentityError();
+          virtual ~RTCIdentityError();
+          virtual void wrapper_init_org_ortc_RTCIdentityError() override;
+
+          static RTCIdentityErrorPtr toWrapper(NativeErrorPtr native);
+          static RTCIdentityErrorPtr toWrapper(const NativeError &native);
+          static NativeErrorPtr toWrapper(wrapper::org::ortc::RTCIdentityErrorPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIdentityResult.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityResult.cpp
new file mode 100644
index 00000000..1298275b
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityResult.cpp
@@ -0,0 +1,70 @@
+
+#include "impl_org_ortc_RTCIdentityResult.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityResult::RTCIdentityResult()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIdentityResultPtr wrapper::org::ortc::RTCIdentityResult::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIdentityResult>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityResult::~RTCIdentityResult()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCIdentityResult::wrapper_init_org_ortc_RTCIdentityResult()
+{
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityResultPtr wrapper::impl::org::ortc::RTCIdentityResult::toWrapper(NativeResultPtr native)
+{
+  if (!native) return RTCIdentityResultPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityResultPtr wrapper::impl::org::ortc::RTCIdentityResult::toWrapper(const NativeResult &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCIdentityResult>();
+  pThis->thisWeak_ = pThis;
+  pThis->assertion = native.mAssertion;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCIdentityResult::NativeResultPtr wrapper::impl::org::ortc::RTCIdentityResult::toNative(wrapper::org::ortc::RTCIdentityResultPtr wrapper)
+{
+  if (!wrapper) return NativeResultPtr();
+
+  auto result = make_shared<NativeResult>();
+  result->mAssertion = wrapper->assertion;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCIdentityResult.h b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityResult.h
new file mode 100644
index 00000000..dec0b3e2
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCIdentityResult.h
@@ -0,0 +1,32 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCIdentityResult.h"
+
+#include <ortc/IIdentity.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCIdentityResult : public wrapper::org::ortc::RTCIdentityResult
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IIdentityTypes::Result, NativeResult);
+          RTCIdentityResultWeakPtr thisWeak_;
+
+          RTCIdentityResult();
+          virtual ~RTCIdentityResult();
+          virtual void wrapper_init_org_ortc_RTCIdentityResult() override;
+
+          static RTCIdentityResultPtr toWrapper(NativeResultPtr native);
+          static RTCIdentityResultPtr toWrapper(const NativeResult &native);
+          static NativeResultPtr toNative(wrapper::org::ortc::RTCIdentityResultPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCInboundRtpStreamStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCInboundRtpStreamStats.cpp
new file mode 100644
index 00000000..aba51318
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCInboundRtpStreamStats.cpp
@@ -0,0 +1,220 @@
+
+#include "impl_org_ortc_RTCInboundRtpStreamStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCInboundRtpStreamStats::RTCInboundRtpStreamStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCInboundRtpStreamStatsPtr wrapper::org::ortc::RTCInboundRtpStreamStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCInboundRtpStreamStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCInboundRtpStreamStats::~RTCInboundRtpStreamStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCInboundRtpStreamStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCInboundRtpStreamStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCInboundRtpStreamStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+Optional< uint32_t > wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_ssrc()
+{
+  return native_->mSSRC;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_associatedStatId()
+{
+  return native_->mAssociatedStatID;
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_isRemote()
+{
+  return native_->mIsRemote;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_mediaType()
+{
+  return native_->mMediaType;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_mediaTrackId()
+{
+  return native_->mMediaTrackID;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_transportId()
+{
+  return native_->mTransportID;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_codecId()
+{
+  return native_->mCodecID;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_firCount()
+{
+  return native_->mFIRCount;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_pliCount()
+{
+  return native_->mPLICount;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_nackCount()
+{
+  return native_->mNACKCount;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_sliCount()
+{
+  return native_->mSLICount;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCInboundRtpStreamStats::wrapper_init_org_ortc_RTCInboundRtpStreamStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCInboundRtpStreamStats::wrapper_init_org_ortc_RTCInboundRtpStreamStats(wrapper::org::ortc::RTCInboundRtpStreamStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCInboundRtpStreamStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCInboundRtpStreamStats::wrapper_init_org_ortc_RTCInboundRtpStreamStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_packetsReceived()
+{
+  return native_->mPacketsReceived;
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_bytesReceived()
+{
+  return native_->mBytesReceived;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_packetsLost()
+{
+  return native_->mPacketsLost;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_jitter()
+{
+  return native_->mJitter;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_fractionLost()
+{
+  return native_->mFractionLost;
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Milliseconds wrapper::impl::org::ortc::RTCInboundRtpStreamStats::get_endToEndDelay()
+{
+  return native_->mEndToEndDelay;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCInboundRtpStreamStatsPtr wrapper::impl::org::ortc::RTCInboundRtpStreamStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCInboundRtpStreamStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCInboundRtpStreamStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCInboundRtpStreamStats::NativeStatsPtr wrapper::impl::org::ortc::RTCInboundRtpStreamStats::toNative(wrapper::org::ortc::RTCInboundRtpStreamStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCInboundRtpStreamStats>(wrapper)->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCInboundRtpStreamStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCInboundRtpStreamStats.h
new file mode 100644
index 00000000..6d6fbe7a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCInboundRtpStreamStats.h
@@ -0,0 +1,67 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCInboundRtpStreamStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCInboundRtpStreamStats : public wrapper::org::ortc::RTCInboundRtpStreamStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::InboundRTPStreamStats, NativeStats);
+          RTCInboundRtpStreamStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCInboundRtpStreamStats();
+          virtual ~RTCInboundRtpStreamStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // properties RTCRtpStreamStats
+          virtual Optional< uint32_t > get_ssrc() override;
+          virtual String get_associatedStatId() override;
+          virtual bool get_isRemote() override;
+          virtual String get_mediaType() override;
+          virtual String get_mediaTrackId() override;
+          virtual String get_transportId() override;
+          virtual String get_codecId() override;
+          virtual unsigned long get_firCount() override;
+          virtual unsigned long get_pliCount() override;
+          virtual unsigned long get_nackCount() override;
+          virtual unsigned long get_sliCount() override;
+
+          // methods RTCInboundRtpStreamStats
+          virtual void wrapper_init_org_ortc_RTCInboundRtpStreamStats() override;
+          virtual void wrapper_init_org_ortc_RTCInboundRtpStreamStats(wrapper::org::ortc::RTCInboundRtpStreamStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCInboundRtpStreamStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCInboundRtpStreamStats
+          virtual unsigned long get_packetsReceived() override;
+          virtual unsigned long long get_bytesReceived() override;
+          virtual unsigned long get_packetsLost() override;
+          virtual double get_jitter() override;
+          virtual double get_fractionLost() override;
+          virtual ::zsLib::Milliseconds get_endToEndDelay() override;
+
+          static RTCInboundRtpStreamStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCInboundRtpStreamStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamStats.cpp
new file mode 100644
index 00000000..d9b401f1
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamStats.cpp
@@ -0,0 +1,129 @@
+
+#include "impl_org_ortc_RTCMediaStreamStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCMediaStreamStats::RTCMediaStreamStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCMediaStreamStatsPtr wrapper::org::ortc::RTCMediaStreamStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCMediaStreamStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCMediaStreamStats::~RTCMediaStreamStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCMediaStreamStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCMediaStreamStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCMediaStreamStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCMediaStreamStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCMediaStreamStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCMediaStreamStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCMediaStreamStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCMediaStreamStats::wrapper_init_org_ortc_RTCMediaStreamStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCMediaStreamStats::wrapper_init_org_ortc_RTCMediaStreamStats(wrapper::org::ortc::RTCMediaStreamStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCMediaStreamStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCMediaStreamStats::wrapper_init_org_ortc_RTCMediaStreamStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCMediaStreamStats::get_streamId()
+{
+  return native_->mStreamID;
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< String > > wrapper::impl::org::ortc::RTCMediaStreamStats::get_trackIds()
+{
+  return make_shared< list<String> >(native_->mTrackIDs);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCMediaStreamStatsPtr wrapper::impl::org::ortc::RTCMediaStreamStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCMediaStreamStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCMediaStreamStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCMediaStreamStats::NativeStatsPtr wrapper::impl::org::ortc::RTCMediaStreamStats::toNative(wrapper::org::ortc::RTCMediaStreamStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCMediaStreamStats>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamStats.h
new file mode 100644
index 00000000..3cb4be29
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamStats.h
@@ -0,0 +1,50 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCMediaStreamStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCMediaStreamStats : public wrapper::org::ortc::RTCMediaStreamStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::MediaStreamStats, NativeStats);
+          RTCMediaStreamStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCMediaStreamStats();
+          virtual ~RTCMediaStreamStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCMediaStreamStats
+          virtual void wrapper_init_org_ortc_RTCMediaStreamStats() override;
+          virtual void wrapper_init_org_ortc_RTCMediaStreamStats(wrapper::org::ortc::RTCMediaStreamStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCMediaStreamStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCMediaStreamStats
+          virtual String get_streamId() override;
+          virtual shared_ptr< list< String > > get_trackIds() override;
+
+          static RTCMediaStreamStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCMediaStreamStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamTrackStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamTrackStats.cpp
new file mode 100644
index 00000000..e37c49fd
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamTrackStats.cpp
@@ -0,0 +1,207 @@
+
+#include "impl_org_ortc_RTCMediaStreamTrackStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCMediaStreamTrackStats::RTCMediaStreamTrackStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCMediaStreamTrackStatsPtr wrapper::org::ortc::RTCMediaStreamTrackStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCMediaStreamTrackStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCMediaStreamTrackStats::~RTCMediaStreamTrackStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCMediaStreamTrackStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCMediaStreamTrackStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCMediaStreamTrackStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCMediaStreamTrackStats::wrapper_init_org_ortc_RTCMediaStreamTrackStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCMediaStreamTrackStats::wrapper_init_org_ortc_RTCMediaStreamTrackStats(wrapper::org::ortc::RTCMediaStreamTrackStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCMediaStreamTrackStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCMediaStreamTrackStats::wrapper_init_org_ortc_RTCMediaStreamTrackStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_trackId()
+{
+  return native_->mTrackID;
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_remoteSource()
+{
+  return native_->mRemoteSource;
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< uint32_t > > wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_ssrcIds()
+{
+  auto result = make_shared< list<uint32_t> >();
+  for (auto iter = native_->mSSRCIDs.begin(); iter != native_->mSSRCIDs.end(); ++iter)
+  {
+    result->push_back(*iter);
+  }
+  return result;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_frameWidth()
+{
+  return native_->mFrameWidth;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_frameHeight()
+{
+  return native_->mFrameHeight;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_framesPerSecond()
+{
+  return native_->mFramesPerSecond;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_framesSent()
+{
+  return native_->mFramesSent;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_framesReceived()
+{
+  return native_->mFramesReceived;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_framesDecoded()
+{
+  return native_->mFramesDecoded;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_framesDropped()
+{
+  return native_->mFramesDropped;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_framesCorrupted()
+{
+  return native_->mFramesCorrupted;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_audioLevel()
+{
+  return native_->mAudioLevel;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_echoReturnLoss()
+{
+  return native_->mEchoReturnLoss;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCMediaStreamTrackStats::get_echoReturnLossEnhancement()
+{
+  return native_->mEchoReturnLossEnhancement;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCMediaStreamTrackStatsPtr wrapper::impl::org::ortc::RTCMediaStreamTrackStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCMediaStreamTrackStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCMediaStreamTrackStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCMediaStreamTrackStats::NativeStatsPtr wrapper::impl::org::ortc::RTCMediaStreamTrackStats::toNative(wrapper::org::ortc::RTCMediaStreamTrackStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCMediaStreamTrackStats>(wrapper)->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamTrackStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamTrackStats.h
new file mode 100644
index 00000000..8c67efea
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCMediaStreamTrackStats.h
@@ -0,0 +1,62 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCMediaStreamTrackStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCMediaStreamTrackStats : public wrapper::org::ortc::RTCMediaStreamTrackStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::MediaStreamTrackStats, NativeStats);
+          RTCMediaStreamTrackStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCMediaStreamTrackStats();
+          virtual ~RTCMediaStreamTrackStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCMediaStreamTrackStats
+          virtual void wrapper_init_org_ortc_RTCMediaStreamTrackStats() override;
+          virtual void wrapper_init_org_ortc_RTCMediaStreamTrackStats(wrapper::org::ortc::RTCMediaStreamTrackStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCMediaStreamTrackStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCMediaStreamTrackStats
+          virtual String get_trackId() override;
+          virtual bool get_remoteSource() override;
+          virtual shared_ptr< list< uint32_t > > get_ssrcIds() override;
+          virtual unsigned long get_frameWidth() override;
+          virtual unsigned long get_frameHeight() override;
+          virtual double get_framesPerSecond() override;
+          virtual unsigned long get_framesSent() override;
+          virtual unsigned long get_framesReceived() override;
+          virtual unsigned long get_framesDecoded() override;
+          virtual unsigned long get_framesDropped() override;
+          virtual unsigned long get_framesCorrupted() override;
+          virtual double get_audioLevel() override;
+          virtual double get_echoReturnLoss() override;
+          virtual double get_echoReturnLossEnhancement() override;
+
+          static RTCMediaStreamTrackStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCMediaStreamTrackStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCMessageEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCMessageEvent.cpp
new file mode 100644
index 00000000..8740dab0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCMessageEvent.cpp
@@ -0,0 +1,65 @@
+
+#include "impl_org_ortc_RTCMessageEvent.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCMessageEvent::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCMessageEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCMessageEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCMessageEvent::RTCMessageEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCMessageEventPtr wrapper::org::ortc::RTCMessageEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCMessageEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCMessageEvent::~RTCMessageEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+SecureByteBlockPtr wrapper::impl::org::ortc::RTCMessageEvent::get_binary()
+{
+  return native_->mBinary;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCMessageEvent::get_text()
+{
+  return native_->mText;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCMessageEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCMessageEvent.h
new file mode 100644
index 00000000..3e451e79
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCMessageEvent.h
@@ -0,0 +1,36 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCMessageEvent.h"
+
+#include <ortc/IDataChannel.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCMessageEvent : public wrapper::org::ortc::RTCMessageEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IDataChannelDelegate::MessageEventData, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCMessageEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCMessageEvent, WrapperType);
+          RTCMessageEventWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCMessageEvent();
+          virtual ~RTCMessageEvent();
+
+          // properties RTCMessageEvent
+          virtual SecureByteBlockPtr get_binary() override;
+          virtual String get_text() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCOutboundRtpStreamStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCOutboundRtpStreamStats.cpp
new file mode 100644
index 00000000..6105d676
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCOutboundRtpStreamStats.cpp
@@ -0,0 +1,208 @@
+
+#include "impl_org_ortc_RTCOutboundRtpStreamStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::RTCOutboundRtpStreamStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCOutboundRtpStreamStatsPtr wrapper::org::ortc::RTCOutboundRtpStreamStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCOutboundRtpStreamStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::~RTCOutboundRtpStreamStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCOutboundRtpStreamStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+Optional< uint32_t > wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_ssrc()
+{
+  return native_->mSSRC;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_associatedStatId()
+{
+  return native_->mAssociatedStatID;
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_isRemote()
+{
+  return native_->mIsRemote;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_mediaType()
+{
+  return native_->mMediaType;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_mediaTrackId()
+{
+  return native_->mMediaTrackID;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_transportId()
+{
+  return native_->mTransportID;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_codecId()
+{
+  return native_->mCodecID;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_firCount()
+{
+  return native_->mFIRCount;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_pliCount()
+{
+  return native_->mPLICount;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_nackCount()
+{
+  return native_->mNACKCount;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_sliCount()
+{
+  return native_->mSLICount;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::wrapper_init_org_ortc_RTCOutboundRtpStreamStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::wrapper_init_org_ortc_RTCOutboundRtpStreamStats(wrapper::org::ortc::RTCOutboundRtpStreamStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCOutboundRtpStreamStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::wrapper_init_org_ortc_RTCOutboundRtpStreamStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_packetsSent()
+{
+  return native_->mPacketsSent;
+}
+
+//------------------------------------------------------------------------------
+unsigned long long wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_bytesSent()
+{
+  return native_->mBytesSent;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_targetBitrate()
+{
+  return native_->mTargetBitrate;
+}
+
+//------------------------------------------------------------------------------
+double wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::get_roundTripTime()
+{
+  return native_->mRoundTripTime;
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCOutboundRtpStreamStatsPtr wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCOutboundRtpStreamStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCOutboundRtpStreamStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::NativeStatsPtr wrapper::impl::org::ortc::RTCOutboundRtpStreamStats::toNative(wrapper::org::ortc::RTCOutboundRtpStreamStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCOutboundRtpStreamStats>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCOutboundRtpStreamStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCOutboundRtpStreamStats.h
new file mode 100644
index 00000000..43e26870
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCOutboundRtpStreamStats.h
@@ -0,0 +1,66 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCOutboundRtpStreamStats.h"
+
+#include <ortc/IStatsReport.h>
+
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCOutboundRtpStreamStats : public wrapper::org::ortc::RTCOutboundRtpStreamStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::OutboundRTPStreamStats, NativeStats);
+          RTCOutboundRtpStreamStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCOutboundRtpStreamStats();
+          virtual ~RTCOutboundRtpStreamStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // properties RTCRtpStreamStats
+          virtual Optional< uint32_t > get_ssrc() override;
+          virtual String get_associatedStatId() override;
+          virtual bool get_isRemote() override;
+          virtual String get_mediaType() override;
+          virtual String get_mediaTrackId() override;
+          virtual String get_transportId() override;
+          virtual String get_codecId() override;
+          virtual unsigned long get_firCount() override;
+          virtual unsigned long get_pliCount() override;
+          virtual unsigned long get_nackCount() override;
+          virtual unsigned long get_sliCount() override;
+
+          // methods RTCOutboundRtpStreamStats
+          virtual void wrapper_init_org_ortc_RTCOutboundRtpStreamStats() override;
+          virtual void wrapper_init_org_ortc_RTCOutboundRtpStreamStats(wrapper::org::ortc::RTCOutboundRtpStreamStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCOutboundRtpStreamStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCOutboundRtpStreamStats
+          virtual unsigned long get_packetsSent() override;
+          virtual unsigned long long get_bytesSent() override;
+          virtual double get_targetBitrate() override;
+          virtual double get_roundTripTime() override;
+
+          static RTCOutboundRtpStreamStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCOutboundRtpStreamStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtcpFeedback.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpFeedback.cpp
new file mode 100644
index 00000000..75e4e9e0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpFeedback.cpp
@@ -0,0 +1,109 @@
+
+#include "impl_org_ortc_RTCRtcpFeedback.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtcpFeedback::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtcpFeedback::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtcpFeedback::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtcpFeedback::RTCRtcpFeedback()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtcpFeedbackPtr wrapper::org::ortc::RTCRtcpFeedback::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtcpFeedback>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtcpFeedback::~RTCRtcpFeedback()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtcpFeedback::wrapper_init_org_ortc_RTCRtcpFeedback()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtcpFeedback::wrapper_init_org_ortc_RTCRtcpFeedback(wrapper::org::ortc::RTCRtcpFeedbackPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtcpFeedback::wrapper_init_org_ortc_RTCRtcpFeedback(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtcpFeedback::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtcpFeedback::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->type = native.mType;
+  pThis->parameter = native.mParameter;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mType = wrapper->type;
+  result->mParameter = wrapper->parameter;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtcpFeedback.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpFeedback.h
new file mode 100644
index 00000000..354f10d8
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpFeedback.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtcpFeedback.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtcpFeedback : public wrapper::org::ortc::RTCRtcpFeedback
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::RTCPFeedback, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtcpFeedback, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtcpFeedback, WrapperType);
+          RTCRtcpFeedbackWeakPtr thisWeak_;
+
+          RTCRtcpFeedback();
+          virtual ~RTCRtcpFeedback();
+
+          // methods RTCRtcpFeedback
+          virtual void wrapper_init_org_ortc_RTCRtcpFeedback() override;
+          virtual void wrapper_init_org_ortc_RTCRtcpFeedback(wrapper::org::ortc::RTCRtcpFeedbackPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtcpFeedback(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtcpParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpParameters.cpp
new file mode 100644
index 00000000..3144b628
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpParameters.cpp
@@ -0,0 +1,113 @@
+
+#include "impl_org_ortc_RTCRtcpParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtcpParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtcpParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtcpParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtcpParameters::RTCRtcpParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtcpParametersPtr wrapper::org::ortc::RTCRtcpParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtcpParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtcpParameters::~RTCRtcpParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtcpParameters::wrapper_init_org_ortc_RTCRtcpParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtcpParameters::wrapper_init_org_ortc_RTCRtcpParameters(wrapper::org::ortc::RTCRtcpParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtcpParameters::wrapper_init_org_ortc_RTCRtcpParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtcpParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtcpParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->ssrc = SafeInt<decltype(pThis->ssrc)>(native.mSSRC);
+  pThis->cName = native.mCName;
+  pThis->reducedSize = native.mReducedSize;
+  pThis->mux = native.mMux;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mSSRC = SafeInt<decltype(result->mSSRC)>(wrapper->ssrc);
+  result->mCName = wrapper->cName;
+  result->mReducedSize = wrapper->reducedSize;
+  result->mMux = wrapper->mux;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtcpParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpParameters.h
new file mode 100644
index 00000000..87bbbf22
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtcpParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtcpParameters : public wrapper::org::ortc::RTCRtcpParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::RTCPParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtcpParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtcpParameters, WrapperType);
+          RTCRtcpParametersWeakPtr thisWeak_;
+
+          RTCRtcpParameters();
+          virtual ~RTCRtcpParameters();
+
+          // methods RTCRtcpParameters
+          virtual void wrapper_init_org_ortc_RTCRtcpParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtcpParameters(wrapper::org::ortc::RTCRtcpParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtcpParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtcpTransport.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpTransport.cpp
new file mode 100644
index 00000000..425475b1
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpTransport.cpp
@@ -0,0 +1,77 @@
+
+#include "impl_org_ortc_RTCRtcpTransport.h"
+#include "impl_org_ortc_RTCDtlsTransport.h"
+#include "impl_org_ortc_RTCIceTransport.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtcpTransport::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtcpTransport::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtcpTransport::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtcpTransport::RTCRtcpTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtcpTransportPtr wrapper::org::ortc::RTCRtcpTransport::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtcpTransport>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtcpTransport::~RTCRtcpTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  {
+    auto impl = std::dynamic_pointer_cast<RTCDtlsTransport>(wrapper);
+    if (impl) return RTCDtlsTransport::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCIceTransport>(wrapper);
+    if (impl) return RTCIceTransport::toNative(impl);
+  }
+
+  {
+    auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+    if (impl) return impl->native_;
+  }
+  return NativeTypePtr();
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtcpTransport.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpTransport.h
new file mode 100644
index 00000000..8a12e0d4
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtcpTransport.h
@@ -0,0 +1,33 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtcpTransport.h"
+
+#include <ortc/types.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtcpTransport : public wrapper::org::ortc::RTCRtcpTransport
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTCPTransport, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtcpTransport, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtcpTransport, WrapperType);
+          RTCRtcpTransportWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCRtcpTransport();
+          virtual ~RTCRtcpTransport();
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCapabilities.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCapabilities.cpp
new file mode 100644
index 00000000..08537df0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCapabilities.cpp
@@ -0,0 +1,137 @@
+
+#include "impl_org_ortc_RTCRtpCapabilities.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_RTCRtpCodecCapability.h"
+#include "impl_org_ortc_RTCRtpHeaderExtension.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCapabilities::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCapabilities::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCapabilities::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCapabilities::RTCRtpCapabilities()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpCapabilitiesPtr wrapper::org::ortc::RTCRtpCapabilities::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpCapabilities>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCapabilities::~RTCRtpCapabilities()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpCapabilities::wrapper_init_org_ortc_RTCRtpCapabilities()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpCapabilities::wrapper_init_org_ortc_RTCRtpCapabilities(wrapper::org::ortc::RTCRtpCapabilitiesPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpCapabilities::wrapper_init_org_ortc_RTCRtpCapabilities(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpCapabilities::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpCapabilities::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->codecs = make_shared< list< wrapper::org::ortc::RTCRtpCodecCapabilityPtr > >();
+  for (auto iter = native.mCodecs.begin(); iter != native.mCodecs.end(); ++iter) {
+    auto wrapper = RTCRtpCodecCapability::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->codecs->push_back(wrapper);
+  }
+  pThis->headerExtensions = make_shared< list< wrapper::org::ortc::RTCRtpHeaderExtensionPtr > >();
+  for (auto iter = native.mHeaderExtensions.begin(); iter != native.mHeaderExtensions.end(); ++iter) {
+    auto wrapper = RTCRtpHeaderExtension::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->headerExtensions->push_back(wrapper);
+  }
+  pThis->fecMechanisms = make_shared< list<String> >(native.mFECMechanisms);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  if (wrapper->codecs) {
+    for (auto iter = wrapper->codecs->begin(); iter != wrapper->codecs->end(); ++iter) {
+      auto native = RTCRtpCodecCapability::toNative(*iter);
+      if (!native) continue;
+      result->mCodecs.push_back(*native);
+    }
+  }
+  if (wrapper->headerExtensions) {
+    for (auto iter = wrapper->headerExtensions->begin(); iter != wrapper->headerExtensions->end(); ++iter) {
+      auto native = RTCRtpHeaderExtension::toNative(*iter);
+      if (!native) continue;
+      result->mHeaderExtensions.push_back(*native);
+    }
+  }
+  if (wrapper->fecMechanisms) {
+    result->mFECMechanisms = *(wrapper->fecMechanisms);
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCapabilities.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCapabilities.h
new file mode 100644
index 00000000..924c8bc6
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCapabilities.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpCapabilities.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpCapabilities : public wrapper::org::ortc::RTCRtpCapabilities
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::Capabilities, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpCapabilities, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpCapabilities, WrapperType);
+          RTCRtpCapabilitiesWeakPtr thisWeak_;
+
+          RTCRtpCapabilities();
+          virtual ~RTCRtpCapabilities();
+
+          // methods RTCRtpCapabilities
+          virtual void wrapper_init_org_ortc_RTCRtpCapabilities() override;
+          virtual void wrapper_init_org_ortc_RTCRtpCapabilities(wrapper::org::ortc::RTCRtpCapabilitiesPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpCapabilities(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapability.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapability.cpp
new file mode 100644
index 00000000..12d283d9
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapability.cpp
@@ -0,0 +1,148 @@
+
+#include "impl_org_ortc_RTCRtpCodecCapability.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_RTCRtcpFeedback.h"
+#include "impl_org_ortc_RTCRtpCodecCapabilityParameters.h"
+#include "impl_org_ortc_RTCRtpCodecCapabilityOptions.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecCapability::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecCapability::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecCapability::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCodecCapability::RTCRtpCodecCapability()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpCodecCapabilityPtr wrapper::org::ortc::RTCRtpCodecCapability::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpCodecCapability>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCodecCapability::~RTCRtpCodecCapability()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpCodecCapability::wrapper_init_org_ortc_RTCRtpCodecCapability()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpCodecCapability::wrapper_init_org_ortc_RTCRtpCodecCapability(wrapper::org::ortc::RTCRtpCodecCapabilityPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpCodecCapability::wrapper_init_org_ortc_RTCRtpCodecCapability(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpCodecCapability::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpCodecCapability::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->name = native.mName;
+  pThis->kind = native.mKind;
+  Helper::optionalSafeIntConvert(native.mClockRate, pThis->clockRate);
+  pThis->preferredPayloadType = native.mPreferredPayloadType;
+  pThis->pTime = native.mPTime;
+  pThis->maxPTime = native.mMaxPTime;
+  Helper::optionalSafeIntConvert(native.mNumChannels, pThis->numChannels);
+  pThis->rtcpFeedback = make_shared< list< wrapper::org::ortc::RTCRtcpFeedbackPtr > >();
+  for (auto iter = native.mRTCPFeedback.begin(); iter != native.mRTCPFeedback.end(); ++iter) {
+    auto wrapper = RTCRtcpFeedback::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->rtcpFeedback->push_back(wrapper);
+  }
+  pThis->parameters = RTCRtpCodecCapabilityParameters::toWrapper(native.mParameters);
+  pThis->options = RTCRtpCodecCapabilityOptions::toWrapper(native.mOptions);
+  pThis->maxTemporalLayers = native.mMaxTemporalLayers;
+  pThis->maxSpatialLayers = native.mMaxSpatialLayers;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+
+  result->mName = wrapper->name;
+  result->mKind = wrapper->kind;
+  Helper::optionalSafeIntConvert(wrapper->clockRate, result->mClockRate);
+  result->mPreferredPayloadType = wrapper->preferredPayloadType;
+  result->mPTime = wrapper->pTime;
+  result->mMaxPTime = wrapper->maxPTime;
+  Helper::optionalSafeIntConvert(wrapper->numChannels, result->mNumChannels);
+  if (wrapper->rtcpFeedback) {
+    for (auto iter = wrapper->rtcpFeedback->begin(); iter != wrapper->rtcpFeedback->end(); ++iter) {
+      auto native = RTCRtcpFeedback::toNative(*iter);
+      if (!native) continue;
+      result->mRTCPFeedback.push_back(*native);
+    }
+  }
+  result->mParameters = RTCRtpCodecCapabilityParameters::toNative(wrapper->parameters);
+  result->mOptions = RTCRtpCodecCapabilityOptions::toNative(wrapper->options);
+  result->mMaxTemporalLayers = wrapper->maxTemporalLayers;
+  result->mMaxSpatialLayers = wrapper->maxSpatialLayers;
+
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapability.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapability.h
new file mode 100644
index 00000000..064df5b7
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapability.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpCodecCapability.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpCodecCapability : public wrapper::org::ortc::RTCRtpCodecCapability
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::CodecCapability, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpCodecCapability, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpCodecCapability, WrapperType);
+          RTCRtpCodecCapabilityWeakPtr thisWeak_;
+
+          RTCRtpCodecCapability();
+          virtual ~RTCRtpCodecCapability();
+
+          // methods RTCRtpCodecCapability
+          virtual void wrapper_init_org_ortc_RTCRtpCodecCapability() override;
+          virtual void wrapper_init_org_ortc_RTCRtpCodecCapability(wrapper::org::ortc::RTCRtpCodecCapabilityPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpCodecCapability(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp
new file mode 100644
index 00000000..88587756
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp
@@ -0,0 +1,77 @@
+
+#include "impl_org_ortc_RTCRtpCodecCapabilityOptions.h"
+#include "impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecCapabilityOptions::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecCapabilityOptions::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecCapabilityOptions::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCodecCapabilityOptions::RTCRtpCodecCapabilityOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpCodecCapabilityOptionsPtr wrapper::org::ortc::RTCRtpCodecCapabilityOptions::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpCodecCapabilityOptions>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCodecCapabilityOptions::~RTCRtpCodecCapabilityOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperTypePtr();
+
+  {
+    auto wrapper = RTCRtpOpusCodecCapabilityOptions::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpOpusCodecCapabilityOptions>(wrapper);
+    if (impl) return RTCRtpOpusCodecCapabilityOptions::toNative(impl);
+  }
+
+  {
+    auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+    if (impl) return impl->native_;
+  }
+
+  return NativeTypePtr();
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityOptions.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityOptions.h
new file mode 100644
index 00000000..734198df
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityOptions.h
@@ -0,0 +1,33 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpCodecCapabilityOptions.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpCodecCapabilityOptions : public wrapper::org::ortc::RTCRtpCodecCapabilityOptions
+        {
+          ZS_DECLARE_TYPEDEF_PTR(zsLib::Any, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpCodecCapabilityOptions, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpCodecCapabilityOptions, WrapperType);
+          RTCRtpCodecCapabilityOptionsWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCRtpCodecCapabilityOptions();
+          virtual ~RTCRtpCodecCapabilityOptions();
+
+          static WrapperTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp
new file mode 100644
index 00000000..391a574b
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp
@@ -0,0 +1,113 @@
+
+#include "impl_org_ortc_RTCRtpCodecCapabilityParameters.h"
+#include "impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h"
+#include "impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h"
+#include "impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h"
+#include "impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h"
+#include "impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecCapabilityParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecCapabilityParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecCapabilityParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCodecCapabilityParameters::RTCRtpCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpCodecCapabilityParametersPtr wrapper::org::ortc::RTCRtpCodecCapabilityParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpCodecCapabilityParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCodecCapabilityParameters::~RTCRtpCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  {
+    auto wrapper = RTCRtpOpusCodecCapabilityParameters::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+  {
+    auto wrapper = RTCRtpVp8CodecCapabilityParameters::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+  {
+    auto wrapper = RTCRtpH264CodecCapabilityParameters::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+  {
+    auto wrapper = RTCRtpRtxCodecCapabilityParameters::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+  {
+    auto wrapper = RTCRtpFlexFecCodecCapabilityParameters::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpOpusCodecCapabilityParameters>(wrapper);
+    if (impl) return RTCRtpOpusCodecCapabilityParameters::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpVp8CodecCapabilityParameters>(wrapper);
+    if (impl) return RTCRtpVp8CodecCapabilityParameters::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpH264CodecCapabilityParameters>(wrapper);
+    if (impl) return RTCRtpH264CodecCapabilityParameters::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpRtxCodecCapabilityParameters>(wrapper);
+    if (impl) return RTCRtpRtxCodecCapabilityParameters::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpFlexFecCodecCapabilityParameters>(wrapper);
+    if (impl) return RTCRtpFlexFecCodecCapabilityParameters::toNative(impl);
+  }
+
+  {
+    auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+    if (impl) return impl->native_;
+  }
+  return NativeTypePtr();
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityParameters.h
new file mode 100644
index 00000000..e409bd6d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecCapabilityParameters.h
@@ -0,0 +1,33 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpCodecCapabilityParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpCodecCapabilityParameters : public wrapper::org::ortc::RTCRtpCodecCapabilityParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(zsLib::Any, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpCodecCapabilityParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpCodecCapabilityParameters, WrapperType);
+          RTCRtpCodecCapabilityParametersWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCRtpCodecCapabilityParameters();
+          virtual ~RTCRtpCodecCapabilityParameters();
+
+          static WrapperTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameterSettings.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameterSettings.cpp
new file mode 100644
index 00000000..bfd83fa6
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameterSettings.cpp
@@ -0,0 +1,122 @@
+
+#include "impl_org_ortc_RTCRtpCodecParameterSettings.h"
+#include "impl_org_ortc_RTCRtpOpusCodecParameterSettings.h"
+#include "impl_org_ortc_RTCRtpVp8CodecParameterSettings.h"
+#include "impl_org_ortc_RTCRtpH264CodecParameterSettings.h"
+#include "impl_org_ortc_RTCRtpRtxCodecParameterSettings.h"
+#include "impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h"
+#include "impl_org_ortc_RTCRtpRedCodecParameterSettings.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecParameterSettings::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecParameterSettings::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecParameterSettings::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCodecParameterSettings::RTCRtpCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpCodecParameterSettingsPtr wrapper::org::ortc::RTCRtpCodecParameterSettings::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpCodecParameterSettings>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCodecParameterSettings::~RTCRtpCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  {
+    auto wrapper = RTCRtpOpusCodecParameterSettings::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+  {
+    auto wrapper = RTCRtpVp8CodecParameterSettings::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+  {
+    auto wrapper = RTCRtpH264CodecParameterSettings::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+  {
+    auto wrapper = RTCRtpRtxCodecParameterSettings::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+  {
+    auto wrapper = RTCRtpFlexFecCodecParameterSettings::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+  {
+    auto wrapper = RTCRtpRedCodecParameterSettings::toWrapper(native);
+    if (wrapper) return wrapper;
+  }
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpOpusCodecParameterSettings>(wrapper);
+    if (impl) return RTCRtpOpusCodecParameterSettings::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpVp8CodecParameterSettings>(wrapper);
+    if (impl) return RTCRtpVp8CodecParameterSettings::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpH264CodecParameterSettings>(wrapper);
+    if (impl) return RTCRtpH264CodecParameterSettings::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpRtxCodecParameterSettings>(wrapper);
+    if (impl) return RTCRtpRtxCodecParameterSettings::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpFlexFecCodecParameterSettings>(wrapper);
+    if (impl) return RTCRtpFlexFecCodecParameterSettings::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCRtpRedCodecParameterSettings>(wrapper);
+    if (impl) return RTCRtpRedCodecParameterSettings::toNative(impl);
+  }
+
+  {
+    auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+    if (impl) return impl->native_;
+  }
+
+  return NativeTypePtr();
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameterSettings.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameterSettings.h
new file mode 100644
index 00000000..436df38e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameterSettings.h
@@ -0,0 +1,33 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpCodecParameterSettings.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpCodecParameterSettings : public wrapper::org::ortc::RTCRtpCodecParameterSettings
+        {
+          ZS_DECLARE_TYPEDEF_PTR(zsLib::Any, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpCodecParameterSettings, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpCodecParameterSettings, WrapperType);
+          RTCRtpCodecParameterSettingsWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCRtpCodecParameterSettings();
+          virtual ~RTCRtpCodecParameterSettings();
+
+          static WrapperTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameters.cpp
new file mode 100644
index 00000000..39888dbf
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameters.cpp
@@ -0,0 +1,137 @@
+
+#include "impl_org_ortc_RTCRtpCodecParameters.h"
+#include "impl_org_ortc_RTCRtcpFeedback.h"
+#include "impl_org_ortc_RTCRtpCodecParameterSettings.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpCodecParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCodecParameters::RTCRtpCodecParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpCodecParametersPtr wrapper::org::ortc::RTCRtpCodecParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpCodecParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpCodecParameters::~RTCRtpCodecParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpCodecParameters::wrapper_init_org_ortc_RTCRtpCodecParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpCodecParameters::wrapper_init_org_ortc_RTCRtpCodecParameters(wrapper::org::ortc::RTCRtpCodecParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpCodecParameters::wrapper_init_org_ortc_RTCRtpCodecParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpCodecParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCRtpCodecParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpCodecParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->name = native.mName;
+  pThis->payloadType = SafeInt<decltype(pThis->payloadType)>(native.mPayloadType);
+  Helper::optionalSafeIntConvert(native.mClockRate, pThis->clockRate);
+  pThis->pTime = native.mPTime;
+  pThis->maxPTime = native.mMaxPTime;
+  Helper::optionalSafeIntConvert(native.mNumChannels, pThis->numChannels);
+  pThis->rtcpFeedback = make_shared< list <wrapper::org::ortc::RTCRtcpFeedbackPtr > >();
+  for (auto iter = native.mRTCPFeedback.begin(); iter != native.mRTCPFeedback.end(); ++iter) {
+    auto wrapper = RTCRtcpFeedback::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->rtcpFeedback->push_back(wrapper);
+  }
+  pThis->parameters = RTCRtpCodecParameterSettings::toWrapper(native.mParameters);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mName = wrapper->name;
+  result->mPayloadType = SafeInt<decltype(result->mPayloadType)>(wrapper->payloadType);
+  Helper::optionalSafeIntConvert(wrapper->clockRate, result->mClockRate);
+  result->mPTime = wrapper->pTime;
+  result->mMaxPTime = wrapper->maxPTime;
+  Helper::optionalSafeIntConvert(wrapper->numChannels, result->mNumChannels);
+  if (wrapper->rtcpFeedback) {
+    for (auto iter = wrapper->rtcpFeedback->begin(); iter != wrapper->rtcpFeedback->end(); ++iter) {
+      auto native = RTCRtcpFeedback::toNative(*iter);
+      if (!native) continue;
+      result->mRTCPFeedback.push_back(*native);
+    }
+  }
+  if (wrapper->parameters) {
+    result->mParameters = RTCRtpCodecParameterSettings::toNative(wrapper->parameters);
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameters.h
new file mode 100644
index 00000000..a666ae2e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpCodecParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpCodecParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpCodecParameters : public wrapper::org::ortc::RTCRtpCodecParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::CodecParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpCodecParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpCodecParameters, WrapperType);
+          RTCRtpCodecParametersWeakPtr thisWeak_;
+
+          RTCRtpCodecParameters();
+          virtual ~RTCRtpCodecParameters();
+
+          // methods RTCRtpCodecParameters
+          virtual void wrapper_init_org_ortc_RTCRtpCodecParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpCodecParameters(wrapper::org::ortc::RTCRtpCodecParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpCodecParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpContributingSource.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpContributingSource.cpp
new file mode 100644
index 00000000..2a912c69
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpContributingSource.cpp
@@ -0,0 +1,87 @@
+
+#include "impl_org_ortc_RTCRtpContributingSource.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpContributingSource::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpContributingSource::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpContributingSource::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpContributingSource::RTCRtpContributingSource()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpContributingSourcePtr wrapper::org::ortc::RTCRtpContributingSource::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpContributingSource>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpContributingSource::~RTCRtpContributingSource()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpContributingSource::wrapper_init_org_ortc_RTCRtpContributingSource()
+{
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpContributingSource::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->timestamp = native.mTimestamp;
+  pThis->csrc = SafeInt<decltype(pThis->csrc)>(native.mCSRC);
+  pThis->audioLevel = SafeInt<decltype(pThis->audioLevel)>(native.mAudioLevel);
+  pThis->voiceActivityFlag = native.mVoiceActivityFlag;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mTimestamp = wrapper->timestamp;
+  result->mCSRC = SafeInt<decltype(result->mCSRC)>(wrapper->csrc);
+  result->mAudioLevel = SafeInt<decltype(result->mAudioLevel)>(wrapper->audioLevel);
+  result->mVoiceActivityFlag = wrapper->voiceActivityFlag;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpContributingSource.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpContributingSource.h
new file mode 100644
index 00000000..3c23af67
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpContributingSource.h
@@ -0,0 +1,37 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpContributingSource.h"
+
+#include <ortc/IRTPReceiver.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpContributingSource : public wrapper::org::ortc::RTCRtpContributingSource
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPReceiverTypes::ContributingSource, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpContributingSource, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpContributingSource, WrapperType);
+          RTCRtpContributingSourceWeakPtr thisWeak_;
+
+          RTCRtpContributingSource();
+          virtual ~RTCRtpContributingSource();
+
+          // methods RTCRtpContributingSource
+          virtual void wrapper_init_org_ortc_RTCRtpContributingSource() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpEncodingParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpEncodingParameters.cpp
new file mode 100644
index 00000000..84472ff6
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpEncodingParameters.cpp
@@ -0,0 +1,147 @@
+
+#include "impl_org_ortc_RTCRtpEncodingParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_RTCRtpFecParameters.h"
+#include "impl_org_ortc_RTCRtpRtxParameters.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpEncodingParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpEncodingParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpEncodingParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpEncodingParameters::RTCRtpEncodingParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpEncodingParametersPtr wrapper::org::ortc::RTCRtpEncodingParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpEncodingParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpEncodingParameters::~RTCRtpEncodingParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpEncodingParameters::wrapper_init_org_ortc_RTCRtpEncodingParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpEncodingParameters::wrapper_init_org_ortc_RTCRtpEncodingParameters(wrapper::org::ortc::RTCRtpEncodingParametersPtr source)
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpEncodingParameters::wrapper_init_org_ortc_RTCRtpEncodingParameters(wrapper::org::ortc::JsonPtr json)
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpEncodingParameters::toJson()
+{
+  wrapper::org::ortc::JsonPtr result {};
+  return result;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpEncodingParameters::hash()
+{
+  String result {};
+  return result;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mSSRC, pThis->ssrc);
+  Helper::optionalSafeIntConvert(native.mCodecPayloadType, pThis->codecPayloadType);
+  if (native.mFEC.hasValue()) {
+    pThis->fec = RTCRtpFecParameters::toWrapper(native.mFEC);
+  }
+  if (native.mRTX.hasValue()) {
+    pThis->rtx = RTCRtpRtxParameters::toWrapper(native.mRTX);
+  }
+  if (native.mPriority.hasValue()) {
+    pThis->priority = Helper::toWrapper(native.mPriority.value());
+  }
+  Helper::optionalSafeIntConvert(native.mMaxBitrate, pThis->maxBitrate);
+  pThis->minQuality = native.mMinQuality;
+  pThis->resolutionScale = native.mResolutionScale;
+  pThis->framerateScale = native.mFramerateScale;
+  pThis->active = native.mActive;
+  pThis->encodingId = native.mEncodingID;
+  pThis->dependencyEncodingIds = make_shared< list<String> >(native.mDependencyEncodingIDs);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->ssrc, result->mSSRC);
+  Helper::optionalSafeIntConvert(wrapper->codecPayloadType, result->mCodecPayloadType);
+  if (wrapper->fec.hasValue()) {
+    if (wrapper->fec.value()) {
+      auto native = RTCRtpFecParameters::toNative(wrapper->fec.value());
+      if (native) {
+        result->mFEC = *native;
+      }
+    }
+  }
+  if (wrapper->rtx.hasValue()) {
+    if (wrapper->rtx.value()) {
+      auto native = RTCRtpRtxParameters::toNative(wrapper->rtx.value());
+      if (native) {
+        result->mRTX = *native;
+      }
+    }
+  }
+  if (wrapper->priority.hasValue()) {
+    result->mPriority = Helper::toNative(wrapper->priority.value());
+  }
+  Helper::optionalSafeIntConvert(wrapper->maxBitrate, result->mMaxBitrate);
+  result->mMinQuality = wrapper->minQuality;
+  result->mResolutionScale = wrapper->resolutionScale;
+  result->mFramerateScale = wrapper->framerateScale;
+  result->mActive = wrapper->active;
+  result->mEncodingID = wrapper->encodingId;
+  if (wrapper->dependencyEncodingIds) {
+    result->mDependencyEncodingIDs = (*wrapper->dependencyEncodingIds);
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpEncodingParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpEncodingParameters.h
new file mode 100644
index 00000000..0ce2b106
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpEncodingParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpEncodingParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpEncodingParameters : public wrapper::org::ortc::RTCRtpEncodingParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::EncodingParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpEncodingParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpEncodingParameters, WrapperType);
+          RTCRtpEncodingParametersWeakPtr thisWeak_;
+
+          RTCRtpEncodingParameters();
+          virtual ~RTCRtpEncodingParameters();
+
+          // methods RTCRtpEncodingParameters
+          virtual void wrapper_init_org_ortc_RTCRtpEncodingParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpEncodingParameters(wrapper::org::ortc::RTCRtpEncodingParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpEncodingParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpFecParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFecParameters.cpp
new file mode 100644
index 00000000..05d572da
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFecParameters.cpp
@@ -0,0 +1,116 @@
+
+#include "impl_org_ortc_RTCRtpFecParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpFecParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpFecParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpFecParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpFecParameters::RTCRtpFecParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpFecParametersPtr wrapper::org::ortc::RTCRtpFecParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpFecParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpFecParameters::~RTCRtpFecParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpFecParameters::wrapper_init_org_ortc_RTCRtpFecParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpFecParameters::wrapper_init_org_ortc_RTCRtpFecParameters(wrapper::org::ortc::RTCRtpFecParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpFecParameters::wrapper_init_org_ortc_RTCRtpFecParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpFecParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpFecParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mSSRC, pThis->ssrc);
+  pThis->mechanism = native.mMechanism;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->ssrc, result->mSSRC);
+  result->mMechanism = wrapper->mechanism;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpFecParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFecParameters.h
new file mode 100644
index 00000000..65d92538
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFecParameters.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpFecParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpFecParameters : public wrapper::org::ortc::RTCRtpFecParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::FECParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpFecParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpFecParameters, WrapperType);
+          RTCRtpFecParametersWeakPtr thisWeak_;
+
+          RTCRtpFecParameters();
+          virtual ~RTCRtpFecParameters();
+
+          // methods RTCRtpFecParameters
+          virtual void wrapper_init_org_ortc_RTCRtpFecParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpFecParameters(wrapper::org::ortc::RTCRtpFecParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpFecParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp
new file mode 100644
index 00000000..fed2fbd1
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp
@@ -0,0 +1,127 @@
+
+#include "impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::RTCRtpFlexFecCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersPtr wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::~RTCRtpFlexFecCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpFlexFecCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpFlexFecCodecCapabilityParameters(wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersPtr source)
+{
+  if (!source) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpFlexFecCodecCapabilityParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpFlexFecCodecCapabilityParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->repairWindow = native.mRepairWindow;
+  Helper::optionalSafeIntConvert(native.mL, pThis->l);
+  Helper::optionalSafeIntConvert(native.mD, pThis->d);
+  if (native.mToP.hasValue()) {
+    pThis->toP = Helper::toWrapper(native.mToP.value());
+  }
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mRepairWindow = wrapper->repairWindow;
+  Helper::optionalSafeIntConvert(wrapper->l, result->mL);
+  Helper::optionalSafeIntConvert(wrapper->d, result->mD);
+  if (wrapper->toP.hasValue()) {
+    result->mToP = Helper::toNative(wrapper->toP.value());
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h
new file mode 100644
index 00000000..ad015428
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpFlexFecCodecCapabilityParameters : public wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::FlexFECCodecCapabilityParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpFlexFecCodecCapabilityParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParameters, WrapperType);
+          RTCRtpFlexFecCodecCapabilityParametersWeakPtr thisWeak_;
+
+          RTCRtpFlexFecCodecCapabilityParameters();
+          virtual ~RTCRtpFlexFecCodecCapabilityParameters();
+
+          // methods RTCRtpFlexFecCodecCapabilityParameters
+          virtual void wrapper_init_org_ortc_RTCRtpFlexFecCodecCapabilityParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpFlexFecCodecCapabilityParameters(wrapper::org::ortc::RTCRtpFlexFecCodecCapabilityParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpFlexFecCodecCapabilityParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp
new file mode 100644
index 00000000..907d2eae
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp
@@ -0,0 +1,127 @@
+
+#include "impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings::RTCRtpFlexFecCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpFlexFecCodecParameterSettingsPtr wrapper::org::ortc::RTCRtpFlexFecCodecParameterSettings::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings::~RTCRtpFlexFecCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings::wrapper_init_org_ortc_RTCRtpFlexFecCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings::wrapper_init_org_ortc_RTCRtpFlexFecCodecParameterSettings(wrapper::org::ortc::RTCRtpFlexFecCodecParameterSettingsPtr source)
+{
+  if (!source) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpFlexFecCodecParameterSettings::wrapper_init_org_ortc_RTCRtpFlexFecCodecParameterSettings(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->repairWindow = native.mRepairWindow;
+  Helper::optionalSafeIntConvert(native.mL, pThis->l);
+  Helper::optionalSafeIntConvert(native.mD, pThis->d);
+  if (native.mToP.hasValue()) {
+    pThis->toP = Helper::toWrapper(native.mToP.value());
+  }
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mRepairWindow = wrapper->repairWindow;
+  Helper::optionalSafeIntConvert(wrapper->l, result->mL);
+  Helper::optionalSafeIntConvert(wrapper->d, result->mD);
+  if (wrapper->toP.hasValue()) {
+    result->mToP = Helper::toNative(wrapper->toP.value());
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h
new file mode 100644
index 00000000..f0e6684a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h
@@ -0,0 +1,43 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpFlexFecCodecParameterSettings.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpFlexFecCodecParameterSettings : public wrapper::org::ortc::RTCRtpFlexFecCodecParameterSettings
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::FlexFECCodecParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpFlexFecCodecParameterSettings, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpFlexFecCodecParameterSettings, WrapperType);
+          RTCRtpFlexFecCodecParameterSettingsWeakPtr thisWeak_;
+
+          RTCRtpFlexFecCodecParameterSettings();
+          virtual ~RTCRtpFlexFecCodecParameterSettings();
+
+          // methods RTCRtpFlexFecCodecCapabilityParameters
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // methods RTCRtpFlexFecCodecParameterSettings
+          virtual void wrapper_init_org_ortc_RTCRtpFlexFecCodecParameterSettings() override;
+          virtual void wrapper_init_org_ortc_RTCRtpFlexFecCodecParameterSettings(wrapper::org::ortc::RTCRtpFlexFecCodecParameterSettingsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpFlexFecCodecParameterSettings(wrapper::org::ortc::JsonPtr json) override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp
new file mode 100644
index 00000000..932dd8d5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp
@@ -0,0 +1,139 @@
+
+#include "impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters::RTCRtpH264CodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpH264CodecCapabilityParametersPtr wrapper::org::ortc::RTCRtpH264CodecCapabilityParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters::~RTCRtpH264CodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpH264CodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpH264CodecCapabilityParameters(wrapper::org::ortc::RTCRtpH264CodecCapabilityParametersPtr source)
+{
+  if (!source) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpH264CodecCapabilityParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpH264CodecCapabilityParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mProfileLevelID, pThis->profileLevelId);
+  pThis->packetizationModes = make_shared< list< unsigned short > >();
+  for (auto iter = native.mPacketizationModes.begin(); iter != native.mPacketizationModes.end(); ++iter) {
+    pThis->packetizationModes->push_back(SafeInt<unsigned short>(*iter));
+  }
+  Helper::optionalSafeIntConvert(native.mMaxMBPS, pThis->maxMbps);
+  Helper::optionalSafeIntConvert(native.mMaxSMBPS, pThis->maxSMbps);
+  Helper::optionalSafeIntConvert(native.mMaxFS, pThis->maxFs);
+  Helper::optionalSafeIntConvert(native.mMaxCPB, pThis->maxCpb);
+  Helper::optionalSafeIntConvert(native.mMaxDPB, pThis->maxDpb);
+  Helper::optionalSafeIntConvert(native.mMaxBR, pThis->maxBr);
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->profileLevelId, result->mProfileLevelID);
+  if (wrapper->packetizationModes) {
+    for (auto iter = wrapper->packetizationModes->begin(); iter != wrapper->packetizationModes->end(); ++iter) {
+      result->mPacketizationModes.push_back(SafeInt<decltype(result->mPacketizationModes)::value_type>(*iter));
+    }
+  }
+  Helper::optionalSafeIntConvert(wrapper->maxMbps, result->mMaxMBPS);
+  Helper::optionalSafeIntConvert(wrapper->maxSMbps, result->mMaxSMBPS);
+  Helper::optionalSafeIntConvert(wrapper->maxFs, result->mMaxFS);
+  Helper::optionalSafeIntConvert(wrapper->maxCpb, result->mMaxCPB);
+  Helper::optionalSafeIntConvert(wrapper->maxDpb, result->mMaxDPB);
+  Helper::optionalSafeIntConvert(wrapper->maxBr, result->mMaxBR);
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h
new file mode 100644
index 00000000..ed597871
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpH264CodecCapabilityParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpH264CodecCapabilityParameters : public wrapper::org::ortc::RTCRtpH264CodecCapabilityParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::H264CodecCapabilityParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpH264CodecCapabilityParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpH264CodecCapabilityParameters, WrapperType);
+          RTCRtpH264CodecCapabilityParametersWeakPtr thisWeak_;
+
+          RTCRtpH264CodecCapabilityParameters();
+          virtual ~RTCRtpH264CodecCapabilityParameters();
+
+          // methods RTCRtpH264CodecCapabilityParameters
+          virtual void wrapper_init_org_ortc_RTCRtpH264CodecCapabilityParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpH264CodecCapabilityParameters(wrapper::org::ortc::RTCRtpH264CodecCapabilityParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpH264CodecCapabilityParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp
new file mode 100644
index 00000000..1e7e3ad4
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp
@@ -0,0 +1,141 @@
+
+#include "impl_org_ortc_RTCRtpH264CodecParameterSettings.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings::RTCRtpH264CodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpH264CodecParameterSettingsPtr wrapper::org::ortc::RTCRtpH264CodecParameterSettings::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings::~RTCRtpH264CodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings::wrapper_init_org_ortc_RTCRtpH264CodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings::wrapper_init_org_ortc_RTCRtpH264CodecParameterSettings(wrapper::org::ortc::RTCRtpH264CodecParameterSettingsPtr source)
+{
+  if (!source) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpH264CodecParameterSettings::wrapper_init_org_ortc_RTCRtpH264CodecParameterSettings(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mProfileLevelID, pThis->profileLevelId);
+  pThis->packetizationModes = make_shared< list< unsigned short > >();
+  for (auto iter = native.mPacketizationModes.begin(); iter != native.mPacketizationModes.end(); ++iter) {
+    pThis->packetizationModes->push_back(SafeInt<unsigned short>(*iter));
+  }
+  Helper::optionalSafeIntConvert(native.mMaxMBPS, pThis->maxMbps);
+  Helper::optionalSafeIntConvert(native.mMaxSMBPS, pThis->maxSMbps);
+  Helper::optionalSafeIntConvert(native.mMaxFS, pThis->maxFs);
+  Helper::optionalSafeIntConvert(native.mMaxCPB, pThis->maxCpb);
+  Helper::optionalSafeIntConvert(native.mMaxDPB, pThis->maxDpb);
+  Helper::optionalSafeIntConvert(native.mMaxBR, pThis->maxBr);
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->profileLevelId, result->mProfileLevelID);
+  if (wrapper->packetizationModes) {
+    for (auto iter = wrapper->packetizationModes->begin(); iter != wrapper->packetizationModes->end(); ++iter) {
+      result->mPacketizationModes.push_back(SafeInt<decltype(result->mPacketizationModes)::value_type>(*iter));
+    }
+  }
+  Helper::optionalSafeIntConvert(wrapper->maxMbps, result->mMaxMBPS);
+  Helper::optionalSafeIntConvert(wrapper->maxSMbps, result->mMaxSMBPS);
+  Helper::optionalSafeIntConvert(wrapper->maxFs, result->mMaxFS);
+  Helper::optionalSafeIntConvert(wrapper->maxCpb, result->mMaxCPB);
+  Helper::optionalSafeIntConvert(wrapper->maxDpb, result->mMaxDPB);
+  Helper::optionalSafeIntConvert(wrapper->maxBr, result->mMaxBR);
+
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecParameterSettings.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecParameterSettings.h
new file mode 100644
index 00000000..6dd72267
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpH264CodecParameterSettings.h
@@ -0,0 +1,43 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpH264CodecParameterSettings.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpH264CodecParameterSettings : public wrapper::org::ortc::RTCRtpH264CodecParameterSettings
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::H264CodecParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpH264CodecParameterSettings, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpH264CodecParameterSettings, WrapperType);
+          RTCRtpH264CodecParameterSettingsWeakPtr thisWeak_;
+
+          RTCRtpH264CodecParameterSettings();
+          virtual ~RTCRtpH264CodecParameterSettings();
+
+          // methods RTCRtpH264CodecCapabilityParameters
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // methods RTCRtpH264CodecParameterSettings
+          virtual void wrapper_init_org_ortc_RTCRtpH264CodecParameterSettings() override;
+          virtual void wrapper_init_org_ortc_RTCRtpH264CodecParameterSettings(wrapper::org::ortc::RTCRtpH264CodecParameterSettingsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpH264CodecParameterSettings(wrapper::org::ortc::JsonPtr json) override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtension.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtension.cpp
new file mode 100644
index 00000000..a788ab06
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtension.cpp
@@ -0,0 +1,115 @@
+
+#include "impl_org_ortc_RTCRtpHeaderExtension.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpHeaderExtension::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpHeaderExtension::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpHeaderExtension::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpHeaderExtension::RTCRtpHeaderExtension()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpHeaderExtensionPtr wrapper::org::ortc::RTCRtpHeaderExtension::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpHeaderExtension>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpHeaderExtension::~RTCRtpHeaderExtension()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpHeaderExtension::wrapper_init_org_ortc_RTCRtpHeaderExtension()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpHeaderExtension::wrapper_init_org_ortc_RTCRtpHeaderExtension(wrapper::org::ortc::RTCRtpHeaderExtensionPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpHeaderExtension::wrapper_init_org_ortc_RTCRtpHeaderExtension(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpHeaderExtension::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpHeaderExtension::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->kind = native.mKind;
+  pThis->uri = native.mURI;
+  pThis->preferredId = SafeInt<decltype(pThis->preferredId)>(native.mPreferredID);
+  pThis->preferredEncrypt = native.mPreferredEncrypt;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mKind = wrapper->kind;
+  result->mURI = wrapper->uri;
+  result->mPreferredID = SafeInt<decltype(result->mPreferredID)>(wrapper->preferredId);
+  result->mPreferredEncrypt = wrapper->preferredEncrypt;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtension.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtension.h
new file mode 100644
index 00000000..21a1ccd4
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtension.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpHeaderExtension.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpHeaderExtension : public wrapper::org::ortc::RTCRtpHeaderExtension
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::HeaderExtension, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpHeaderExtension, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpHeaderExtension, WrapperType);
+          RTCRtpHeaderExtensionWeakPtr thisWeak_;
+
+          RTCRtpHeaderExtension();
+          virtual ~RTCRtpHeaderExtension();
+
+          // methods RTCRtpHeaderExtension
+          virtual void wrapper_init_org_ortc_RTCRtpHeaderExtension() override;
+          virtual void wrapper_init_org_ortc_RTCRtpHeaderExtension(wrapper::org::ortc::RTCRtpHeaderExtensionPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpHeaderExtension(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp
new file mode 100644
index 00000000..88b21325
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp
@@ -0,0 +1,113 @@
+
+#include "impl_org_ortc_RTCRtpHeaderExtensionParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters::RTCRtpHeaderExtensionParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpHeaderExtensionParametersPtr wrapper::org::ortc::RTCRtpHeaderExtensionParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters::~RTCRtpHeaderExtensionParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters::wrapper_init_org_ortc_RTCRtpHeaderExtensionParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters::wrapper_init_org_ortc_RTCRtpHeaderExtensionParameters(wrapper::org::ortc::RTCRtpHeaderExtensionParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters::wrapper_init_org_ortc_RTCRtpHeaderExtensionParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpHeaderExtensionParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->uri = native.mURI;
+  pThis->id = SafeInt<decltype(pThis->id)>(native.mID);
+  pThis->encrypt = native.mEncrypt;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mURI = wrapper->uri;
+  result->mID = SafeInt<decltype(result->mID)>(wrapper->id);
+  result->mEncrypt = wrapper->encrypt;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtensionParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtensionParameters.h
new file mode 100644
index 00000000..620e9031
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpHeaderExtensionParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpHeaderExtensionParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpHeaderExtensionParameters : public wrapper::org::ortc::RTCRtpHeaderExtensionParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::HeaderExtensionParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpHeaderExtensionParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpHeaderExtensionParameters, WrapperType);
+          RTCRtpHeaderExtensionParametersWeakPtr thisWeak_;
+
+          RTCRtpHeaderExtensionParameters();
+          virtual ~RTCRtpHeaderExtensionParameters();
+
+          // methods RTCRtpHeaderExtensionParameters
+          virtual void wrapper_init_org_ortc_RTCRtpHeaderExtensionParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpHeaderExtensionParameters(wrapper::org::ortc::RTCRtpHeaderExtensionParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpHeaderExtensionParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpListener.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpListener.cpp
new file mode 100644
index 00000000..e250c7bc
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpListener.cpp
@@ -0,0 +1,161 @@
+
+#include "impl_org_ortc_RTCRtpListener.h"
+#include "impl_org_ortc_RTCRtpUnhandledEvent.h"
+#include "impl_org_ortc_RTCRtpTransport.h"
+#include "impl_org_ortc_RTCRtpHeaderExtensionParameters.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpListener::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpListener::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpListener::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpListener::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpListener::RTCRtpListener()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpListenerPtr wrapper::org::ortc::RTCRtpListener::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpListener>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpListener::~RTCRtpListener()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::RTCRtpListener::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpListener::wrapper_init_org_ortc_RTCRtpListener(wrapper::org::ortc::RTCRtpTransportPtr transport)
+{
+  native_ = NativeType::create(thisWeak_.lock(), RTCRtpTransport::toNative(transport));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpListener::wrapper_init_org_ortc_RTCRtpListener(
+  wrapper::org::ortc::RTCRtpTransportPtr transport,
+  shared_ptr< list< wrapper::org::ortc::RTCRtpHeaderExtensionParametersPtr > > headerExtensions
+  )
+{
+  ::ortc::IRTPTypes::HeaderExtensionParametersList nativeList;
+  if (headerExtensions) {
+    for (auto iter = headerExtensions->begin(); iter != headerExtensions->end(); ++iter) {
+      auto native = RTCRtpHeaderExtensionParameters::toNative(*iter);
+      if (!native) continue;
+      nativeList.push_back(*native);
+    }
+  }
+  native_ = NativeType::create(thisWeak_.lock(), RTCRtpTransport::toNative(transport), nativeList);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpListener::setHeaderExtensions(shared_ptr< list< wrapper::org::ortc::RTCRtpHeaderExtensionParametersPtr > > headerExtensions)
+{
+  ::ortc::IRTPTypes::HeaderExtensionParametersList nativeList;
+  if (headerExtensions) {
+    for (auto iter = headerExtensions->begin(); iter != headerExtensions->end(); ++iter) {
+      auto native = RTCRtpHeaderExtensionParameters::toNative(*iter);
+      if (!native) continue;
+      nativeList.push_back(*native);
+    }
+  }
+  native_->setHeaderExtensions(nativeList);
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCRtpListener::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpTransportPtr wrapper::impl::org::ortc::RTCRtpListener::get_transport()
+{
+  return RTCRtpTransport::toWrapper(native_->transport());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpListener::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onRTPListenerUnhandledRTP(
+  IRTPListenerPtr listener,
+  SSRCType ssrc,
+  PayloadType payloadType,
+  const char *mid,
+  const char *rid
+)
+{
+  onUnhandled(RTCRtpUnhandledEvent::toWrapper(ssrc, payloadType, mid, rid));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpListener.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpListener.h
new file mode 100644
index 00000000..886b613a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpListener.h
@@ -0,0 +1,68 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpListener.h"
+
+#include <ortc/IRTPListener.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpListener : public wrapper::org::ortc::RTCRtpListener,
+                                public ::ortc::IRTPListenerDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPListener, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPListener, IRTPListener);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPListenerSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpListener, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpListener, WrapperType);
+
+          RTCRtpListenerWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_{ true };
+          NativeTypeSubscriptionPtr subscription_;
+
+          RTCRtpListener();
+          virtual ~RTCRtpListener();
+
+          // methods RTCStatsProvider
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+          // methods RTCRtpListener
+          virtual void wrapper_init_org_ortc_RTCRtpListener(wrapper::org::ortc::RTCRtpTransportPtr transport) override;
+          virtual void wrapper_init_org_ortc_RTCRtpListener(
+            wrapper::org::ortc::RTCRtpTransportPtr transport,
+            shared_ptr< list< wrapper::org::ortc::RTCRtpHeaderExtensionParametersPtr > > headerExtensions
+            ) override;
+          virtual void setHeaderExtensions(shared_ptr< list< wrapper::org::ortc::RTCRtpHeaderExtensionParametersPtr > > headerExtensions) override;
+
+          // properties RTCRtpListener
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::RTCRtpTransportPtr get_transport() override;
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          virtual void onRTPListenerUnhandledRTP(
+            IRTPListenerPtr listener,
+            SSRCType ssrc,
+            PayloadType payloadType,
+            const char *mid,
+            const char *rid
+          ) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp
new file mode 100644
index 00000000..7f3dfc2e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp
@@ -0,0 +1,133 @@
+
+#include "impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions::RTCRtpOpusCodecCapabilityOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsPtr wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptions::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions::~RTCRtpOpusCodecCapabilityOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions::wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions::wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityOptions(wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsPtr source)
+{
+  if (!source) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions::wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityOptions(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityOptions::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mComplexity, pThis->complexity);
+  if (native.mSignal.hasValue()) {
+    pThis->signal = Helper::toWrapper(native.mSignal.value());
+  }
+  if (native.mApplication.hasValue()) {
+    pThis->application = Helper::toWrapper(native.mApplication.value());
+  }
+  Helper::optionalSafeIntConvert(native.mPacketLossPerc, pThis->packetLossPerc);
+  pThis->predictionDisabled = native.mPredictionDisabled;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->complexity, result->mComplexity);
+  if (wrapper->signal.hasValue()) {
+    result->mSignal = Helper::toNative(wrapper->signal.value());
+  }
+  if (wrapper->application.hasValue()) {
+    result->mApplication = Helper::toNative(wrapper->application.value());
+  }
+  Helper::optionalSafeIntConvert(wrapper->packetLossPerc, result->mPacketLossPerc);
+  result->mPredictionDisabled = wrapper->predictionDisabled;
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h
new file mode 100644
index 00000000..57c03cd5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpOpusCodecCapabilityOptions.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpOpusCodecCapabilityOptions : public wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptions
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::OpusCodecCapabilityOptions, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpOpusCodecCapabilityOptions, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptions, WrapperType);
+          RTCRtpOpusCodecCapabilityOptionsWeakPtr thisWeak_;
+
+          RTCRtpOpusCodecCapabilityOptions();
+          virtual ~RTCRtpOpusCodecCapabilityOptions();
+
+          // methods RTCRtpOpusCodecCapabilityOptions
+          virtual void wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityOptions() override;
+          virtual void wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityOptions(wrapper::org::ortc::RTCRtpOpusCodecCapabilityOptionsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityOptions(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp
new file mode 100644
index 00000000..24b8922a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp
@@ -0,0 +1,129 @@
+
+#include "impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters::RTCRtpOpusCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpOpusCodecCapabilityParametersPtr wrapper::org::ortc::RTCRtpOpusCodecCapabilityParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters::~RTCRtpOpusCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityParameters(wrapper::org::ortc::RTCRtpOpusCodecCapabilityParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpOpusCodecCapabilityParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mMaxPlaybackRate, pThis->maxPlaybackRate);
+  Helper::optionalSafeIntConvert(native.mMaxAverageBitrate, pThis->maxAverageBitrate);
+  pThis->stereo = native.mStereo;
+  pThis->cbr = native.mCBR;
+  pThis->useInbandFec = native.mUseInbandFEC;
+  pThis->useDtx = native.mUseDTX;
+  Helper::optionalSafeIntConvert(native.mSPropMaxCaptureRate, pThis->sPropMaxCaptureRate);
+  pThis->sPropStereo = native.mSPropStereo;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->maxPlaybackRate, result->mMaxPlaybackRate);
+  Helper::optionalSafeIntConvert(wrapper->maxAverageBitrate, result->mMaxAverageBitrate);
+  result->mStereo = wrapper->stereo;
+  result->mCBR = wrapper->cbr;
+  result->mUseInbandFEC = wrapper->useInbandFec;
+  result->mUseDTX = wrapper->useDtx;
+  Helper::optionalSafeIntConvert(wrapper->sPropMaxCaptureRate, result->mSPropMaxCaptureRate);
+  result->mSPropStereo = wrapper->sPropStereo;
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h
new file mode 100644
index 00000000..054708be
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpOpusCodecCapabilityParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpOpusCodecCapabilityParameters : public wrapper::org::ortc::RTCRtpOpusCodecCapabilityParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::OpusCodecCapabilityParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpOpusCodecCapabilityParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpOpusCodecCapabilityParameters, WrapperType);
+          RTCRtpOpusCodecCapabilityParametersWeakPtr thisWeak_;
+
+          RTCRtpOpusCodecCapabilityParameters();
+          virtual ~RTCRtpOpusCodecCapabilityParameters();
+
+          // methods RTCRtpOpusCodecCapabilityParameters
+          virtual void wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityParameters(wrapper::org::ortc::RTCRtpOpusCodecCapabilityParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpOpusCodecCapabilityParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp
new file mode 100644
index 00000000..ff167533
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp
@@ -0,0 +1,148 @@
+
+#include "impl_org_ortc_RTCRtpOpusCodecParameterSettings.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings::RTCRtpOpusCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpOpusCodecParameterSettingsPtr wrapper::org::ortc::RTCRtpOpusCodecParameterSettings::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings::~RTCRtpOpusCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings::wrapper_init_org_ortc_RTCRtpOpusCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings::wrapper_init_org_ortc_RTCRtpOpusCodecParameterSettings(wrapper::org::ortc::RTCRtpOpusCodecParameterSettingsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings::wrapper_init_org_ortc_RTCRtpOpusCodecParameterSettings(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpOpusCodecParameterSettings::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mMaxPlaybackRate, pThis->maxPlaybackRate);
+  Helper::optionalSafeIntConvert(native.mMaxAverageBitrate, pThis->maxAverageBitrate);
+  pThis->stereo = native.mStereo;
+  pThis->cbr = native.mCBR;
+  pThis->useInbandFec = native.mUseInbandFEC;
+  pThis->useDtx = native.mUseDTX;
+  Helper::optionalSafeIntConvert(native.mComplexity, pThis->complexity);
+  if (native.mSignal.hasValue()) {
+    pThis->signal = Helper::toWrapper(native.mSignal.value());
+  }
+  if (native.mApplication.hasValue()) {
+    pThis->application = Helper::toWrapper(native.mApplication.value());
+  }
+  Helper::optionalSafeIntConvert(native.mPacketLossPerc, pThis->packetLossPerc);
+  pThis->predictionDisabled = native.mPredictionDisabled;
+  Helper::optionalSafeIntConvert(native.mSPropMaxCaptureRate, pThis->sPropMaxCaptureRate);
+  pThis->sPropStereo = native.mSPropStereo;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->maxPlaybackRate, result->mMaxPlaybackRate);
+  Helper::optionalSafeIntConvert(wrapper->maxAverageBitrate, result->mMaxAverageBitrate);
+  result->mStereo = wrapper->stereo;
+  result->mCBR = wrapper->cbr;
+  result->mUseInbandFEC = wrapper->useInbandFec;
+  result->mUseDTX = wrapper->useDtx;
+  Helper::optionalSafeIntConvert(wrapper->complexity, result->mComplexity);
+  if (wrapper->signal.hasValue()) {
+    result->mSignal = Helper::toNative(wrapper->signal.value());
+  }
+  if (wrapper->application.hasValue()) {
+    result->mApplication = Helper::toNative(wrapper->application.value());
+  }
+  Helper::optionalSafeIntConvert(wrapper->packetLossPerc, result->mPacketLossPerc);
+  result->mPacketLossPerc = wrapper->predictionDisabled;
+  Helper::optionalSafeIntConvert(wrapper->sPropMaxCaptureRate, result->mSPropMaxCaptureRate);
+  result->mSPropStereo = wrapper->sPropStereo;
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecParameterSettings.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecParameterSettings.h
new file mode 100644
index 00000000..e09707cc
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpOpusCodecParameterSettings.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpOpusCodecParameterSettings.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpOpusCodecParameterSettings : public wrapper::org::ortc::RTCRtpOpusCodecParameterSettings
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::OpusCodecParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpOpusCodecParameterSettings, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpOpusCodecParameterSettings, WrapperType);
+          RTCRtpOpusCodecParameterSettingsWeakPtr thisWeak_;
+
+          RTCRtpOpusCodecParameterSettings();
+          virtual ~RTCRtpOpusCodecParameterSettings();
+
+          // methods RTCRtpOpusCodecParameterSettings
+          virtual void wrapper_init_org_ortc_RTCRtpOpusCodecParameterSettings() override;
+          virtual void wrapper_init_org_ortc_RTCRtpOpusCodecParameterSettings(wrapper::org::ortc::RTCRtpOpusCodecParameterSettingsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpOpusCodecParameterSettings(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpParameters.cpp
new file mode 100644
index 00000000..3bc8396a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpParameters.cpp
@@ -0,0 +1,158 @@
+
+#include "impl_org_ortc_RTCRtpParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_RTCRtpCodecParameters.h"
+#include "impl_org_ortc_RTCRtpHeaderExtensionParameters.h"
+#include "impl_org_ortc_RTCRtpEncodingParameters.h"
+#include "impl_org_ortc_RTCRtcpParameters.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpParameters::RTCRtpParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpParametersPtr wrapper::org::ortc::RTCRtpParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpParameters::~RTCRtpParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpParameters::wrapper_init_org_ortc_RTCRtpParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpParameters::wrapper_init_org_ortc_RTCRtpParameters(wrapper::org::ortc::RTCRtpParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpParameters::wrapper_init_org_ortc_RTCRtpParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCRtpParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->codecs = make_shared< list< wrapper::org::ortc::RTCRtpCodecParametersPtr > >();
+  for (auto iter = native.mCodecs.begin(); iter != native.mCodecs.end(); ++iter) {
+    auto wrapper = RTCRtpCodecParameters::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->codecs->push_back(wrapper);
+  }
+  pThis->headerExtensions = make_shared< list< wrapper::org::ortc::RTCRtpHeaderExtensionParametersPtr > >();
+  for (auto iter = native.mHeaderExtensions.begin(); iter != native.mHeaderExtensions.end(); ++iter) {
+    auto wrapper = RTCRtpHeaderExtensionParameters::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->headerExtensions->push_back(wrapper);
+  }
+  pThis->encodings = make_shared< list< wrapper::org::ortc::RTCRtpEncodingParametersPtr > >();
+  for (auto iter = native.mEncodings.begin(); iter != native.mEncodings.end(); ++iter) {
+    auto wrapper = RTCRtpEncodingParameters::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->encodings->push_back(wrapper);
+  }
+  pThis->rtcp = RTCRtcpParameters::toWrapper(native.mRTCP);
+  pThis->degredationPreference = Helper::toWrapper(native.mDegredationPreference);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  if (wrapper->codecs) {
+    for (auto iter = wrapper->codecs->begin(); iter != wrapper->codecs->end(); ++iter) {
+      auto native = RTCRtpCodecParameters::toNative(*iter);
+      if (!native) continue;
+      result->mCodecs.push_back(*native);
+    }
+  }
+  if (wrapper->headerExtensions) {
+    for (auto iter = wrapper->headerExtensions->begin(); iter != wrapper->headerExtensions->end(); ++iter) {
+      auto native = RTCRtpHeaderExtensionParameters::toNative(*iter);
+      if (!native) continue;
+      result->mHeaderExtensions.push_back(*native);
+    }
+  }
+  if (wrapper->encodings) {
+    for (auto iter = wrapper->encodings->begin(); iter != wrapper->encodings->end(); ++iter) {
+      auto native = RTCRtpEncodingParameters::toNative(*iter);
+      if (!native) continue;
+      result->mEncodings.push_back(*native);
+    }
+  }
+  if (wrapper->rtcp) {
+    auto native = RTCRtcpParameters::toNative(wrapper->rtcp);
+    if (native) {
+      result->mRTCP = *native;
+    }
+  }
+  result->mDegredationPreference = Helper::toNative(wrapper->degredationPreference);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpParameters.h
new file mode 100644
index 00000000..d66129b4
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpParameters : public wrapper::org::ortc::RTCRtpParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::Parameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpParameters, WrapperType);
+          RTCRtpParametersWeakPtr thisWeak_;
+
+          RTCRtpParameters();
+          virtual ~RTCRtpParameters();
+
+          // methods RTCRtpParameters
+          virtual void wrapper_init_org_ortc_RTCRtpParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpParameters(wrapper::org::ortc::RTCRtpParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpReceiver.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpReceiver.cpp
new file mode 100644
index 00000000..1d2816f4
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpReceiver.cpp
@@ -0,0 +1,195 @@
+
+#include "impl_org_ortc_RTCRtpReceiver.h"
+#include "impl_org_ortc_RTCRtpTransport.h"
+#include "impl_org_ortc_RTCRtcpTransport.h"
+#include "impl_org_ortc_MediaStreamTrack.h"
+#include "impl_org_ortc_RTCRtpContributingSource.h"
+#include "impl_org_ortc_RTCRtpCapabilities.h"
+#include "impl_org_ortc_RTCRtpParameters.h"
+
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpReceiver::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpReceiver::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpReceiver::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpReceiver::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpReceiver::RTCRtpReceiver()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpReceiverPtr wrapper::org::ortc::RTCRtpReceiver::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpReceiver>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpReceiver::~RTCRtpReceiver()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::RTCRtpReceiver::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpReceiver::wrapper_init_org_ortc_RTCRtpReceiver(
+  wrapper::org::ortc::MediaStreamTrackKind kind,
+  wrapper::org::ortc::RTCRtpTransportPtr transport
+  )
+{
+  native_ = IRTPReceiver::create(thisWeak_.lock(), Helper::toNative(kind), RTCRtpTransport::toNative(transport));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpReceiver::wrapper_init_org_ortc_RTCRtpReceiver(
+  wrapper::org::ortc::MediaStreamTrackKind kind,
+  wrapper::org::ortc::RTCRtpTransportPtr transport,
+  wrapper::org::ortc::RTCRtcpTransportPtr rtcpTransport
+  )
+{
+  native_ = IRTPReceiver::create(thisWeak_.lock(), Helper::toNative(kind), RTCRtpTransport::toNative(transport), RTCRtcpTransport::toNative(rtcpTransport));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpReceiver::setTransport(wrapper::org::ortc::RTCRtpTransportPtr transport)
+{
+  native_->setTransport(RTCRtpTransport::toNative(transport));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpReceiver::setTransport(
+  wrapper::org::ortc::RTCRtpTransportPtr transport,
+  wrapper::org::ortc::RTCRtcpTransportPtr rtcpTransport
+  )
+{
+  native_->setTransport(RTCRtpTransport::toNative(transport), RTCRtcpTransport::toNative(rtcpTransport));
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpCapabilitiesPtr wrapper::org::ortc::RTCRtpReceiver::getCapabilities(Optional< wrapper::org::ortc::MediaStreamTrackKind > kind)
+{
+  return wrapper::impl::org::ortc::RTCRtpCapabilities::toWrapper(NativeType::getCapabilities(kind.hasValue() ? Optional<::ortc::IMediaStreamTrackTypes::Kinds>(wrapper::impl::org::ortc::Helper::toNative(kind.value())) : Optional<::ortc::IMediaStreamTrackTypes::Kinds>()));
+}
+
+//------------------------------------------------------------------------------
+PromisePtr wrapper::impl::org::ortc::RTCRtpReceiver::receive(wrapper::org::ortc::RTCRtpParametersPtr parameters)
+{
+  auto native = RTCRtpParameters::toNative(parameters);
+  if (!native) return Promise::createRejected(Helper::getGuiQueue());
+  return Helper::toWrapper(native_->receive(*native));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpReceiver::stop()
+{
+  native_->stop();
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::RTCRtpContributingSourcePtr > > wrapper::impl::org::ortc::RTCRtpReceiver::getContributingSources()
+{
+  auto result = make_shared< list< wrapper::org::ortc::RTCRtpContributingSourcePtr > >();
+  auto sources = native_->getContributingSources();
+  for (auto iter = sources.begin(); iter != sources.end(); ++iter) {
+    auto wrapper = RTCRtpContributingSource::toWrapper(*iter);
+    if (!wrapper) continue;
+    result->push_back(wrapper);
+  }
+  return result;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpReceiver::requestSendCsrc(uint32_t csrc)
+{
+  native_->requestSendCSRC(csrc);
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCRtpReceiver::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaStreamTrackPtr wrapper::impl::org::ortc::RTCRtpReceiver::get_track()
+{
+  return MediaStreamTrack::toWrapper(native_->track());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpTransportPtr wrapper::impl::org::ortc::RTCRtpReceiver::get_transport()
+{
+  return RTCRtpTransport::toWrapper(native_->transport());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtcpTransportPtr wrapper::impl::org::ortc::RTCRtpReceiver::get_rtcpTransport()
+{
+  return RTCRtcpTransport::toWrapper(native_->rtcpTransport());
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpReceiver.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpReceiver.h
new file mode 100644
index 00000000..5d85b305
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpReceiver.h
@@ -0,0 +1,71 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpReceiver.h"
+
+#include <ortc/IRTPReceiver.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpReceiver : public wrapper::org::ortc::RTCRtpReceiver,
+                                public ::ortc::IRTPReceiverDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPReceiver, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPReceiver, IRTPReceiver);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPReceiverSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpReceiver, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpReceiver, WrapperType);
+          RTCRtpReceiverWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_{ true };
+          NativeTypeSubscriptionPtr subscription_;
+
+          RTCRtpReceiver();
+          virtual ~RTCRtpReceiver();
+
+          // methods RTCStatsProvider
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+          // methods RTCRtpReceiver
+          virtual void wrapper_init_org_ortc_RTCRtpReceiver(
+            wrapper::org::ortc::MediaStreamTrackKind kind,
+            wrapper::org::ortc::RTCRtpTransportPtr transport
+            ) override;
+          virtual void wrapper_init_org_ortc_RTCRtpReceiver(
+            wrapper::org::ortc::MediaStreamTrackKind kind,
+            wrapper::org::ortc::RTCRtpTransportPtr transport,
+            wrapper::org::ortc::RTCRtcpTransportPtr rtcpTransport
+            ) override;
+          virtual void setTransport(wrapper::org::ortc::RTCRtpTransportPtr transport) override;
+          virtual void setTransport(
+            wrapper::org::ortc::RTCRtpTransportPtr transport,
+            wrapper::org::ortc::RTCRtcpTransportPtr rtcpTransport
+            ) override;
+          virtual PromisePtr receive(wrapper::org::ortc::RTCRtpParametersPtr parameters) override;
+          virtual void stop() override;
+          virtual shared_ptr< list< wrapper::org::ortc::RTCRtpContributingSourcePtr > > getContributingSources() override;
+          virtual void requestSendCsrc(uint32_t csrc) override;
+
+          // properties RTCRtpReceiver
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::MediaStreamTrackPtr get_track() override;
+          virtual wrapper::org::ortc::RTCRtpTransportPtr get_transport() override;
+          virtual wrapper::org::ortc::RTCRtcpTransportPtr get_rtcpTransport() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp
new file mode 100644
index 00000000..60facc36
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp
@@ -0,0 +1,124 @@
+
+#include "impl_org_ortc_RTCRtpRedCodecParameterSettings.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings::RTCRtpRedCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpRedCodecParameterSettingsPtr wrapper::org::ortc::RTCRtpRedCodecParameterSettings::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings::~RTCRtpRedCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings::wrapper_init_org_ortc_RTCRtpRedCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings::wrapper_init_org_ortc_RTCRtpRedCodecParameterSettings(wrapper::org::ortc::RTCRtpRedCodecParameterSettingsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings::wrapper_init_org_ortc_RTCRtpRedCodecParameterSettings(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpRedCodecParameterSettings::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->payloadTypes = make_shared< list< uint8_t > >();
+  for (auto iter = native.mPayloadTypes.begin(); iter != native.mPayloadTypes.end(); ++iter) {
+    pThis->payloadTypes->push_back(SafeInt<uint8_t>(*iter));
+  }
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  if (wrapper->payloadTypes) {
+    for (auto iter = wrapper->payloadTypes->begin(); iter != wrapper->payloadTypes->end(); ++iter) {
+      result->mPayloadTypes.push_back(SafeInt< decltype(result->mPayloadTypes)::value_type >(*iter));
+    }
+  }
+
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpRedCodecParameterSettings.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRedCodecParameterSettings.h
new file mode 100644
index 00000000..918a3550
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRedCodecParameterSettings.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpRedCodecParameterSettings.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpRedCodecParameterSettings : public wrapper::org::ortc::RTCRtpRedCodecParameterSettings
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::REDCodecParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpRedCodecParameterSettings, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpRedCodecParameterSettings, WrapperType);
+          RTCRtpRedCodecParameterSettingsWeakPtr thisWeak_;
+
+          RTCRtpRedCodecParameterSettings();
+          virtual ~RTCRtpRedCodecParameterSettings();
+
+          // methods RTCRtpRedCodecParameterSettings
+          virtual void wrapper_init_org_ortc_RTCRtpRedCodecParameterSettings() override;
+          virtual void wrapper_init_org_ortc_RTCRtpRedCodecParameterSettings(wrapper::org::ortc::RTCRtpRedCodecParameterSettingsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpRedCodecParameterSettings(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp
new file mode 100644
index 00000000..c6c6282e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp
@@ -0,0 +1,117 @@
+
+#include "impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters::RTCRtpRtxCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpRtxCodecCapabilityParametersPtr wrapper::org::ortc::RTCRtpRtxCodecCapabilityParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters::~RTCRtpRtxCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpRtxCodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpRtxCodecCapabilityParameters(wrapper::org::ortc::RTCRtpRtxCodecCapabilityParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpRtxCodecCapabilityParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpRtxCodecCapabilityParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->apt = SafeInt<decltype(pThis->apt)>(native.mApt);
+  pThis->rtxTime = native.mRTXTime;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mApt = SafeInt<decltype(result->mApt)>(wrapper->apt);
+  result->mRTXTime = wrapper->rtxTime;
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h
new file mode 100644
index 00000000..c23851c1
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpRtxCodecCapabilityParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpRtxCodecCapabilityParameters : public wrapper::org::ortc::RTCRtpRtxCodecCapabilityParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::RTXCodecCapabilityParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpRtxCodecCapabilityParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpRtxCodecCapabilityParameters, WrapperType);
+          RTCRtpRtxCodecCapabilityParametersWeakPtr thisWeak_;
+
+          RTCRtpRtxCodecCapabilityParameters();
+          virtual ~RTCRtpRtxCodecCapabilityParameters();
+
+          // methods RTCRtpRtxCodecCapabilityParameters
+          virtual void wrapper_init_org_ortc_RTCRtpRtxCodecCapabilityParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpRtxCodecCapabilityParameters(wrapper::org::ortc::RTCRtpRtxCodecCapabilityParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpRtxCodecCapabilityParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp
new file mode 100644
index 00000000..f202ce22
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp
@@ -0,0 +1,117 @@
+
+#include "impl_org_ortc_RTCRtpRtxCodecParameterSettings.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings::RTCRtpRtxCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpRtxCodecParameterSettingsPtr wrapper::org::ortc::RTCRtpRtxCodecParameterSettings::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings::~RTCRtpRtxCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings::wrapper_init_org_ortc_RTCRtpRtxCodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings::wrapper_init_org_ortc_RTCRtpRtxCodecParameterSettings(wrapper::org::ortc::RTCRtpRtxCodecParameterSettingsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRtxCodecParameterSettings::wrapper_init_org_ortc_RTCRtpRtxCodecParameterSettings(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->apt = SafeInt<decltype(pThis->apt)>(native.mApt);
+  pThis->rtxTime = native.mRTXTime;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mApt = SafeInt<decltype(result->mApt)>(wrapper->apt);
+  result->mRTXTime = wrapper->rtxTime;
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecParameterSettings.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecParameterSettings.h
new file mode 100644
index 00000000..b740f5ab
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxCodecParameterSettings.h
@@ -0,0 +1,43 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpRtxCodecParameterSettings.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpRtxCodecParameterSettings : public wrapper::org::ortc::RTCRtpRtxCodecParameterSettings
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::RTXCodecParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpRtxCodecParameterSettings, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpRtxCodecParameterSettings, WrapperType);
+          RTCRtpRtxCodecParameterSettingsWeakPtr thisWeak_;
+
+          RTCRtpRtxCodecParameterSettings();
+          virtual ~RTCRtpRtxCodecParameterSettings();
+
+          // methods RTCRtpRtxCodecCapabilityParameters
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // methods RTCRtpRtxCodecParameterSettings
+          virtual void wrapper_init_org_ortc_RTCRtpRtxCodecParameterSettings() override;
+          virtual void wrapper_init_org_ortc_RTCRtpRtxCodecParameterSettings(wrapper::org::ortc::RTCRtpRtxCodecParameterSettingsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpRtxCodecParameterSettings(wrapper::org::ortc::JsonPtr json) override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxParameters.cpp
new file mode 100644
index 00000000..b485191a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxParameters.cpp
@@ -0,0 +1,109 @@
+
+#include "impl_org_ortc_RTCRtpRtxParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRtxParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRtxParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpRtxParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpRtxParameters::RTCRtpRtxParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpRtxParametersPtr wrapper::org::ortc::RTCRtpRtxParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpRtxParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpRtxParameters::~RTCRtpRtxParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRtxParameters::wrapper_init_org_ortc_RTCRtpRtxParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRtxParameters::wrapper_init_org_ortc_RTCRtpRtxParameters(wrapper::org::ortc::RTCRtpRtxParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpRtxParameters::wrapper_init_org_ortc_RTCRtpRtxParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpRtxParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpRtxParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mSSRC, pThis->ssrc);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->ssrc, result->mSSRC);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxParameters.h
new file mode 100644
index 00000000..dfb95710
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpRtxParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpRtxParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpRtxParameters : public wrapper::org::ortc::RTCRtpRtxParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::RTXParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpRtxParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpRtxParameters, WrapperType);
+          RTCRtpRtxParametersWeakPtr thisWeak_;
+
+          RTCRtpRtxParameters();
+          virtual ~RTCRtpRtxParameters();
+
+          // methods RTCRtpRtxParameters
+          virtual void wrapper_init_org_ortc_RTCRtpRtxParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpRtxParameters(wrapper::org::ortc::RTCRtpRtxParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpRtxParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpSender.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpSender.cpp
new file mode 100644
index 00000000..0c0b5690
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpSender.cpp
@@ -0,0 +1,200 @@
+
+#include "impl_org_ortc_RTCRtpSender.h"
+#include "impl_org_ortc_RTCRtpTransport.h"
+#include "impl_org_ortc_RTCRtcpTransport.h"
+#include "impl_org_ortc_MediaStreamTrack.h"
+#include "impl_org_ortc_RTCRtpParameters.h"
+#include "impl_org_ortc_RTCRtpCapabilities.h"
+#include "impl_org_ortc_RTCSsrcConflictEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpSender::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpSender::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpSender::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpSender::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpSender::RTCRtpSender()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpSenderPtr wrapper::org::ortc::RTCRtpSender::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpSender>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpSender::~RTCRtpSender()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::RTCRtpSender::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpSender::wrapper_init_org_ortc_RTCRtpSender(
+  wrapper::org::ortc::MediaStreamTrackPtr track,
+  wrapper::org::ortc::RTCRtpTransportPtr transport
+  )
+{
+  native_ = NativeType::create(thisWeak_.lock(), wrapper::impl::org::ortc::MediaStreamTrack::toNative(track), wrapper::impl::org::ortc::RTCRtpTransport::toNative(transport));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpSender::wrapper_init_org_ortc_RTCRtpSender(
+  wrapper::org::ortc::MediaStreamTrackPtr track,
+  wrapper::org::ortc::RTCRtpTransportPtr transport,
+  wrapper::org::ortc::RTCRtcpTransportPtr rtcpTransport
+  )
+{
+  native_ = NativeType::create(thisWeak_.lock(), wrapper::impl::org::ortc::MediaStreamTrack::toNative(track), wrapper::impl::org::ortc::RTCRtpTransport::toNative(transport), wrapper::impl::org::ortc::RTCRtcpTransport::toNative(rtcpTransport));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpSender::setTransport(wrapper::org::ortc::RTCRtpTransportPtr transport)
+{
+  native_->setTransport(RTCRtpTransport::toNative(transport));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpSender::setTransport(
+  wrapper::org::ortc::RTCRtpTransportPtr transport,
+  wrapper::org::ortc::RTCRtcpTransportPtr rtcpTransport
+  )
+{
+  native_->setTransport(RTCRtpTransport::toNative(transport), RTCRtcpTransport::toNative(rtcpTransport));
+}
+
+//------------------------------------------------------------------------------
+PromisePtr wrapper::impl::org::ortc::RTCRtpSender::setTrack(wrapper::org::ortc::MediaStreamTrackPtr track)
+{
+  return Helper::toWrapper(native_->setTrack(MediaStreamTrack::toNative(track)));
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpCapabilitiesPtr wrapper::org::ortc::RTCRtpSender::getCapabilities(Optional< wrapper::org::ortc::MediaStreamTrackKind > kind)
+{
+  Optional<::ortc::IMediaStreamTrackTypes::Kinds> native;
+  if (kind.hasValue()) {
+    native = wrapper::impl::org::ortc::Helper::toNative(kind.value());
+  }
+  return wrapper::impl::org::ortc::RTCRtpCapabilities::toWrapper(NativeType::getCapabilities(native));
+}
+
+//------------------------------------------------------------------------------
+PromisePtr wrapper::impl::org::ortc::RTCRtpSender::send(wrapper::org::ortc::RTCRtpParametersPtr parameters)
+{
+  auto native = RTCRtpParameters::toNative(parameters);
+  ZS_THROW_INVALID_ARGUMENT_IF(!native);
+  return Helper::toWrapper(native_->send(*native));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpSender::stop()
+{
+  native_->stop();
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCRtpSender::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaStreamTrackPtr wrapper::impl::org::ortc::RTCRtpSender::get_track()
+{
+  return MediaStreamTrack::toWrapper(native_->track());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpTransportPtr wrapper::impl::org::ortc::RTCRtpSender::get_transport()
+{
+  return RTCRtpTransport::toWrapper(native_->transport());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtcpTransportPtr wrapper::impl::org::ortc::RTCRtpSender::get_rtcpTransport()
+{
+  return RTCRtcpTransport::toWrapper(native_->rtcpTransport());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpSender::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onRTPSenderSSRCConflict(
+  IRTPSenderPtr sender,
+  SSRCType ssrc
+)
+{
+  onSsrcConflict(RTCSsrcConflictEvent::toWrapper(ssrc));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpSender.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpSender.h
new file mode 100644
index 00000000..6412dc1d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpSender.h
@@ -0,0 +1,78 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpSender.h"
+
+#include <ortc/IRTPSender.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpSender : public wrapper::org::ortc::RTCRtpSender,
+                              public ::ortc::IRTPSenderDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPSender, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPSender, IRTPSender);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPSenderSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpSender, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpSender, WrapperType);
+
+          RTCRtpSenderWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_{ true };
+          NativeTypeSubscriptionPtr subscription_;
+
+          RTCRtpSender();
+          virtual ~RTCRtpSender();
+
+          // methods RTCStatsProvider
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+          // methods RTCRtpSender
+          virtual void wrapper_init_org_ortc_RTCRtpSender(
+            wrapper::org::ortc::MediaStreamTrackPtr track,
+            wrapper::org::ortc::RTCRtpTransportPtr transport
+            ) override;
+          virtual void wrapper_init_org_ortc_RTCRtpSender(
+            wrapper::org::ortc::MediaStreamTrackPtr track,
+            wrapper::org::ortc::RTCRtpTransportPtr transport,
+            wrapper::org::ortc::RTCRtcpTransportPtr rtcpTransport
+            ) override;
+          virtual void setTransport(wrapper::org::ortc::RTCRtpTransportPtr transport) override;
+          virtual void setTransport(
+            wrapper::org::ortc::RTCRtpTransportPtr transport,
+            wrapper::org::ortc::RTCRtcpTransportPtr rtcpTransport
+            ) override;
+          virtual PromisePtr setTrack(wrapper::org::ortc::MediaStreamTrackPtr track) override;
+          virtual PromisePtr send(wrapper::org::ortc::RTCRtpParametersPtr parameters) override;
+          virtual void stop() override;
+
+          // properties RTCRtpSender
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::MediaStreamTrackPtr get_track() override;
+          virtual wrapper::org::ortc::RTCRtpTransportPtr get_transport() override;
+          virtual wrapper::org::ortc::RTCRtcpTransportPtr get_rtcpTransport() override;
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          virtual void onRTPSenderSSRCConflict(
+            IRTPSenderPtr sender,
+            SSRCType ssrc
+          ) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpStreamStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpStreamStats.cpp
new file mode 100644
index 00000000..f5757133
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpStreamStats.cpp
@@ -0,0 +1,183 @@
+
+#include "impl_org_ortc_RTCRtpStreamStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpStreamStats::RTCRtpStreamStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpStreamStatsPtr wrapper::org::ortc::RTCRtpStreamStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpStreamStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpStreamStats::~RTCRtpStreamStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpStreamStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCRtpStreamStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpStreamStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCRtpStreamStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCRtpStreamStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpStreamStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpStreamStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpStreamStats::wrapper_init_org_ortc_RTCRtpStreamStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpStreamStats::wrapper_init_org_ortc_RTCRtpStreamStats(wrapper::org::ortc::RTCRtpStreamStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCRtpStreamStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpStreamStats::wrapper_init_org_ortc_RTCRtpStreamStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+Optional< uint32_t > wrapper::impl::org::ortc::RTCRtpStreamStats::get_ssrc()
+{
+  return native_->mSSRC;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpStreamStats::get_associatedStatId()
+{
+  return native_->mAssociatedStatID;
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCRtpStreamStats::get_isRemote()
+{
+  return native_->mIsRemote;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpStreamStats::get_mediaType()
+{
+  return native_->mMediaType;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpStreamStats::get_mediaTrackId()
+{
+  return native_->mMediaTrackID;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpStreamStats::get_transportId()
+{
+  return native_->mTransportID;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpStreamStats::get_codecId()
+{
+  return native_->mCodecID;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCRtpStreamStats::get_firCount()
+{
+  return native_->mFIRCount;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCRtpStreamStats::get_pliCount()
+{
+  return native_->mPLICount;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCRtpStreamStats::get_nackCount()
+{
+  return native_->mNACKCount;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCRtpStreamStats::get_sliCount()
+{
+  return native_->mSLICount;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpStreamStatsPtr wrapper::impl::org::ortc::RTCRtpStreamStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCRtpStreamStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpStreamStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpStreamStats::NativeStatsPtr wrapper::impl::org::ortc::RTCRtpStreamStats::toNative(wrapper::org::ortc::RTCRtpStreamStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCRtpStreamStats>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpStreamStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpStreamStats.h
new file mode 100644
index 00000000..8bded01a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpStreamStats.h
@@ -0,0 +1,59 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpStreamStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpStreamStats : public wrapper::org::ortc::RTCRtpStreamStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::RTPStreamStats, NativeStats);
+          RTCRtpStreamStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCRtpStreamStats();
+          virtual ~RTCRtpStreamStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCRtpStreamStats
+          virtual void wrapper_init_org_ortc_RTCRtpStreamStats() override;
+          virtual void wrapper_init_org_ortc_RTCRtpStreamStats(wrapper::org::ortc::RTCRtpStreamStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpStreamStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCRtpStreamStats
+          virtual Optional< uint32_t > get_ssrc() override;
+          virtual String get_associatedStatId() override;
+          virtual bool get_isRemote() override;
+          virtual String get_mediaType() override;
+          virtual String get_mediaTrackId() override;
+          virtual String get_transportId() override;
+          virtual String get_codecId() override;
+          virtual unsigned long get_firCount() override;
+          virtual unsigned long get_pliCount() override;
+          virtual unsigned long get_nackCount() override;
+          virtual unsigned long get_sliCount() override;
+
+          static RTCRtpStreamStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCRtpStreamStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpTransport.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpTransport.cpp
new file mode 100644
index 00000000..f3b0b9e7
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpTransport.cpp
@@ -0,0 +1,77 @@
+
+#include "impl_org_ortc_RTCRtpTransport.h"
+#include "impl_org_ortc_RTCDtlsTransport.h"
+#include "impl_org_ortc_RTCIceTransport.h"
+#include "impl_org_ortc_RTCSrtpSdesTransport.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpTransport::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpTransport::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpTransport::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpTransport::RTCRtpTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpTransportPtr wrapper::org::ortc::RTCRtpTransport::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpTransport>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpTransport::~RTCRtpTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  {
+    auto impl = std::dynamic_pointer_cast<RTCDtlsTransport>(wrapper);
+    if (impl) return RTCDtlsTransport::toNative(impl);
+  }
+  {
+    auto impl = std::dynamic_pointer_cast<RTCSrtpSdesTransport>(wrapper);
+    if (impl) return RTCSrtpSdesTransport::toNative(impl);
+  }
+  
+  {
+    auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+    if (impl) return impl->native_;
+  }
+  return NativeTypePtr();
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpTransport.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpTransport.h
new file mode 100644
index 00000000..cfa05169
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpTransport.h
@@ -0,0 +1,33 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpTransport.h"
+
+#include <ortc/types.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpTransport : public wrapper::org::ortc::RTCRtpTransport
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTransport, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpTransport, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpTransport, WrapperType);
+          RTCRtpTransportWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCRtpTransport();
+          virtual ~RTCRtpTransport();
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpUnhandledEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpUnhandledEvent.cpp
new file mode 100644
index 00000000..86bf12d0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpUnhandledEvent.cpp
@@ -0,0 +1,87 @@
+
+#include "impl_org_ortc_RTCRtpUnhandledEvent.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpUnhandledEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpUnhandledEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpUnhandledEvent::RTCRtpUnhandledEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpUnhandledEventPtr wrapper::org::ortc::RTCRtpUnhandledEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpUnhandledEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpUnhandledEvent::~RTCRtpUnhandledEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpUnhandledEvent::wrapper_init_org_ortc_RTCRtpUnhandledEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+uint32_t wrapper::impl::org::ortc::RTCRtpUnhandledEvent::get_ssrc()
+{
+  return ssrc_;
+}
+
+//------------------------------------------------------------------------------
+uint8_t wrapper::impl::org::ortc::RTCRtpUnhandledEvent::get_payloadType()
+{
+  return payloadType_;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpUnhandledEvent::get_muxId()
+{
+  return mid_;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpUnhandledEvent::get_rid()
+{
+  return rid_;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(
+  SSRCType ssrc,
+  PayloadType payloadType,
+  const String &mid,
+  const String &rid
+)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->ssrc_ = ssrc;
+  pThis->payloadType_ = payloadType;
+  pThis->mid_ = mid;
+  pThis->rid_ = rid;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpUnhandledEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpUnhandledEvent.h
new file mode 100644
index 00000000..d7d834ec
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpUnhandledEvent.h
@@ -0,0 +1,48 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpUnhandledEvent.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpUnhandledEvent : public wrapper::org::ortc::RTCRtpUnhandledEvent
+        {
+          typedef ::ortc::IRTPTypes::SSRCType SSRCType;
+          typedef ::ortc::IRTPTypes::PayloadType PayloadType;
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpUnhandledEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpUnhandledEvent, WrapperType);
+          RTCRtpUnhandledEventWeakPtr thisWeak_;
+          SSRCType ssrc_;
+          PayloadType payloadType_;
+          String mid_;
+          String rid_;
+
+          RTCRtpUnhandledEvent();
+          virtual ~RTCRtpUnhandledEvent();
+          virtual void wrapper_init_org_ortc_RTCRtpUnhandledEvent() override;
+
+          // properties RTCRtpUnhandledEvent
+          virtual uint32_t get_ssrc() override;
+          virtual uint8_t get_payloadType() override;
+          virtual String get_muxId() override;
+          virtual String get_rid() override;
+
+          static WrapperImplTypePtr toWrapper(
+            SSRCType ssrc,
+            PayloadType payloadType,
+            const String &mid,
+            const String &rid
+          );
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp
new file mode 100644
index 00000000..2726048f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp
@@ -0,0 +1,120 @@
+
+#include "impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters::RTCRtpVp8CodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpVp8CodecCapabilityParametersPtr wrapper::org::ortc::RTCRtpVp8CodecCapabilityParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters::~RTCRtpVp8CodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpVp8CodecCapabilityParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpVp8CodecCapabilityParameters(wrapper::org::ortc::RTCRtpVp8CodecCapabilityParametersPtr source)
+{
+  if (!source) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters::wrapper_init_org_ortc_RTCRtpVp8CodecCapabilityParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpVp8CodecCapabilityParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+
+  Helper::optionalSafeIntConvert(native.mMaxFR, pThis->maxFr);
+  Helper::optionalSafeIntConvert(native.mMaxFS, pThis->maxFs);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->maxFr, result->mMaxFR);
+  Helper::optionalSafeIntConvert(wrapper->maxFs, result->mMaxFS);
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h
new file mode 100644
index 00000000..3c31e01d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpVp8CodecCapabilityParameters.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpVp8CodecCapabilityParameters : public wrapper::org::ortc::RTCRtpVp8CodecCapabilityParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::VP8CodecCapabilityParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpVp8CodecCapabilityParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpVp8CodecCapabilityParameters, WrapperType);
+          RTCRtpVp8CodecCapabilityParametersWeakPtr thisWeak_;
+
+          RTCRtpVp8CodecCapabilityParameters();
+          virtual ~RTCRtpVp8CodecCapabilityParameters();
+
+          // methods RTCRtpVp8CodecCapabilityParameters
+          virtual void wrapper_init_org_ortc_RTCRtpVp8CodecCapabilityParameters() override;
+          virtual void wrapper_init_org_ortc_RTCRtpVp8CodecCapabilityParameters(wrapper::org::ortc::RTCRtpVp8CodecCapabilityParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpVp8CodecCapabilityParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp
new file mode 100644
index 00000000..e9d8bb9b
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp
@@ -0,0 +1,120 @@
+
+#include "impl_org_ortc_RTCRtpVp8CodecParameterSettings.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings::RTCRtpVp8CodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpVp8CodecParameterSettingsPtr wrapper::org::ortc::RTCRtpVp8CodecParameterSettings::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings::~RTCRtpVp8CodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings::wrapper_init_org_ortc_RTCRtpVp8CodecParameterSettings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings::wrapper_init_org_ortc_RTCRtpVp8CodecParameterSettings(wrapper::org::ortc::RTCRtpVp8CodecParameterSettingsPtr source)
+{
+  if (!source) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCRtpVp8CodecParameterSettings::wrapper_init_org_ortc_RTCRtpVp8CodecParameterSettings(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(AnyPtr native)
+{
+  return toWrapper(std::dynamic_pointer_cast<NativeType>(native));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+
+  Helper::optionalSafeIntConvert(native.mMaxFR, pThis->maxFr);
+  Helper::optionalSafeIntConvert(native.mMaxFS, pThis->maxFs);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->maxFr, result->mMaxFR);
+  Helper::optionalSafeIntConvert(wrapper->maxFs, result->mMaxFS);
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecParameterSettings.h b/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecParameterSettings.h
new file mode 100644
index 00000000..a68daad3
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCRtpVp8CodecParameterSettings.h
@@ -0,0 +1,43 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCRtpVp8CodecParameterSettings.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCRtpVp8CodecParameterSettings : public wrapper::org::ortc::RTCRtpVp8CodecParameterSettings
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::VP8CodecParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCRtpVp8CodecParameterSettings, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCRtpVp8CodecParameterSettings, WrapperType);
+          RTCRtpVp8CodecParameterSettingsWeakPtr thisWeak_;
+
+          RTCRtpVp8CodecParameterSettings();
+          virtual ~RTCRtpVp8CodecParameterSettings();
+
+          // methods RTCRtpVp8CodecCapabilityParameters
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // methods RTCRtpVp8CodecParameterSettings
+          virtual void wrapper_init_org_ortc_RTCRtpVp8CodecParameterSettings() override;
+          virtual void wrapper_init_org_ortc_RTCRtpVp8CodecParameterSettings(wrapper::org::ortc::RTCRtpVp8CodecParameterSettingsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCRtpVp8CodecParameterSettings(wrapper::org::ortc::JsonPtr json) override;
+
+          static WrapperImplTypePtr toWrapper(AnyPtr native);
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpCapabilities.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSctpCapabilities.cpp
new file mode 100644
index 00000000..e135e1a0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpCapabilities.cpp
@@ -0,0 +1,116 @@
+
+#include "impl_org_ortc_RTCSctpCapabilities.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpCapabilities::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpCapabilities::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpCapabilities::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpCapabilities::RTCSctpCapabilities()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpCapabilitiesPtr wrapper::org::ortc::RTCSctpCapabilities::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSctpCapabilities>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpCapabilities::~RTCSctpCapabilities()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpCapabilities::wrapper_init_org_ortc_RTCSctpCapabilities()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpCapabilities::wrapper_init_org_ortc_RTCSctpCapabilities(wrapper::org::ortc::RTCSctpCapabilitiesPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpCapabilities::wrapper_init_org_ortc_RTCSctpCapabilities(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCSctpCapabilities::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCSctpCapabilities"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCSctpCapabilities::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->maxMessageSize = SafeInt<decltype(pThis->maxMessageSize)>(native.mMaxMessageSize);
+  pThis->minPort = SafeInt<decltype(pThis->minPort)>(native.mMinPort);
+  pThis->maxPort = SafeInt<decltype(pThis->maxPort)>(native.mMaxPort);
+  pThis->maxUsablePorts = SafeInt<decltype(pThis->maxUsablePorts)>(native.mMaxUsablePorts);
+  pThis->maxSessionsPerPort = SafeInt<decltype(pThis->maxSessionsPerPort)>(native.mMaxSessionsPerPort);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mMaxMessageSize = SafeInt<decltype(result->mMaxMessageSize)>(wrapper->maxMessageSize);
+  result->mMinPort = SafeInt<decltype(result->mMinPort)>(wrapper->minPort);
+  result->mMaxPort = SafeInt<decltype(result->mMaxPort)>(wrapper->maxPort);
+  result->mMaxUsablePorts = SafeInt<decltype(result->mMaxUsablePorts)>(wrapper->maxUsablePorts);
+  result->mMaxSessionsPerPort = SafeInt<decltype(result->mMaxSessionsPerPort)>(wrapper->maxSessionsPerPort);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpCapabilities.h b/ortc/idl/wrapper/impl_org_ortc_RTCSctpCapabilities.h
new file mode 100644
index 00000000..8dfa70c5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpCapabilities.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSctpCapabilities.h"
+
+#include <ortc/ISCTPTransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSctpCapabilities : public wrapper::org::ortc::RTCSctpCapabilities
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISCTPTransportTypes::Capabilities, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCSctpCapabilities, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSctpCapabilities, WrapperType);
+          RTCSctpCapabilitiesWeakPtr thisWeak_;
+
+          RTCSctpCapabilities();
+          virtual ~RTCSctpCapabilities();
+
+          // methods RTCSctpCapabilities
+          virtual void wrapper_init_org_ortc_RTCSctpCapabilities() override;
+          virtual void wrapper_init_org_ortc_RTCSctpCapabilities(wrapper::org::ortc::RTCSctpCapabilitiesPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCSctpCapabilities(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransport.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransport.cpp
new file mode 100644
index 00000000..675c62c1
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransport.cpp
@@ -0,0 +1,218 @@
+
+#include "impl_org_ortc_RTCSctpTransport.h"
+#include "impl_org_ortc_RTCDtlsTransport.h"
+#include "impl_org_ortc_RTCSctpCapabilities.h"
+#include "impl_org_ortc_RTCSctpTransportListener.h"
+#include "impl_org_ortc_RTCSctpTransportStateChangeEvent.h"
+#include "impl_org_ortc_RTCDataChannelEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+using namespace wrapper::impl::org::ortc;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransport::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransport::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransport::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransport::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransport::RTCSctpTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpTransportPtr wrapper::org::ortc::RTCSctpTransport::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSctpTransport>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransport::~RTCSctpTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::RTCSctpTransport::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpTransport::wrapper_init_org_ortc_RTCSctpTransport(wrapper::org::ortc::RTCDtlsTransportPtr transport)
+{
+  native_ = NativeType::create(thisWeak_.lock(), RTCDtlsTransport::toNative(transport));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpTransport::wrapper_init_org_ortc_RTCSctpTransport(
+  wrapper::org::ortc::RTCDtlsTransportPtr transport,
+  uint16_t localPort
+  )
+{
+  native_ = NativeType::create(thisWeak_.lock(), RTCDtlsTransport::toNative(transport), localPort);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpTransportListenerPtr wrapper::org::ortc::RTCSctpTransport::listen(
+  wrapper::org::ortc::RTCDtlsTransportPtr transport,
+  wrapper::org::ortc::RTCSctpCapabilitiesPtr remoteCapabilities
+  )
+{
+  auto native = wrapper::impl::org::ortc::RTCSctpCapabilities::toNative(remoteCapabilities);
+  ZS_THROW_INVALID_ARGUMENT_IF(!native);
+  return wrapper::impl::org::ortc::RTCSctpTransportListener::toWrapper(NativeType::listen(::ortc::ISCTPTransportListenerDelegatePtr(), wrapper::impl::org::ortc::RTCDtlsTransport::toNative(transport), *native));
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpCapabilitiesPtr wrapper::org::ortc::RTCSctpTransport::getCapabilities()
+{
+  return wrapper::impl::org::ortc::RTCSctpCapabilities::toWrapper(NativeType::getCapabilities());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpTransport::start(wrapper::org::ortc::RTCSctpCapabilitiesPtr remoteCapabilities)
+{
+  auto native = RTCSctpCapabilities::toNative(remoteCapabilities);
+  ZS_THROW_INVALID_ARGUMENT_IF(!native);
+  native_->start(*native);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpTransport::start(
+  wrapper::org::ortc::RTCSctpCapabilitiesPtr remoteCapabilities,
+  uint16_t remotePort
+  )
+{
+  auto native = RTCSctpCapabilities::toNative(remoteCapabilities);
+  ZS_THROW_INVALID_ARGUMENT_IF(!native);
+  native_->start(*native, remotePort);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpTransport::stop()
+{
+  native_->stop();
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCSctpTransport::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCDtlsTransportPtr wrapper::impl::org::ortc::RTCSctpTransport::get_transport()
+{
+  return RTCDtlsTransport::toWrapper(native_->transport());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpTransportState wrapper::impl::org::ortc::RTCSctpTransport::get_state()
+{
+  return Helper::toWrapper(native_->state());
+}
+
+//------------------------------------------------------------------------------
+uint16_t wrapper::impl::org::ortc::RTCSctpTransport::get_port()
+{
+  return SafeInt<uint16_t>(native_->port());
+}
+
+//------------------------------------------------------------------------------
+uint16_t wrapper::impl::org::ortc::RTCSctpTransport::get_localPort()
+{
+  return SafeInt<uint16_t>(native_->localPort());
+}
+
+//------------------------------------------------------------------------------
+Optional< uint16_t > wrapper::impl::org::ortc::RTCSctpTransport::get_remotePort()
+{
+  Optional< uint16_t > result {};
+  auto native = native_->remotePort();
+  Helper::optionalSafeIntConvert(native, result);
+  return result;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpTransport::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onSCTPTransportStateChange(
+  ISCTPTransportPtr transport,
+  States state
+)
+{
+  onStateChange(RTCSctpTransportStateChangeEvent::toWrapper(state));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onSCTPTransportDataChannel(
+  ISCTPTransportPtr transport,
+  ::ortc::IDataChannelPtr channel
+)
+{
+  onDataChannel(RTCDataChannelEvent::toWrapper(channel));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransport.h b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransport.h
new file mode 100644
index 00000000..bbc369d3
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransport.h
@@ -0,0 +1,78 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSctpTransport.h"
+
+#include <ortc/ISCTPTransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSctpTransport : public wrapper::org::ortc::RTCSctpTransport,
+                                  public ::ortc::ISCTPTransportDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISCTPTransport, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISCTPTransport, ISCTPTransport);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISCTPTransportSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCSctpTransport, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSctpTransport, WrapperType);
+
+          RTCSctpTransportWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_{ true };
+          NativeTypeSubscriptionPtr subscription_;
+
+          RTCSctpTransport();
+          virtual ~RTCSctpTransport();
+
+          // methods RTCStatsProvider
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+          // methods RTCSctpTransport
+          virtual void wrapper_init_org_ortc_RTCSctpTransport(wrapper::org::ortc::RTCDtlsTransportPtr transport) override;
+          virtual void wrapper_init_org_ortc_RTCSctpTransport(
+            wrapper::org::ortc::RTCDtlsTransportPtr transport,
+            uint16_t localPort
+            ) override;
+          virtual void start(wrapper::org::ortc::RTCSctpCapabilitiesPtr remoteCapabilities) override;
+          virtual void start(
+            wrapper::org::ortc::RTCSctpCapabilitiesPtr remoteCapabilities,
+            uint16_t remotePort
+            ) override;
+          virtual void stop() override;
+
+          // properties RTCSctpTransport
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::RTCDtlsTransportPtr get_transport() override;
+          virtual wrapper::org::ortc::RTCSctpTransportState get_state() override;
+          virtual uint16_t get_port() override;
+          virtual uint16_t get_localPort() override;
+          virtual Optional< uint16_t > get_remotePort() override;
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          virtual void onSCTPTransportStateChange(
+            ISCTPTransportPtr transport,
+            States state
+          ) override;
+          virtual void onSCTPTransportDataChannel(
+            ISCTPTransportPtr transport,
+            ::ortc::IDataChannelPtr channel
+          ) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListener.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListener.cpp
new file mode 100644
index 00000000..d2f34b70
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListener.cpp
@@ -0,0 +1,102 @@
+
+#include "impl_org_ortc_RTCSctpTransportListener.h"
+#include "impl_org_ortc_RTCSctpTransport.h"
+#include "impl_org_ortc_RTCSctpTransportListenerEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransportListener::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransportListener::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransportListener::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransportListener::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransportListener::RTCSctpTransportListener()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpTransportListenerPtr wrapper::org::ortc::RTCSctpTransportListener::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSctpTransportListener>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransportListener::~RTCSctpTransportListener()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpTransportListener::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onSCTPTransport(::ortc::ISCTPTransportPtr transport)
+{
+  onTransport(RTCSctpTransportListenerEvent::toWrapper(transport));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  // result->defaultSubscription_ = false; // always have a default subscription
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  // always have a default subscription - thus noop
+#if 0
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+#endif //
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListener.h b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListener.h
new file mode 100644
index 00000000..e45dea9d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListener.h
@@ -0,0 +1,47 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSctpTransportListener.h"
+
+#include <ortc/ISCTPTransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSctpTransportListener : public wrapper::org::ortc::RTCSctpTransportListener,
+                                          public ::ortc::ISCTPTransportListenerDelegate
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISCTPTransportListenerSubscription, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISCTPTransportListenerSubscription, ISCTPTransportListenerSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISCTPTransportListenerSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCSctpTransportListener, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSctpTransportListener, WrapperType);
+
+          RTCSctpTransportListenerWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          //bool defaultSubscription_{ true };  // always last a default subscription
+          //NativeTypeSubscriptionPtr subscription_; // native type is a subscription
+
+          RTCSctpTransportListener();
+          virtual ~RTCSctpTransportListener();
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          virtual void onSCTPTransport(::ortc::ISCTPTransportPtr transport) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListenerEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListenerEvent.cpp
new file mode 100644
index 00000000..6937b6e8
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListenerEvent.cpp
@@ -0,0 +1,60 @@
+
+#include "impl_org_ortc_RTCSctpTransportListenerEvent.h"
+#include "impl_org_ortc_RTCSctpTransport.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransportListenerEvent::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransportListenerEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransportListenerEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransportListenerEvent::RTCSctpTransportListenerEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpTransportListenerEventPtr wrapper::org::ortc::RTCSctpTransportListenerEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSctpTransportListenerEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransportListenerEvent::~RTCSctpTransportListenerEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpTransportPtr wrapper::impl::org::ortc::RTCSctpTransportListenerEvent::get_transport()
+{
+  return RTCSctpTransport::toWrapper(native_);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListenerEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListenerEvent.h
new file mode 100644
index 00000000..cac910f7
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportListenerEvent.h
@@ -0,0 +1,35 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSctpTransportListenerEvent.h"
+
+#include <ortc/types.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSctpTransportListenerEvent : public wrapper::org::ortc::RTCSctpTransportListenerEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISCTPTransport, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCSctpTransportListenerEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSctpTransportListenerEvent, WrapperType);
+          RTCSctpTransportListenerEventWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCSctpTransportListenerEvent();
+          virtual ~RTCSctpTransportListenerEvent();
+
+          // properties RTCSctpTransportListenerEvent
+          virtual wrapper::org::ortc::RTCSctpTransportPtr get_transport() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp
new file mode 100644
index 00000000..9ac5895f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp
@@ -0,0 +1,59 @@
+
+#include "impl_org_ortc_RTCSctpTransportStateChangeEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransportStateChangeEvent::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransportStateChangeEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSctpTransportStateChangeEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransportStateChangeEvent::RTCSctpTransportStateChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpTransportStateChangeEventPtr wrapper::org::ortc::RTCSctpTransportStateChangeEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSctpTransportStateChangeEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransportStateChangeEvent::~RTCSctpTransportStateChangeEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpTransportState wrapper::impl::org::ortc::RTCSctpTransportStateChangeEvent::get_state()
+{
+  return Helper::toWrapper(native_);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeType native)
+{
+  if (!native) return WrapperImplTypePtr();
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStateChangeEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStateChangeEvent.h
new file mode 100644
index 00000000..cb564f18
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStateChangeEvent.h
@@ -0,0 +1,35 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSctpTransportStateChangeEvent.h"
+
+#include <ortc/ISCTPTransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSctpTransportStateChangeEvent : public wrapper::org::ortc::RTCSctpTransportStateChangeEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISCTPTransportTypes::States, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCSctpTransportStateChangeEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSctpTransportStateChangeEvent, WrapperType);
+          RTCSctpTransportStateChangeEventWeakPtr thisWeak_;
+          NativeType native_;
+
+          RTCSctpTransportStateChangeEvent();
+          virtual ~RTCSctpTransportStateChangeEvent();
+
+          // properties RTCSctpTransportStateChangeEvent
+          virtual wrapper::org::ortc::RTCSctpTransportState get_state() override;
+
+          static WrapperImplTypePtr toWrapper(NativeType native);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStats.cpp
new file mode 100644
index 00000000..4c0505f8
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStats.cpp
@@ -0,0 +1,130 @@
+
+#include "impl_org_ortc_RTCSctpTransportStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransportStats::RTCSctpTransportStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSctpTransportStatsPtr wrapper::org::ortc::RTCSctpTransportStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSctpTransportStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransportStats::~RTCSctpTransportStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCSctpTransportStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCSctpTransportStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCSctpTransportStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCSctpTransportStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCSctpTransportStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCSctpTransportStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCSctpTransportStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpTransportStats::wrapper_init_org_ortc_RTCSctpTransportStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpTransportStats::wrapper_init_org_ortc_RTCSctpTransportStats(wrapper::org::ortc::RTCSctpTransportStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCSctpTransportStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSctpTransportStats::wrapper_init_org_ortc_RTCSctpTransportStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCSctpTransportStats::get_dataChannelsOpened()
+{
+  return native_->mDataChannelsOpened;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCSctpTransportStats::get_dataChannelsClosed()
+{
+  return native_->mDataChannelsClosed;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransportStatsPtr wrapper::impl::org::ortc::RTCSctpTransportStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCSctpTransportStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSctpTransportStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSctpTransportStats::NativeStatsPtr wrapper::impl::org::ortc::RTCSctpTransportStats::toNative(wrapper::org::ortc::RTCSctpTransportStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCSctpTransportStats>(wrapper)->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStats.h
new file mode 100644
index 00000000..df646dab
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSctpTransportStats.h
@@ -0,0 +1,50 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSctpTransportStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSctpTransportStats : public wrapper::org::ortc::RTCSctpTransportStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::SCTPTransportStats, NativeStats);
+          RTCSctpTransportStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCSctpTransportStats();
+          virtual ~RTCSctpTransportStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCSctpTransportStats
+          virtual void wrapper_init_org_ortc_RTCSctpTransportStats() override;
+          virtual void wrapper_init_org_ortc_RTCSctpTransportStats(wrapper::org::ortc::RTCSctpTransportStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCSctpTransportStats(wrapper::org::ortc::JsonPtr json) override;
+
+          // properties RTCSctpTransportStats
+          virtual unsigned long get_dataChannelsOpened() override;
+          virtual unsigned long get_dataChannelsClosed() override;
+
+          static RTCSctpTransportStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCSctpTransportStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp
new file mode 100644
index 00000000..eb9530fa
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp
@@ -0,0 +1,127 @@
+
+#include "impl_org_ortc_RTCSrtpSdesCryptoParameters.h"
+#include "impl_org_ortc_RTCSrtpSdesKeyParameters.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters::RTCSrtpSdesCryptoParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSrtpSdesCryptoParametersPtr wrapper::org::ortc::RTCSrtpSdesCryptoParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters::~RTCSrtpSdesCryptoParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters::wrapper_init_org_ortc_RTCSrtpSdesCryptoParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters::wrapper_init_org_ortc_RTCSrtpSdesCryptoParameters(wrapper::org::ortc::RTCSrtpSdesCryptoParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters::wrapper_init_org_ortc_RTCSrtpSdesCryptoParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCSrtpSdesCryptoParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCSrtpSdesCryptoParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->tag = SafeInt<decltype(pThis->tag)>(native.mTag);
+  pThis->cryptoSuite = native.mCryptoSuite;
+  pThis->keyParams = make_shared< list< wrapper::org::ortc::RTCSrtpSdesKeyParametersPtr > >();
+  for (auto iter = native.mKeyParams.begin(); iter != native.mKeyParams.end(); ++iter) {
+    auto wrapper = RTCSrtpSdesKeyParameters::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->keyParams->push_back(wrapper);
+  }
+  pThis->sessionParams = make_shared< list< String > >(native.mSessionParams);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mTag = SafeInt<decltype(result->mTag)>(wrapper->tag);
+  if (wrapper->keyParams) {
+    for (auto iter = wrapper->keyParams->begin(); iter != wrapper->keyParams->end(); ++iter) {
+      auto native = RTCSrtpSdesKeyParameters::toNative(*iter);
+      if (!native) continue;
+      result->mKeyParams.push_back(*native);
+    }
+  }
+  if (wrapper->sessionParams) {
+    result->mSessionParams = *(wrapper->sessionParams);
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesCryptoParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesCryptoParameters.h
new file mode 100644
index 00000000..3965f757
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesCryptoParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSrtpSdesCryptoParameters.h"
+
+#include <ortc/ISRTPSDESTransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSrtpSdesCryptoParameters : public wrapper::org::ortc::RTCSrtpSdesCryptoParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISRTPSDESTransport::CryptoParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCSrtpSdesCryptoParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSrtpSdesCryptoParameters, WrapperType);
+          RTCSrtpSdesCryptoParametersWeakPtr thisWeak_;
+
+          RTCSrtpSdesCryptoParameters();
+          virtual ~RTCSrtpSdesCryptoParameters();
+
+          // methods RTCSrtpSdesCryptoParameters
+          virtual void wrapper_init_org_ortc_RTCSrtpSdesCryptoParameters() override;
+          virtual void wrapper_init_org_ortc_RTCSrtpSdesCryptoParameters(wrapper::org::ortc::RTCSrtpSdesCryptoParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCSrtpSdesCryptoParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesKeyParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesKeyParameters.cpp
new file mode 100644
index 00000000..24bfe8a2
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesKeyParameters.cpp
@@ -0,0 +1,116 @@
+
+#include "impl_org_ortc_RTCSrtpSdesKeyParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters::RTCSrtpSdesKeyParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSrtpSdesKeyParametersPtr wrapper::org::ortc::RTCSrtpSdesKeyParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters::~RTCSrtpSdesKeyParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters::wrapper_init_org_ortc_RTCSrtpSdesKeyParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters::wrapper_init_org_ortc_RTCSrtpSdesKeyParameters(wrapper::org::ortc::RTCSrtpSdesKeyParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters::wrapper_init_org_ortc_RTCSrtpSdesKeyParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCSrtpSdesKeyParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCSrtpSdesKeyParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->keyMethod = native.mKeyMethod;
+  pThis->keySalt = native.mKeySalt;
+  pThis->lifetime = native.mLifetime;
+  pThis->mkiValue = native.mMKIValue;
+  pThis->mkiLength = SafeInt<decltype(pThis->mkiLength)>(native.mMKILength);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mKeyMethod = wrapper->keyMethod;
+  result->mKeySalt = wrapper->keySalt;
+  result->mLifetime = wrapper->lifetime;
+  result->mMKIValue = wrapper->mkiValue;
+  result->mMKILength = SafeInt<decltype(result->mMKILength)>(wrapper->mkiLength);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesKeyParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesKeyParameters.h
new file mode 100644
index 00000000..77607933
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesKeyParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSrtpSdesKeyParameters.h"
+
+#include <ortc/ISRTPSDESTransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSrtpSdesKeyParameters : public wrapper::org::ortc::RTCSrtpSdesKeyParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISRTPSDESTransportTypes::KeyParameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCSrtpSdesKeyParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSrtpSdesKeyParameters, WrapperType);
+          RTCSrtpSdesKeyParametersWeakPtr thisWeak_;
+
+          RTCSrtpSdesKeyParameters();
+          virtual ~RTCSrtpSdesKeyParameters();
+
+          // methods RTCSrtpSdesKeyParameters
+          virtual void wrapper_init_org_ortc_RTCSrtpSdesKeyParameters() override;
+          virtual void wrapper_init_org_ortc_RTCSrtpSdesKeyParameters(wrapper::org::ortc::RTCSrtpSdesKeyParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCSrtpSdesKeyParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesParameters.cpp
new file mode 100644
index 00000000..34f405ef
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesParameters.cpp
@@ -0,0 +1,119 @@
+
+#include "impl_org_ortc_RTCSrtpSdesParameters.h"
+#include "impl_org_ortc_RTCSrtpSdesCryptoParameters.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpSdesParameters::RTCSrtpSdesParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSrtpSdesParametersPtr wrapper::org::ortc::RTCSrtpSdesParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSrtpSdesParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpSdesParameters::~RTCSrtpSdesParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesParameters::wrapper_init_org_ortc_RTCSrtpSdesParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesParameters::wrapper_init_org_ortc_RTCSrtpSdesParameters(wrapper::org::ortc::RTCSrtpSdesParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesParameters::wrapper_init_org_ortc_RTCSrtpSdesParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCSrtpSdesParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCSrtpSdesParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCSrtpSdesParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->cryptoParams = make_shared< list< wrapper::org::ortc::RTCSrtpSdesCryptoParametersPtr > >();
+  for (auto iter = native.mCryptoParams.begin(); iter != native.mCryptoParams.end(); ++iter) {
+    auto wrapper = RTCSrtpSdesCryptoParameters::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->cryptoParams->push_back(wrapper);
+  }
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  if (wrapper->cryptoParams) {
+    for (auto iter = wrapper->cryptoParams->begin(); iter != wrapper->cryptoParams->end(); ++iter) {
+      auto native = RTCSrtpSdesCryptoParameters::toNative(*iter);
+      if (!native) continue;
+      result->mCryptoParams.push_back(*native);
+    }
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesParameters.h b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesParameters.h
new file mode 100644
index 00000000..c61dc001
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesParameters.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSrtpSdesParameters.h"
+
+#include <ortc/ISRTPSDESTransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSrtpSdesParameters : public wrapper::org::ortc::RTCSrtpSdesParameters
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISRTPSDESTransport::Parameters, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCSrtpSdesParameters, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSrtpSdesParameters, WrapperType);
+          RTCSrtpSdesParametersWeakPtr thisWeak_;
+
+          RTCSrtpSdesParameters();
+          virtual ~RTCSrtpSdesParameters();
+
+          // methods RTCSrtpSdesParameters
+          virtual void wrapper_init_org_ortc_RTCSrtpSdesParameters() override;
+          virtual void wrapper_init_org_ortc_RTCSrtpSdesParameters(wrapper::org::ortc::RTCSrtpSdesParametersPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCSrtpSdesParameters(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+          static WrapperImplTypePtr toWrapper(const NativeType &native);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransport.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransport.cpp
new file mode 100644
index 00000000..a5b9aee2
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransport.cpp
@@ -0,0 +1,167 @@
+
+#include "impl_org_ortc_RTCSrtpSdesTransport.h"
+#include "impl_org_ortc_RTCIceTransport.h"
+#include "impl_org_ortc_RTCSrtpSdesParameters.h"
+#include "impl_org_ortc_RTCSrtpSdesCryptoParameters.h"
+#include "impl_org_ortc_ErrorEvent.h"
+#include "impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper); } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesTransport::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesTransport::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesTransport::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesTransport::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpSdesTransport::RTCSrtpSdesTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSrtpSdesTransportPtr wrapper::org::ortc::RTCSrtpSdesTransport::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSrtpSdesTransport>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpSdesTransport::~RTCSrtpSdesTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::RTCSrtpSdesTransport::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);  
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesTransport::wrapper_init_org_ortc_RTCSrtpSdesTransport(
+  wrapper::org::ortc::RTCIceTransportPtr iceTransport,
+  wrapper::org::ortc::RTCSrtpSdesCryptoParametersPtr encryptParameters,
+  wrapper::org::ortc::RTCSrtpSdesCryptoParametersPtr decryptParameters
+  )
+{
+  auto nativeEnc = RTCSrtpSdesCryptoParameters::toNative(encryptParameters);
+  auto nativeDec = RTCSrtpSdesCryptoParameters::toNative(decryptParameters);
+  ZS_THROW_INVALID_ARGUMENT_IF(!nativeEnc);
+  ZS_THROW_INVALID_ARGUMENT_IF(!nativeDec);
+
+  native_ = ISRTPSDESTransport::create(thisWeak_.lock(), RTCIceTransport::toNative(iceTransport), *nativeEnc, *nativeDec);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSrtpSdesParametersPtr wrapper::org::ortc::RTCSrtpSdesTransport::getLocalParameters()
+{
+  return wrapper::impl::org::ortc::RTCSrtpSdesParameters::toWrapper(NativeType::getLocalParameters());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesTransport::stop()
+{
+  native_->stop();
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCSrtpSdesTransport::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportPtr wrapper::impl::org::ortc::RTCSrtpSdesTransport::get_transport()
+{
+  return RTCIceTransport::toWrapper(native_->transport());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceTransportPtr wrapper::impl::org::ortc::RTCSrtpSdesTransport::get_rtcpTransport()
+{
+  return RTCIceTransport::toWrapper(native_->rtcpTransport());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpSdesTransport::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onSRTPSDESTransportLifetimeRemaining(
+  ISRTPSDESTransportPtr transport,
+  ULONG leastLifetimeRemainingPercentageForAllKeys,
+  ULONG overallLifetimeRemainingPercentage
+)
+{
+  onLifetimeRemaining(RTCSrtpSdesTransportLifetimeRemainingEvent::toWrapper(leastLifetimeRemainingPercentageForAllKeys, overallLifetimeRemainingPercentage));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onSRTPSDESTransportError(
+  ISRTPSDESTransportPtr transport,
+  ::ortc::ErrorAnyPtr error
+)
+{
+  onError(ErrorEvent::toWrapper(error));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransport.h b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransport.h
new file mode 100644
index 00000000..05e1e9c0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransport.h
@@ -0,0 +1,72 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSrtpSdesTransport.h"
+
+#include <ortc/ISRTPSDESTransport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSrtpSdesTransport : public wrapper::org::ortc::RTCSrtpSdesTransport,
+                                      public ::ortc::ISRTPSDESTransportDelegate
+        {
+          typedef unsigned long ULONG;
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISRTPSDESTransport, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISRTPSDESTransport, ISRTPSDESTransport);
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::ISRTPSDESTransportSubscription, NativeTypeSubscription);
+          ZS_DECLARE_TYPEDEF_PTR(RTCSrtpSdesTransport, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSrtpSdesTransport, WrapperType);
+          RTCSrtpSdesTransportWeakPtr thisWeak_;
+          NativeTypePtr native_;
+          zsLib::Lock lock_;
+          std::atomic<size_t> subscriptionCount_{};
+          bool defaultSubscription_{ true };
+          NativeTypeSubscriptionPtr subscription_;
+
+          RTCSrtpSdesTransport();
+          virtual ~RTCSrtpSdesTransport();
+
+          // methods RTCStatsProvider
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+          // methods RTCSrtpSdesTransport
+          virtual void wrapper_init_org_ortc_RTCSrtpSdesTransport(
+            wrapper::org::ortc::RTCIceTransportPtr iceTransport,
+            wrapper::org::ortc::RTCSrtpSdesCryptoParametersPtr encryptParameters,
+            wrapper::org::ortc::RTCSrtpSdesCryptoParametersPtr decryptParameters
+            ) override;
+          virtual void stop() override;
+
+          // properties RTCSrtpSdesTransport
+          virtual uint64_t get_objectId() override;
+          virtual wrapper::org::ortc::RTCIceTransportPtr get_transport() override;
+          virtual wrapper::org::ortc::RTCIceTransportPtr get_rtcpTransport() override;
+
+          virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+          virtual void onSRTPSDESTransportLifetimeRemaining(
+            ISRTPSDESTransportPtr transport,
+            ULONG leastLifetimeRemainingPercentageForAllKeys,
+            ULONG overallLifetimeRemainingPercentage
+          ) override;
+
+          virtual void onSRTPSDESTransportError(
+            ISRTPSDESTransportPtr transport,
+            ::ortc::ErrorAnyPtr error
+          ) override;
+
+          static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+          static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+          void subscribe();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp
new file mode 100644
index 00000000..9baefd5f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp
@@ -0,0 +1,66 @@
+
+#include "impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEvent::RTCSrtpSdesTransportLifetimeRemainingEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEventPtr wrapper::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEvent::~RTCSrtpSdesTransportLifetimeRemainingEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEvent::get_leastLifetimeRemainingPercentageForAllKeys()
+{
+  return leastLifetimeRemainingPercentageForAllKeys_;
+}
+
+//------------------------------------------------------------------------------
+unsigned long wrapper::impl::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEvent::get_overallLifetimeRemainingPercentage()
+{
+  return overallLifetimeRemainingPercentage_;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(
+  ULONG leastLifetimeRemainingPercentageForAllKeys,
+  ULONG overallLifetimeRemainingPercentage
+)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->leastLifetimeRemainingPercentageForAllKeys_ = leastLifetimeRemainingPercentageForAllKeys;
+  pThis->overallLifetimeRemainingPercentage_ = overallLifetimeRemainingPercentage;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h
new file mode 100644
index 00000000..f30f162e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h
@@ -0,0 +1,38 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h"
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSrtpSdesTransportLifetimeRemainingEvent : public wrapper::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEvent
+        {
+          typedef unsigned long ULONG;
+          ZS_DECLARE_TYPEDEF_PTR(RTCSrtpSdesTransportLifetimeRemainingEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSrtpSdesTransportLifetimeRemainingEvent, WrapperType);
+          RTCSrtpSdesTransportLifetimeRemainingEventWeakPtr thisWeak_;
+          unsigned long leastLifetimeRemainingPercentageForAllKeys_{};
+          unsigned long overallLifetimeRemainingPercentage_{};
+
+          RTCSrtpSdesTransportLifetimeRemainingEvent();
+          virtual ~RTCSrtpSdesTransportLifetimeRemainingEvent();
+
+          // properties RTCSrtpSdesTransportLifetimeRemainingEvent
+          virtual unsigned long get_leastLifetimeRemainingPercentageForAllKeys() override;
+          virtual unsigned long get_overallLifetimeRemainingPercentage() override;
+
+          static WrapperImplTypePtr toWrapper(
+            ULONG leastLifetimeRemainingPercentageForAllKeys,
+            ULONG overallLifetimeRemainingPercentage
+          );
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpTransportStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpTransportStats.cpp
new file mode 100644
index 00000000..f8e4f9a2
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpTransportStats.cpp
@@ -0,0 +1,119 @@
+
+#include "impl_org_ortc_RTCSrtpTransportStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpTransportStats::RTCSrtpTransportStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSrtpTransportStatsPtr wrapper::org::ortc::RTCSrtpTransportStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSrtpTransportStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpTransportStats::~RTCSrtpTransportStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCSrtpTransportStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCSrtpTransportStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCSrtpTransportStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCSrtpTransportStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCSrtpTransportStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCSrtpTransportStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCSrtpTransportStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpTransportStats::wrapper_init_org_ortc_RTCSrtpTransportStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpTransportStats::wrapper_init_org_ortc_RTCSrtpTransportStats(wrapper::org::ortc::RTCSrtpTransportStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCSrtpTransportStats();
+    return;
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCSrtpTransportStats::wrapper_init_org_ortc_RTCSrtpTransportStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpTransportStatsPtr wrapper::impl::org::ortc::RTCSrtpTransportStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCSrtpTransportStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSrtpTransportStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSrtpTransportStats::NativeStatsPtr wrapper::impl::org::ortc::RTCSrtpTransportStats::toNative(wrapper::org::ortc::RTCSrtpTransportStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCSrtpTransportStats>(wrapper)->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSrtpTransportStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpTransportStats.h
new file mode 100644
index 00000000..f01ccb77
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSrtpTransportStats.h
@@ -0,0 +1,46 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSrtpTransportStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSrtpTransportStats : public wrapper::org::ortc::RTCSrtpTransportStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::SRTPTransportStats, NativeStats);
+          RTCSrtpTransportStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCSrtpTransportStats();
+          virtual ~RTCSrtpTransportStats();
+
+          // methods RTCStats
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          // methods RTCSrtpTransportStats
+          virtual void wrapper_init_org_ortc_RTCSrtpTransportStats() override;
+          virtual void wrapper_init_org_ortc_RTCSrtpTransportStats(wrapper::org::ortc::RTCSrtpTransportStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCSrtpTransportStats(wrapper::org::ortc::JsonPtr json) override;
+
+          static RTCSrtpTransportStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCSrtpTransportStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSsrcConflictEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCSsrcConflictEvent.cpp
new file mode 100644
index 00000000..d92d6ae0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSsrcConflictEvent.cpp
@@ -0,0 +1,58 @@
+
+#include "impl_org_ortc_RTCSsrcConflictEvent.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSsrcConflictEvent::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSsrcConflictEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::RTCSsrcConflictEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSsrcConflictEvent::RTCSsrcConflictEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCSsrcConflictEventPtr wrapper::org::ortc::RTCSsrcConflictEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCSsrcConflictEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCSsrcConflictEvent::~RTCSsrcConflictEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+uint32_t wrapper::impl::org::ortc::RTCSsrcConflictEvent::get_ssrc()
+{
+  return native_;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeType native)
+{
+  if (!native) return WrapperImplTypePtr();
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCSsrcConflictEvent.h b/ortc/idl/wrapper/impl_org_ortc_RTCSsrcConflictEvent.h
new file mode 100644
index 00000000..6e2f4735
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCSsrcConflictEvent.h
@@ -0,0 +1,35 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCSsrcConflictEvent.h"
+
+#include <ortc/IRTPTypes.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCSsrcConflictEvent : public wrapper::org::ortc::RTCSsrcConflictEvent
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IRTPTypes::SSRCType, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(RTCSsrcConflictEvent, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::RTCSsrcConflictEvent, WrapperType);
+          RTCSsrcConflictEventWeakPtr thisWeak_;
+          NativeType native_;
+
+          RTCSsrcConflictEvent();
+          virtual ~RTCSsrcConflictEvent();
+
+          // properties RTCSsrcConflictEvent
+          virtual uint32_t get_ssrc() override;
+
+          static WrapperImplTypePtr toWrapper(NativeType native);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCStats.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCStats.cpp
new file mode 100644
index 00000000..49c95168
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCStats.cpp
@@ -0,0 +1,117 @@
+
+#include "impl_org_ortc_RTCStats.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStats::RTCStats()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCStatsPtr wrapper::org::ortc::RTCStats::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCStats>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStats::~RTCStats()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCStats::wrapper_init_org_ortc_RTCStats()
+{
+  native_ = make_shared<NativeStats>();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCStats::wrapper_init_org_ortc_RTCStats(wrapper::org::ortc::RTCStatsPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_RTCStats();
+    return; 
+  }
+  native_ = NativeStats::create(*toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCStats::wrapper_init_org_ortc_RTCStats(wrapper::org::ortc::JsonPtr json)
+{
+  native_ = NativeStats::create(Json::toNative(json));
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::RTCStats::toJson()
+{
+  return Json::toWrapper(native_->createElement("RTCStats"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCStats::hash()
+{
+  return native_->hash();
+}
+
+//------------------------------------------------------------------------------
+::zsLib::Time wrapper::impl::org::ortc::RTCStats::get_timestamp()
+{
+  return native_->mTimestamp;
+}
+
+//------------------------------------------------------------------------------
+Optional< wrapper::org::ortc::RTCStatsType > wrapper::impl::org::ortc::RTCStats::get_statsType()
+{
+  if (!native_->mStatsType.hasValue()) return Optional< wrapper::org::ortc::RTCStatsType >();
+  return Helper::toWrapper(native_->mStatsType.value());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCStats::get_statsTypeOther()
+{
+  return native_->mStatsTypeOther;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::RTCStats::get_id()
+{
+  return native_->mID;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsPtr wrapper::impl::org::ortc::RTCStats::toWrapper(NativeStatsPtr native)
+{
+  if (!native) return RTCStatsPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCStats>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStats::NativeStatsPtr wrapper::impl::org::ortc::RTCStats::toNative(wrapper::org::ortc::RTCStatsPtr wrapper)
+{
+  if (!wrapper) return NativeStatsPtr();
+  return std::dynamic_pointer_cast<RTCStats>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCStats.h b/ortc/idl/wrapper/impl_org_ortc_RTCStats.h
new file mode 100644
index 00000000..df33bd94
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCStats.h
@@ -0,0 +1,45 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCStats.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCStats : public wrapper::org::ortc::RTCStats
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::Stats, NativeStats);
+
+          RTCStatsWeakPtr thisWeak_;
+          NativeStatsPtr native_;
+
+          RTCStats();
+          virtual ~RTCStats();
+
+          // methods RTCStats
+          virtual void wrapper_init_org_ortc_RTCStats() override;
+          virtual void wrapper_init_org_ortc_RTCStats(wrapper::org::ortc::RTCStatsPtr source) override;
+          virtual void wrapper_init_org_ortc_RTCStats(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          // properties RTCStats
+          virtual ::zsLib::Time get_timestamp() override;
+          virtual Optional< wrapper::org::ortc::RTCStatsType > get_statsType() override;
+          virtual String get_statsTypeOther() override;
+          virtual String get_id() override;
+
+          static RTCStatsPtr toWrapper(NativeStatsPtr native);
+          static NativeStatsPtr toNative(wrapper::org::ortc::RTCStatsPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCStatsProvider.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCStatsProvider.cpp
new file mode 100644
index 00000000..6ecfc33e
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCStatsProvider.cpp
@@ -0,0 +1,63 @@
+
+#include "impl_org_ortc_RTCStatsProvider.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsProvider::RTCStatsProvider()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCStatsProviderPtr wrapper::org::ortc::RTCStatsProvider::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCStatsProvider>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsProvider::~RTCStatsProvider()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::RTCStatsProvider::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsProviderPtr wrapper::impl::org::ortc::RTCStatsProvider::toWrapper(NativeTypePtr native)
+{
+  if (!native) return RTCStatsProviderPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCStatsProvider>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsProvider::NativeTypePtr wrapper::impl::org::ortc::RTCStatsProvider::toNative(wrapper::org::ortc::RTCStatsProviderPtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  return std::dynamic_pointer_cast<RTCStatsProvider>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCStatsProvider.h b/ortc/idl/wrapper/impl_org_ortc_RTCStatsProvider.h
new file mode 100644
index 00000000..040e4da3
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCStatsProvider.h
@@ -0,0 +1,34 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCStatsProvider.h"
+
+#include <ortc/IStatsProvider.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCStatsProvider : public wrapper::org::ortc::RTCStatsProvider
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsProvider, NativeType);
+          RTCStatsProviderWeakPtr thisWeak_;
+          NativeTypePtr native_;
+
+          RTCStatsProvider();
+          virtual ~RTCStatsProvider();
+
+          // methods RTCStatsProvider
+          virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+          static RTCStatsProviderPtr toWrapper(NativeTypePtr native);
+          static NativeTypePtr toNative(wrapper::org::ortc::RTCStatsProviderPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCStatsReport.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCStatsReport.cpp
new file mode 100644
index 00000000..de200cf1
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCStatsReport.cpp
@@ -0,0 +1,67 @@
+
+#include "impl_org_ortc_RTCStatsReport.h"
+#include "impl_org_ortc_RTCStats.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsReport::RTCStatsReport()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCStatsReportPtr wrapper::org::ortc::RTCStatsReport::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCStatsReport>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsReport::~RTCStatsReport()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCStatsPtr wrapper::impl::org::ortc::RTCStatsReport::getStats(String id)
+{
+  return RTCStats::toWrapper(native_->getStats(id));
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::RTCStatsReport::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< String > > wrapper::impl::org::ortc::RTCStatsReport::get_statsIds()
+{
+  return native_->getStatesIDs();
+}
+
+wrapper::impl::org::ortc::RTCStatsReportPtr wrapper::impl::org::ortc::RTCStatsReport::toWrapper(::ortc::IStatsReportPtr native)
+{
+  if (!native) return RTCStatsReportPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCStatsReport>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCStatsReport.h b/ortc/idl/wrapper/impl_org_ortc_RTCStatsReport.h
new file mode 100644
index 00000000..833a9227
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCStatsReport.h
@@ -0,0 +1,38 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCStatsReport.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCStatsReport : public wrapper::org::ortc::RTCStatsReport
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReport, NativeStatsReport);
+
+          RTCStatsReportWeakPtr thisWeak_;
+          NativeStatsReportPtr native_;
+
+          RTCStatsReport();
+          virtual ~RTCStatsReport();
+
+          // methods RTCStatsReport
+          virtual wrapper::org::ortc::RTCStatsPtr getStats(String id) override;
+
+          // properties RTCStatsReport
+          virtual uint64_t get_objectId() override;
+          virtual shared_ptr< list< String > > get_statsIds() override;
+
+          static RTCStatsReportPtr toWrapper(NativeStatsReportPtr native);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCStatsTypeSet.cpp b/ortc/idl/wrapper/impl_org_ortc_RTCStatsTypeSet.cpp
new file mode 100644
index 00000000..707de154
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCStatsTypeSet.cpp
@@ -0,0 +1,80 @@
+
+#include "impl_org_ortc_RTCStatsTypeSet.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsTypeSet::RTCStatsTypeSet()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCStatsTypeSetPtr wrapper::org::ortc::RTCStatsTypeSet::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCStatsTypeSet>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = make_shared<wrapper::impl::org::ortc::RTCStatsTypeSet::NativeStatsTypeSet>();
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsTypeSet::~RTCStatsTypeSet()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCStatsTypeSet::wrapper_init_org_ortc_RTCStatsTypeSet()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::RTCStatsTypeSet::wrapper_init_org_ortc_RTCStatsTypeSet(shared_ptr< set< wrapper::org::ortc::RTCStatsType > > values)
+{
+  if (!values) return;
+  for (auto iter = values->begin(); iter != values->end(); ++iter)
+  {
+    auto native = Helper::toNative(*iter);
+    native_->insert(native);
+  }
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::RTCStatsTypeSet::hasStatType(wrapper::org::ortc::RTCStatsType type)
+{
+  return native_->hasStatType(Helper::toNative(type));
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsTypeSetPtr wrapper::impl::org::ortc::RTCStatsTypeSet::toWrapper(NativeStatsTypeSetPtr native)
+{
+  if (!native) return RTCStatsTypeSetPtr();
+
+  auto pThis = make_shared<wrapper::impl::org::ortc::RTCStatsTypeSet>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::RTCStatsTypeSet::NativeStatsTypeSetPtr wrapper::impl::org::ortc::RTCStatsTypeSet::toNative(wrapper::org::ortc::RTCStatsTypeSetPtr wrapper)
+{
+  if (!wrapper) return NativeStatsTypeSetPtr();
+  return std::dynamic_pointer_cast<wrapper::impl::org::ortc::RTCStatsTypeSet>(wrapper)->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_RTCStatsTypeSet.h b/ortc/idl/wrapper/impl_org_ortc_RTCStatsTypeSet.h
new file mode 100644
index 00000000..4e3c1390
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_RTCStatsTypeSet.h
@@ -0,0 +1,36 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_RTCStatsTypeSet.h"
+
+#include <ortc/IStatsReport.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct RTCStatsTypeSet : public wrapper::org::ortc::RTCStatsTypeSet
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IStatsReportTypes::StatsTypeSet, NativeStatsTypeSet);
+          RTCStatsTypeSetWeakPtr thisWeak_;
+          NativeStatsTypeSetPtr native_;
+
+          RTCStatsTypeSet();
+          virtual ~RTCStatsTypeSet();
+
+          // methods RTCStatsTypeSet
+          virtual void wrapper_init_org_ortc_RTCStatsTypeSet() override;
+          virtual void wrapper_init_org_ortc_RTCStatsTypeSet(shared_ptr< set< wrapper::org::ortc::RTCStatsType > > values) override;
+          virtual bool hasStatType(wrapper::org::ortc::RTCStatsType type) override;
+
+          static RTCStatsTypeSetPtr toWrapper(NativeStatsTypeSetPtr native);
+          static NativeStatsTypeSetPtr toNative(wrapper::org::ortc::RTCStatsTypeSetPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_Settings.cpp b/ortc/idl/wrapper/impl_org_ortc_Settings.cpp
new file mode 100644
index 00000000..c06ab07d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Settings.cpp
@@ -0,0 +1,115 @@
+
+#include "impl_org_ortc_Settings.h"
+#include "impl_org_ortc_Json.h"
+
+#include <zsLib/IHelper.h>
+#include <zsLib/SafeInt.h>
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::Settings::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::Settings::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::Settings::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::Settings::~Settings()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Settings::applyDefaults()
+{
+  NativeType::applyDefaults();
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::org::ortc::Settings::apply(wrapper::org::ortc::JsonPtr jsonSettings)
+{
+  return NativeType::apply(zsLib::IHelper::toString(wrapper::impl::org::ortc::Json::toNative(jsonSettings)));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Settings::setString(
+  String key,
+  String value
+  )
+{
+  NativeType::setString(key, value);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Settings::setInt(
+  String key,
+  int64_t value
+  )
+{
+  typedef unsigned long LONG;
+  NativeType::setInt(key, SafeInt<LONG>(value));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Settings::setUInt(
+  String key,
+  uint64_t value
+  )
+{
+  typedef unsigned long ULONG;
+  NativeType::setUInt(key, SafeInt<ULONG>(value));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Settings::setBool(
+  String key,
+  bool value
+  )
+{
+  NativeType::setBool(key, value);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Settings::setFloat(
+  String key,
+  float value
+  )
+{
+  NativeType::setFloat(key, value);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Settings::setDouble(
+  String key,
+  double value
+  )
+{
+  NativeType::setDouble(key, value);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Settings::clear(String key)
+{
+  NativeType::clear(key);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::org::ortc::Settings::clearAll()
+{
+  NativeType::clearAll();
+}
+
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_Settings.h b/ortc/idl/wrapper/impl_org_ortc_Settings.h
new file mode 100644
index 00000000..9e8054b7
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_Settings.h
@@ -0,0 +1,27 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_Settings.h"
+
+#include <zsLib/ISettings.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct Settings : public wrapper::org::ortc::Settings
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::zsLib::ISettings, NativeType);
+          ZS_DECLARE_TYPEDEF_PTR(OrtcLib, WrapperImplType);
+          ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::OrtcLib, WrapperType);
+
+          virtual ~Settings();
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_StringOrStringList.cpp b/ortc/idl/wrapper/impl_org_ortc_StringOrStringList.cpp
new file mode 100644
index 00000000..39a9a1b1
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_StringOrStringList.cpp
@@ -0,0 +1,115 @@
+
+#include "impl_org_ortc_StringOrStringList.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::StringOrStringList::StringOrStringList()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::StringOrStringListPtr wrapper::org::ortc::StringOrStringList::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::StringOrStringList>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::StringOrStringList::~StringOrStringList()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::StringOrStringList::wrapper_init_org_ortc_StringOrStringList()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::StringOrStringList::wrapper_init_org_ortc_StringOrStringList(wrapper::org::ortc::StringOrStringListPtr source)
+{
+  if (!source) return;
+  wrapper::org::ortc::StringOrStringListPtr pThis = thisWeak_.lock();
+  (*pThis) = (*source);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::StringOrStringList::wrapper_init_org_ortc_StringOrStringList(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  auto native = make_shared<NativeStringOrStringList>(Json::toNative(json));
+
+  wrapper::org::ortc::StringOrStringListPtr pThis = thisWeak_.lock();
+  wrapper::org::ortc::StringOrStringListPtr wrapper = toWrapper(native);
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::StringOrStringList::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("StringOrStringList"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::StringOrStringList::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::StringOrStringListPtr wrapper::impl::org::ortc::StringOrStringList::toWrapper(NativeStringOrStringListPtr native)
+{
+  if (!native) return StringOrStringListPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::StringOrStringListPtr wrapper::impl::org::ortc::StringOrStringList::toWrapper(const NativeStringOrStringList &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::StringOrStringList>();
+  pThis->thisWeak_ = pThis;
+
+  pThis->value = native.mValue;
+  if (native.mValues.hasValue()) {
+    pThis->values = make_shared< list<String> >(native.mValues.value());
+  }
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::StringOrStringList::NativeStringOrStringListPtr wrapper::impl::org::ortc::StringOrStringList::toNative(wrapper::org::ortc::StringOrStringListPtr wrapper)
+{
+  if (!wrapper) return NativeStringOrStringListPtr();
+
+  auto result = make_shared<NativeStringOrStringList>();
+
+  result->mValue = wrapper->value;
+  if (wrapper->values.hasValue()) {
+    if (wrapper->values.value()) {
+      result->mValues = *(wrapper->values.value());
+    }
+  }
+
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_StringOrStringList.h b/ortc/idl/wrapper/impl_org_ortc_StringOrStringList.h
new file mode 100644
index 00000000..1fb3cdfe
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_StringOrStringList.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_StringOrStringList.h"
+
+#include <ortc/IConstraints.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+
+        struct StringOrStringList : public wrapper::org::ortc::StringOrStringList
+        {
+          ZS_DECLARE_TYPEDEF_PTR(::ortc::IConstraints::StringOrStringList, NativeStringOrStringList);
+
+          StringOrStringListWeakPtr thisWeak_;
+
+          StringOrStringList();
+          virtual ~StringOrStringList();
+
+          // methods StringOrStringList
+          virtual void wrapper_init_org_ortc_StringOrStringList() override;
+          virtual void wrapper_init_org_ortc_StringOrStringList(wrapper::org::ortc::StringOrStringListPtr source) override;
+          virtual void wrapper_init_org_ortc_StringOrStringList(wrapper::org::ortc::JsonPtr json) override;
+          virtual wrapper::org::ortc::JsonPtr toJson() override;
+          virtual String hash() override;
+
+          static StringOrStringListPtr toWrapper(NativeStringOrStringListPtr native);
+          static StringOrStringListPtr toWrapper(const NativeStringOrStringList &native);
+          static NativeStringOrStringListPtr toNative(wrapper::org::ortc::StringOrStringListPtr wrapper);
+        };
+
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_MediaStream.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_MediaStream.cpp
new file mode 100644
index 00000000..61dfc6da
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_MediaStream.cpp
@@ -0,0 +1,216 @@
+
+#include "impl_org_ortc_adapter_MediaStream.h"
+#include "impl_org_ortc_MediaStreamTrack.h"
+#include "impl_org_ortc_RTCStatsTypeSet.h"
+#include "impl_org_ortc_RTCStatsReport.h"
+
+#include "impl_org_ortc_Helper.h"
+
+#include <zsLib/Log.h>
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper_adapter); } } } } }
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::MediaStream::MediaStream()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::MediaStreamPtr wrapper::org::ortc::adapter::MediaStream::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::MediaStream>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::MediaStream::~MediaStream()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::adapter::MediaStream::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::MediaStream::wrapper_init_org_ortc_adapter_MediaStream()
+{
+  native_ = IMediaStream::create(thisWeak_.lock());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::MediaStream::wrapper_init_org_ortc_adapter_MediaStream(wrapper::org::ortc::adapter::MediaStreamPtr source)
+{
+  if (!source) {
+    wrapper_init_org_ortc_adapter_MediaStream();
+    return;
+  }
+  native_ = IMediaStream::create(thisWeak_.lock(), toNative(source));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::MediaStream::wrapper_init_org_ortc_adapter_MediaStream(shared_ptr< list< wrapper::org::ortc::MediaStreamTrackPtr > > tracks)
+{
+  if (!tracks) {
+    wrapper_init_org_ortc_adapter_MediaStream();
+    return;
+  }
+
+  native_ = IMediaStream::create(thisWeak_.lock(), *Helper::toNative(tracks));
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaStreamTrackPtr wrapper::impl::org::ortc::adapter::MediaStream::getTrackById(String id)
+{
+  if (!native_) return MediaStreamTrackPtr();
+
+  auto result = native_->getTrackByID(id);
+  if (!result) return MediaStreamTrackPtr();
+
+  return wrapper::impl::org::ortc::MediaStreamTrack::toWrapper(result);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::MediaStream::addTrack(wrapper::org::ortc::MediaStreamTrackPtr track)
+{
+  if (!track) return;
+  native_->addTrack(wrapper::impl::org::ortc::MediaStreamTrack::toNative(track));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::MediaStream::removeTrack(wrapper::org::ortc::MediaStreamTrackPtr track)
+{
+  if (!track) return;
+  native_->removeTrack(wrapper::impl::org::ortc::MediaStreamTrack::toNative(track));
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::MediaStreamPtr wrapper::impl::org::ortc::adapter::MediaStream::clone()
+{
+  return toWrapper(native_->clone());
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::adapter::MediaStream::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::MediaStream::get_id()
+{
+  return native_->id();
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::adapter::MediaStream::get_active()
+{
+  return native_->active();
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::MediaStreamTrackPtr > > wrapper::impl::org::ortc::adapter::MediaStream::get_tracks()
+{
+  return Helper::toWrapper(native_->getTracks());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::MediaStreamTrackPtr > > wrapper::impl::org::ortc::adapter::MediaStream::get_audioTracks()
+{
+  return Helper::toWrapper(native_->getAudioTracks());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::MediaStreamTrackPtr > > wrapper::impl::org::ortc::adapter::MediaStream::get_videoTracks()
+{
+  return Helper::toWrapper(native_->getVideoTracks());
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::adapter::MediaStream::get_count()
+{
+  return native_->size();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::MediaStream::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::MediaStream::onMediaStreamAddTrack(
+                                                                           IMediaStreamPtr stream,
+                                                                           IMediaStreamTrackPtr track
+                                                                           )
+{
+  onAddTrack(wrapper::impl::org::ortc::MediaStreamTrack::toWrapper(track));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::MediaStream::onMediaStreamRemoveTrack(
+                                                                              IMediaStreamPtr stream,
+                                                                              IMediaStreamTrackPtr track
+                                                                              )
+{
+  onRemoveTrack(wrapper::impl::org::ortc::MediaStreamTrack::toWrapper(track));
+}
+
+//------------------------------------------------------------------------------
+::wrapper::impl::org::ortc::adapter::MediaStreamPtr wrapper::impl::org::ortc::adapter::MediaStream::toWrapper(IMediaStreamPtr native)
+{
+  if (!native) return MediaStreamPtr();
+
+  auto result = make_shared<MediaStream>();
+  result->thisWeak_ = result;
+  result->defaultSubscription_ = false;
+  result->native_ = native;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+::ortc::adapter::IMediaStreamPtr wrapper::impl::org::ortc::adapter::MediaStream::toNative(::wrapper::org::ortc::adapter::MediaStreamPtr wrapper)
+{
+  if (!wrapper) return IMediaStreamPtr();
+  auto result = std::dynamic_pointer_cast<wrapper::impl::org::ortc::adapter::MediaStream>(wrapper);
+  if (!result) return IMediaStreamPtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::MediaStream::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_MediaStream.h b/ortc/idl/wrapper/impl_org_ortc_adapter_MediaStream.h
new file mode 100644
index 00000000..983a4f85
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_MediaStream.h
@@ -0,0 +1,78 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_MediaStream.h"
+
+#include <ortc/adapter/IMediaStream.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct MediaStream : public wrapper::org::ortc::adapter::MediaStream,
+                               public ::ortc::adapter::IMediaStreamDelegate
+          {
+            MediaStreamWeakPtr thisWeak_;
+
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IMediaStream, IMediaStream);
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::IMediaStreamTrack, IMediaStreamTrack);
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IMediaStreamDelegate, IMediaStreamDelegate);
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IMediaStreamSubscription, IMediaStreamSubscription);
+
+            IMediaStreamPtr native_;
+            zsLib::Lock lock_;
+            std::atomic<size_t> subscriptionCount_ {};
+            bool defaultSubscription_ {true};
+            IMediaStreamSubscriptionPtr subscription_;
+
+            MediaStream();
+            virtual ~MediaStream();
+
+            // methods RTCStatsProvider
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+            // methods MediaStream
+            virtual void wrapper_init_org_ortc_adapter_MediaStream() override;
+            virtual void wrapper_init_org_ortc_adapter_MediaStream(wrapper::org::ortc::adapter::MediaStreamPtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_MediaStream(shared_ptr< list< wrapper::org::ortc::MediaStreamTrackPtr > > tracks) override;
+            virtual wrapper::org::ortc::MediaStreamTrackPtr getTrackById(String id) override;
+            virtual void addTrack(wrapper::org::ortc::MediaStreamTrackPtr track) override;
+            virtual void removeTrack(wrapper::org::ortc::MediaStreamTrackPtr track) override;
+            virtual wrapper::org::ortc::adapter::MediaStreamPtr clone() override;
+
+            // properties MediaStream
+            virtual uint64_t get_objectId() override;
+            virtual String get_id() override;
+            virtual bool get_active() override;
+            virtual shared_ptr< list< wrapper::org::ortc::MediaStreamTrackPtr > > get_tracks() override;
+            virtual shared_ptr< list< wrapper::org::ortc::MediaStreamTrackPtr > > get_audioTracks() override;
+            virtual shared_ptr< list< wrapper::org::ortc::MediaStreamTrackPtr > > get_videoTracks() override;
+            virtual uint64_t get_count() override;
+
+            virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+            virtual void onMediaStreamAddTrack(
+                                               IMediaStreamPtr stream,
+                                               IMediaStreamTrackPtr track
+                                               ) override;
+            virtual void onMediaStreamRemoveTrack(
+                                                  IMediaStreamPtr stream,
+                                                  IMediaStreamTrackPtr track
+                                                  ) override;
+
+
+            static ::wrapper::impl::org::ortc::adapter::MediaStreamPtr toWrapper(IMediaStreamPtr native);
+            static IMediaStreamPtr toNative(::wrapper::org::ortc::adapter::MediaStreamPtr wrapper);
+
+            void subscribe();
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCAnswerOptions.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCAnswerOptions.cpp
new file mode 100644
index 00000000..1aaaec48
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCAnswerOptions.cpp
@@ -0,0 +1,68 @@
+
+#include "impl_org_ortc_adapter_RTCAnswerOptions.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCAnswerOptions::RTCAnswerOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCAnswerOptionsPtr wrapper::org::ortc::adapter::RTCAnswerOptions::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCAnswerOptions>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCAnswerOptions::~RTCAnswerOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCAnswerOptions::wrapper_init_org_ortc_adapter_RTCAnswerOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCAnswerOptions::WrapperImplTypePtr wrapper::impl::org::ortc::adapter::RTCAnswerOptions::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCAnswerOptions::WrapperImplTypePtr wrapper::impl::org::ortc::adapter::RTCAnswerOptions::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->voiceActivityDetection = native.mVoiceActivityDetection;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCAnswerOptions::NativeTypePtr wrapper::impl::org::ortc::adapter::RTCAnswerOptions::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = make_shared < NativeType >();
+  result->mVoiceActivityDetection = wrapper->voiceActivityDetection;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCAnswerOptions.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCAnswerOptions.h
new file mode 100644
index 00000000..a6a74f44
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCAnswerOptions.h
@@ -0,0 +1,36 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCAnswerOptions.h"
+
+#include <ortc/adapter/IPeerConnection.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCAnswerOptions : public wrapper::org::ortc::adapter::RTCAnswerOptions
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnectionTypes::AnswerOptions, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCAnswerOptions, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCAnswerOptions, WrapperType);
+            RTCAnswerOptionsWeakPtr thisWeak_;
+
+            RTCAnswerOptions();
+            virtual ~RTCAnswerOptions();
+            virtual void wrapper_init_org_ortc_adapter_RTCAnswerOptions() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCCapabilityOptions.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCCapabilityOptions.cpp
new file mode 100644
index 00000000..b1853629
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCCapabilityOptions.cpp
@@ -0,0 +1,74 @@
+
+#include "impl_org_ortc_adapter_RTCCapabilityOptions.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCCapabilityOptions::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCCapabilityOptions::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCCapabilityOptions::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCCapabilityOptions::RTCCapabilityOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCCapabilityOptionsPtr wrapper::org::ortc::adapter::RTCCapabilityOptions::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCCapabilityOptions>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCCapabilityOptions::~RTCCapabilityOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCCapabilityOptions::wrapper_init_org_ortc_adapter_RTCCapabilityOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->voiceActivityDetection = native.mVoiceActivityDetection;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = make_shared < NativeType >();
+  result->mVoiceActivityDetection = wrapper->voiceActivityDetection;
+  return result;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCCapabilityOptions.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCCapabilityOptions.h
new file mode 100644
index 00000000..36c5a1f0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCCapabilityOptions.h
@@ -0,0 +1,36 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCCapabilityOptions.h"
+
+#include <ortc/adapter/IPeerConnection.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCCapabilityOptions : public wrapper::org::ortc::adapter::RTCCapabilityOptions
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnectionTypes::CapabilityOptions, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCCapabilityOptions, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCCapabilityOptions, WrapperType);
+            RTCCapabilityOptionsWeakPtr thisWeak_;
+
+            RTCCapabilityOptions();
+            virtual ~RTCCapabilityOptions();
+            virtual void wrapper_init_org_ortc_adapter_RTCCapabilityOptions() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCConfiguration.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCConfiguration.cpp
new file mode 100644
index 00000000..de1137fb
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCConfiguration.cpp
@@ -0,0 +1,105 @@
+
+#include "impl_org_ortc_adapter_RTCConfiguration.h"
+#include "impl_org_ortc_RTCIceGatherOptions.h"
+#include "impl_org_ortc_RTCCertificate.h"
+#include "impl_org_ortc_Helper.h"
+
+#include <zsLib/SafeInt.h>
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCConfiguration::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCConfiguration::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCConfiguration::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCConfiguration::RTCConfiguration()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCConfigurationPtr wrapper::org::ortc::adapter::RTCConfiguration::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCConfiguration>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCConfiguration::~RTCConfiguration()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCConfiguration::wrapper_init_org_ortc_adapter_RTCConfiguration()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCConfiguration::wrapper_init_org_ortc_adapter_RTCConfiguration(wrapper::org::ortc::adapter::RTCConfigurationPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return RTCConfigurationPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->gatherOptions = RTCIceGatherOptions::toWrapper(native.mGatherOptions);
+  pThis->signalingMode = Helper::toWrapper(native.mSignalingMode);
+  pThis->negotiateSrtpSdes = native.mNegotiateSRTPSDES;
+  pThis->bundlePolicy = Helper::toWrapper(native.mBundlePolicy);
+  pThis->rtcpMuxPolicy = Helper::toWrapper(native.mRTCPMuxPolicy);
+  pThis->certificates = make_shared< list< wrapper::org::ortc::RTCCertificatePtr> >();
+  for (auto iter = native.mCertificates.begin(); iter != native.mCertificates.end(); ++iter) {
+    pThis->certificates->push_back(RTCCertificate::toWrapper(*iter));
+  }
+  pThis->iceCandidatePoolSize = native.mICECandidatePoolSize;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = make_shared < NativeType >();
+  result->mGatherOptions = RTCIceGatherOptions::toNative(wrapper->gatherOptions);
+  result->mSignalingMode = Helper::toNative(wrapper->signalingMode);
+  result->mNegotiateSRTPSDES = wrapper->negotiateSrtpSdes;
+  result->mBundlePolicy = Helper::toNative(wrapper->bundlePolicy);
+  result->mRTCPMuxPolicy = Helper::toNative(wrapper->rtcpMuxPolicy);
+  if (wrapper->certificates) {
+    for (auto iter = wrapper->certificates->begin(); iter != wrapper->certificates->end(); ++iter) {
+      result->mCertificates.push_back(RTCCertificate::toNative(*iter));
+    }
+  }
+  result->mICECandidatePoolSize = SafeInt<decltype(result->mICECandidatePoolSize)>(wrapper->iceCandidatePoolSize);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCConfiguration.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCConfiguration.h
new file mode 100644
index 00000000..c2376b16
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCConfiguration.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCConfiguration.h"
+
+#include <ortc/adapter/IPeerConnection.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCConfiguration : public wrapper::org::ortc::adapter::RTCConfiguration
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnectionTypes::Configuration, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCConfiguration, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCConfiguration, WrapperType);
+            RTCConfigurationWeakPtr thisWeak_;
+
+            RTCConfiguration();
+            virtual ~RTCConfiguration();
+
+            // methods RTCConfiguration
+            virtual void wrapper_init_org_ortc_adapter_RTCConfiguration() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCConfiguration(wrapper::org::ortc::adapter::RTCConfigurationPtr source) override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCIceCandidate.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCIceCandidate.cpp
new file mode 100644
index 00000000..a1b122fd
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCIceCandidate.cpp
@@ -0,0 +1,184 @@
+
+#include "impl_org_ortc_adapter_RTCIceCandidate.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+#include "impl_org_ortc_RTCIceCandidate.h"
+#include "impl_org_ortc_RTCIceCandidateComplete.h"
+
+#include <zsLib/SafeInt.h>
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCIceCandidate::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCIceCandidate::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCIceCandidate::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCIceCandidate::RTCIceCandidate()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCIceCandidatePtr wrapper::org::ortc::adapter::RTCIceCandidate::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCIceCandidate>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCIceCandidate::~RTCIceCandidate()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCIceCandidate::wrapper_init_org_ortc_adapter_RTCIceCandidate()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCIceCandidate::wrapper_init_org_ortc_adapter_RTCIceCandidate(wrapper::org::ortc::adapter::RTCIceCandidatePtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCIceCandidate::wrapper_init_org_ortc_adapter_RTCIceCandidate(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr wrapper = toWrapper(NativeType::createFromJSON(Json::toNative(json)));  
+  WrapperTypePtr pThis = thisWeak_.lock();
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCIceCandidatePtr wrapper::org::ortc::adapter::RTCIceCandidate::fromSdpStringWithMLineIndex(
+  String sdp,
+  uint64_t mlineIndex
+  )
+{
+  auto native = NativeType::createFromSDP(sdp);
+  native->mMLineIndex = SafeInt<decltype(native->mMLineIndex)::UseType>(mlineIndex);
+
+  return WrapperImplType::toWrapper(native);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCIceCandidatePtr wrapper::org::ortc::adapter::RTCIceCandidate::fromSdpStringWithMid(
+  String sdp,
+  String mid
+  )
+{
+  auto native = NativeType::createFromSDP(sdp);
+  native->mMid = mid;
+
+  return WrapperImplType::toWrapper(native);
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCIceCandidate::toSdp()
+{
+  return toNative(thisWeak_.lock())->toSDP();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCIceCandidate::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->toJSON());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCIceCandidate::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCIceCandidate::get_sdpMid()
+{
+  return mid;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCIceCandidate::set_sdpMid(String value)
+{
+  mid = value;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->mid = native.mMid;
+  Helper::optionalSafeIntConvert(native.mMLineIndex, pThis->sdpMLineIndex);
+  if (native.mCandidate) {
+    {
+      auto nativeCandidate = std::dynamic_pointer_cast<::ortc::IICETypes::Candidate>(native.mCandidate);
+      if (nativeCandidate) {
+        pThis->candidate = impl::org::ortc::RTCIceCandidate::toWrapper(nativeCandidate);
+      }
+    }
+    {
+      auto nativeCandidate = std::dynamic_pointer_cast<::ortc::IICETypes::CandidateComplete>(native.mCandidate);
+      if (nativeCandidate) {
+        pThis->candidate = impl::org::ortc::RTCIceCandidateComplete::toWrapper(nativeCandidate);
+      }
+    }
+  }
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mMid = wrapper->mid;
+  Helper::optionalSafeIntConvert(wrapper->sdpMLineIndex, result->mMLineIndex);
+  if (wrapper->candidate) {
+    {
+      auto nativeCandidate = impl::org::ortc::RTCIceCandidate::toNative(wrapper->candidate);
+      if (nativeCandidate) {
+        result->mCandidate = nativeCandidate;
+      }
+    }
+    {
+      auto nativeCandidate = impl::org::ortc::RTCIceCandidateComplete::toNative(wrapper->candidate);
+      if (nativeCandidate) {
+        result->mCandidate = nativeCandidate;
+      }
+    }
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCIceCandidate.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCIceCandidate.h
new file mode 100644
index 00000000..a4dddddb
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCIceCandidate.h
@@ -0,0 +1,47 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCIceCandidate.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCIceCandidate : public wrapper::org::ortc::adapter::RTCIceCandidate
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::ICECandidate, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCIceCandidate, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCIceCandidate, WrapperType);
+            RTCIceCandidateWeakPtr thisWeak_;
+
+            RTCIceCandidate();
+            virtual ~RTCIceCandidate();
+
+            // methods RTCIceCandidate
+            virtual void wrapper_init_org_ortc_adapter_RTCIceCandidate() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCIceCandidate(wrapper::org::ortc::adapter::RTCIceCandidatePtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCIceCandidate(wrapper::org::ortc::JsonPtr json) override;
+            virtual String toSdp() override;
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            // properties RTCIceCandidate
+            virtual String get_sdpMid() override;
+            virtual void set_sdpMid(String value) override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp
new file mode 100644
index 00000000..77f17548
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp
@@ -0,0 +1,88 @@
+
+#include "impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h"
+#include "impl_org_ortc_RTCRtpCapabilities.h"
+#include "impl_org_ortc_RTCRtpParameters.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCMediaStreamTrackConfiguration::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCMediaStreamTrackConfiguration::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCMediaStreamTrackConfiguration::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCMediaStreamTrackConfiguration::RTCMediaStreamTrackConfiguration()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCMediaStreamTrackConfigurationPtr wrapper::org::ortc::adapter::RTCMediaStreamTrackConfiguration::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCMediaStreamTrackConfiguration>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCMediaStreamTrackConfiguration::~RTCMediaStreamTrackConfiguration()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCMediaStreamTrackConfiguration::wrapper_init_org_ortc_adapter_RTCMediaStreamTrackConfiguration()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCMediaStreamTrackConfiguration::wrapper_init_org_ortc_adapter_RTCMediaStreamTrackConfiguration(wrapper::org::ortc::adapter::RTCMediaStreamTrackConfigurationPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->capabilities = RTCRtpCapabilities::toWrapper(native.mCapabilities);
+  pThis->parameters = RTCRtpParameters::toWrapper(native.mParameters);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mCapabilities = RTCRtpCapabilities::toNative(wrapper->capabilities);
+  result->mParameters = RTCRtpParameters::toNative(wrapper->parameters);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h
new file mode 100644
index 00000000..2e644e0f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCMediaStreamTrackConfiguration.h"
+
+#include <ortc/adapter/IPeerConnection.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCMediaStreamTrackConfiguration : public wrapper::org::ortc::adapter::RTCMediaStreamTrackConfiguration
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnectionTypes::MediaStreamTrackConfiguration, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCMediaStreamTrackConfiguration, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCMediaStreamTrackConfiguration, WrapperType);
+            RTCMediaStreamTrackConfigurationWeakPtr thisWeak_;
+            NativeTypePtr native_;
+
+            RTCMediaStreamTrackConfiguration();
+            virtual ~RTCMediaStreamTrackConfiguration();
+
+            // methods RTCMediaStreamTrackConfiguration
+            virtual void wrapper_init_org_ortc_adapter_RTCMediaStreamTrackConfiguration() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCMediaStreamTrackConfiguration(wrapper::org::ortc::adapter::RTCMediaStreamTrackConfigurationPtr source) override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp
new file mode 100644
index 00000000..ed651c71
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp
@@ -0,0 +1,68 @@
+
+#include "impl_org_ortc_adapter_RTCOfferAnswerOptions.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCOfferAnswerOptions::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCOfferAnswerOptions::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCOfferAnswerOptions::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCOfferAnswerOptions::RTCOfferAnswerOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCOfferAnswerOptionsPtr wrapper::org::ortc::adapter::RTCOfferAnswerOptions::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCOfferAnswerOptions>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCOfferAnswerOptions::~RTCOfferAnswerOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return RTCOfferAnswerOptionsPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCOfferAnswerOptions>();
+  pThis->thisWeak_ = pThis;
+  pThis->voiceActivityDetection = native.mVoiceActivityDetection;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = make_shared < NativeType >();
+  result->mVoiceActivityDetection = wrapper->voiceActivityDetection;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferAnswerOptions.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferAnswerOptions.h
new file mode 100644
index 00000000..e011f0e4
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferAnswerOptions.h
@@ -0,0 +1,35 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCOfferAnswerOptions.h"
+
+#include <ortc/adapter/IPeerConnection.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCOfferAnswerOptions : public wrapper::org::ortc::adapter::RTCOfferAnswerOptions
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnectionTypes::OfferAnswerOptions, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCOfferAnswerOptions, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCOfferAnswerOptions, WrapperType);
+            RTCOfferAnswerOptionsWeakPtr thisWeak_;
+
+            RTCOfferAnswerOptions();
+            virtual ~RTCOfferAnswerOptions();
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferOptions.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferOptions.cpp
new file mode 100644
index 00000000..5d9ccf97
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferOptions.cpp
@@ -0,0 +1,75 @@
+
+#include "impl_org_ortc_adapter_RTCOfferOptions.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCOfferOptions::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCOfferOptions::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCOfferOptions::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCOfferOptions::RTCOfferOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCOfferOptionsPtr wrapper::org::ortc::adapter::RTCOfferOptions::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCOfferOptions>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCOfferOptions::~RTCOfferOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCOfferOptions::wrapper_init_org_ortc_adapter_RTCOfferOptions()
+{
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return RTCOfferOptionsPtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCOfferOptions>();
+  pThis->thisWeak_ = pThis;
+  pThis->voiceActivityDetection = native.mVoiceActivityDetection;
+  pThis->iceRestart = native.mICERestart;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(wrapper::org::ortc::adapter::RTCOfferOptionsPtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = make_shared < NativeType >();
+  result->mVoiceActivityDetection = wrapper->voiceActivityDetection;
+  result->mICERestart = wrapper->iceRestart;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferOptions.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferOptions.h
new file mode 100644
index 00000000..e5665e8f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCOfferOptions.h
@@ -0,0 +1,36 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCOfferOptions.h"
+
+#include <ortc/adapter/IPeerConnection.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCOfferOptions : public wrapper::org::ortc::adapter::RTCOfferOptions
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnectionTypes::OfferOptions, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCOfferOptions, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCOfferOptions, WrapperType);
+            RTCOfferOptionsWeakPtr thisWeak_;
+
+            RTCOfferOptions();
+            virtual ~RTCOfferOptions();
+            virtual void wrapper_init_org_ortc_adapter_RTCOfferOptions() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnection.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnection.cpp
new file mode 100644
index 00000000..fcdabc6d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnection.cpp
@@ -0,0 +1,534 @@
+
+#include "impl_org_ortc_adapter_RTCPeerConnection.h"
+#include "impl_org_ortc_adapter_RTCConfiguration.h"
+#include "impl_org_ortc_adapter_RTCSessionDescription.h"
+#include "impl_org_ortc_adapter_RTCIceCandidate.h"
+#include "impl_org_ortc_adapter_RTCCapabilityOptions.h"
+#include "impl_org_ortc_adapter_RTCOfferOptions.h"
+#include "impl_org_ortc_adapter_RTCAnswerOptions.h"
+#include "impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h"
+#include "impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h"
+#include "impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h"
+#include "impl_org_ortc_adapter_MediaStream.h"
+#include "impl_org_ortc_adapter_RTCTrackEvent.h"
+#include "impl_org_ortc_RTCDataChannelEvent.h"
+#include "impl_org_ortc_RTCRtpSender.h"
+#include "impl_org_ortc_RTCRtpReceiver.h"
+#include "impl_org_ortc_RTCIceServer.h"
+#include "impl_org_ortc_MediaStreamTrack.h"
+#include "impl_org_ortc_RTCDataChannel.h"
+#include "impl_org_ortc_RTCDataChannelParameters.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper_adapter); } } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCPeerConnection::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCPeerConnection::NativeTypeSubscription, NativeTypeSubscription);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCPeerConnection::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCPeerConnection::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCPeerConnection::RTCPeerConnection()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCPeerConnectionPtr wrapper::org::ortc::adapter::RTCPeerConnection::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCPeerConnection>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCPeerConnection::~RTCPeerConnection()
+{
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes)
+{
+  return Helper::getStats(native_, statTypes);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCPeerConnection::wrapper_init_org_ortc_adapter_RTCPeerConnection()
+{
+  native_ = NativeType::create(thisWeak_.lock());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCPeerConnection::wrapper_init_org_ortc_adapter_RTCPeerConnection(wrapper::org::ortc::adapter::RTCConfigurationPtr configuration)
+{
+  auto native = RTCConfiguration::toNative(configuration);
+  ZS_THROW_INVALID_ARGUMENT_IF(!native);
+  native_ = NativeType::create(thisWeak_.lock(), *native);
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::createOffer()
+{
+  return toWrapper(native_->createOffer());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::createOffer(wrapper::org::ortc::adapter::RTCOfferOptionsPtr options)
+{
+  Optional< ::ortc::adapter::IPeerConnectionTypes::OfferOptions > native;
+  auto convert = RTCOfferOptions::toNative(options);
+  if (convert) {
+    native = *convert;
+  }
+
+  return toWrapper(native_->createOffer(native));
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::createAnswer()
+{
+  return toWrapper(native_->createAnswer());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::createAnswer(wrapper::org::ortc::adapter::RTCAnswerOptionsPtr options)
+{
+  Optional< ::ortc::adapter::IPeerConnectionTypes::AnswerOptions > native;
+  auto convert = RTCAnswerOptions::toNative(options);
+  if (convert) {
+    native = *convert;
+  }
+
+  return toWrapper(native_->createAnswer(native));
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::createCapabilities()
+{
+  return toWrapper(native_->createCapabilities());
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::createCapabilities(wrapper::org::ortc::adapter::RTCCapabilityOptionsPtr options)
+{
+  Optional< ::ortc::adapter::IPeerConnectionTypes::CapabilityOptions > native;
+  auto convert = RTCCapabilityOptions::toNative(options);
+  if (convert) {
+    native = *convert;
+  }
+
+  return toWrapper(native_->createCapabilities(native));
+}
+
+//------------------------------------------------------------------------------
+PromisePtr wrapper::impl::org::ortc::adapter::RTCPeerConnection::setLocalDescription(wrapper::org::ortc::adapter::RTCSessionDescriptionPtr description)
+{
+  return Helper::toWrapper(native_->setLocalDescription(RTCSessionDescription::toNative(description)));
+}
+
+//------------------------------------------------------------------------------
+PromisePtr wrapper::impl::org::ortc::adapter::RTCPeerConnection::setRemoteDescription(wrapper::org::ortc::adapter::RTCSessionDescriptionPtr description)
+{
+  return Helper::toWrapper(native_->setRemoteDescription(RTCSessionDescription::toNative(description)));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCPeerConnection::addIceCandidate(wrapper::org::ortc::adapter::RTCIceCandidatePtr candidate)
+{
+  auto native = RTCIceCandidate::toNative(candidate);
+  ZS_THROW_INVALID_ARGUMENT_IF(!native);
+  native_->addICECandidate(*native);
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::RTCIceServerPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::getDefaultIceServers()
+{
+  auto resultList = make_shared< list< wrapper::org::ortc::RTCIceServerPtr > >();
+  auto nativeList = native_->getDefaultIceServers();
+  if (nativeList) {
+    for (auto iter = nativeList->begin(); iter != nativeList->end(); ++iter) {
+      auto wrapper = RTCIceServer::toWrapper(*iter);
+      if (!wrapper) continue;
+      resultList->push_back(wrapper);
+    }
+  }
+  return resultList;
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCPeerConnection::close()
+{
+  native_->close();
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::RTCRtpSenderPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::getSenders()
+{
+  auto resultList = make_shared< list< wrapper::org::ortc::RTCRtpSenderPtr > >();
+  auto nativeList = native_->getSenders();
+  if (nativeList) {
+    for (auto iter = nativeList->begin(); iter != nativeList->end(); ++iter) {
+      auto wrapper = RTCRtpSender::toWrapper(*iter);
+      if (!wrapper) continue;
+      resultList->push_back(wrapper);
+    }
+  }
+  return resultList;
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::RTCRtpReceiverPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::getReceivers()
+{
+  auto resultList = make_shared< list< wrapper::org::ortc::RTCRtpReceiverPtr > >();
+  auto nativeList = native_->getReceivers();
+  if (nativeList) {
+    for (auto iter = nativeList->begin(); iter != nativeList->end(); ++iter) {
+      auto wrapper = RTCRtpReceiver::toWrapper(*iter);
+      if (!wrapper) continue;
+      resultList->push_back(wrapper);
+    }
+  }
+  return resultList;
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCRtpSenderPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::addTrack(wrapper::org::ortc::MediaStreamTrackPtr track)
+{
+  return toWrapper(native_->addTrack(MediaStreamTrack::toNative(track)));
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCRtpSenderPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::addTrack(
+  wrapper::org::ortc::MediaStreamTrackPtr track,
+  wrapper::org::ortc::adapter::RTCMediaStreamTrackConfigurationPtr config
+  )
+{
+  auto nativeTrack = MediaStreamTrack::toNative(track);
+  auto nativeConfig = RTCMediaStreamTrackConfiguration::toNative(config);
+  ZS_THROW_INVALID_ARGUMENT_IF(!nativeConfig);
+
+  return toWrapper(native_->addTrack(nativeTrack, *nativeConfig));
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCRtpSenderPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::addTrack(
+  wrapper::org::ortc::MediaStreamTrackPtr track,
+  shared_ptr< list< wrapper::org::ortc::adapter::MediaStreamPtr > > mediaStreams,
+  wrapper::org::ortc::adapter::RTCMediaStreamTrackConfigurationPtr config
+  )
+{
+  auto nativeTrack = MediaStreamTrack::toNative(track);
+  list<::ortc::adapter::IMediaStreamPtr> nativeList;
+  if (mediaStreams) {
+    for (auto iter = mediaStreams->begin(); iter != mediaStreams->end(); ++iter) {
+      auto native = MediaStream::toNative(*iter);
+      if (!native) continue;
+      nativeList.push_back(native);
+    }
+  }
+  auto nativeConfig = RTCMediaStreamTrackConfiguration::toNative(config);
+  ZS_THROW_INVALID_ARGUMENT_IF(!nativeConfig);
+
+  return toWrapper(native_->addTrack(nativeTrack, nativeList, *nativeConfig));
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCPeerConnection::removeTrack(wrapper::org::ortc::RTCRtpSenderPtr sender)
+{
+  native_->removeTrack(RTCRtpSender::toNative(sender));
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCDataChannelPtr > > wrapper::impl::org::ortc::adapter::RTCPeerConnection::createDataChannel(wrapper::org::ortc::RTCDataChannelParametersPtr parameters)
+{
+  auto native = RTCDataChannelParameters::toNative(parameters);
+  ZS_THROW_INVALID_ARGUMENT_IF(!native);
+  return toWrapper(native_->createDataChannel(*native));
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionPtr wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_localDescription()
+{
+  return RTCSessionDescription::toWrapper(native_->localDescription());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionPtr wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_currentDescription()
+{
+  return RTCSessionDescription::toWrapper(native_->currentDescription());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionPtr wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_pendingDescription()
+{
+  return RTCSessionDescription::toWrapper(native_->pendingDescription());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionPtr wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_remoteDescription()
+{
+  return RTCSessionDescription::toWrapper(native_->remoteDescription());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionPtr wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_currentRemoteDescription()
+{
+  return RTCSessionDescription::toWrapper(native_->currentRemoteDescription());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionPtr wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_pendingRemoteDescription()
+{
+  return RTCSessionDescription::toWrapper(native_->pendingRemoteDescription());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSignalingState wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_signalingState()
+{
+  return Helper::toWrapper(native_->signalingState());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCIceGathererState wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_iceGatheringState()
+{
+  return Helper::toWrapper(native_->iceGatheringState());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCIceConnectionState wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_iceConnectionState()
+{
+  return Helper::toPeerConnectionWrapper(native_->iceConnectionState());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCPeerConnectionState wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_connectionState()
+{
+  return Helper::toWrapper(native_->connectionState());
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_canTrickleCandidates()
+{
+  return native_->canTrickleCandidates();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCConfigurationPtr wrapper::impl::org::ortc::adapter::RTCPeerConnection::get_getConfiguration()
+{
+  return RTCConfiguration::toWrapper(native_->getConfiguration());
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCPeerConnection::set_getConfiguration(wrapper::org::ortc::adapter::RTCConfigurationPtr value)
+{
+  auto native = RTCConfiguration::toNative(value);
+  ZS_THROW_INVALID_ARGUMENT_IF(!native);
+  native_->setConfiguration(*native);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCPeerConnection::wrapper_onObserverCountChanged(size_t count)
+{
+  subscriptionCount_ = count;
+  subscribe();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onPeerConnectionNegotiationNeeded(IPeerConnectionPtr connection)
+{
+  onNegotiationNeeded();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onPeerConnectionIceCandidate(
+  IPeerConnectionPtr connection,
+  ICECandidatePtr candidate,
+  const char *url
+)
+{
+  onIceCandidate(RTCPeerConnectionIceEvent::toWrapper(candidate, String(url)));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onPeerConnectionIceCandidateError(
+  IPeerConnectionPtr connection,
+  ICECandidateErrorEventPtr error
+)
+{
+  onIceCandidateError(RTCPeerConnectionIceErrorEvent::toWrapper(error));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onPeerConnectionSignalingStateChange(
+  IPeerConnectionPtr connection,
+  SignalingStates state
+)
+{
+  onSignalingStateChange();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onPeerConnectionICEGatheringStateChange(
+  IPeerConnectionPtr connection,
+  ICEGatheringStates state
+)
+{
+  onIceGatheringStateChange();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onPeerConnectionICEConnectionStateChange(
+  IPeerConnectionPtr connection,
+  ICEConnectionStates state
+)
+{
+  onIceConnectionStateChange();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onPeerConnectionConnectionStateChange(
+  IPeerConnectionPtr connection,
+  PeerConnectionStates state
+)
+{
+  onConnectionStateChange();
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onPeerConnectionTrack(
+  IPeerConnectionPtr connection,
+  MediaStreamTrackEventPtr event
+)
+{
+  onTrack(RTCTrackEvent::toWrapper(event));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onPeerConnectionTrackGone(
+  IPeerConnectionPtr connection,
+  MediaStreamTrackEventPtr event
+)
+{
+  onTrackGone(RTCTrackEvent::toWrapper(event));
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::onPeerConnectionDataChannel(
+  IPeerConnectionPtr connection,
+  IDataChannelPtr dataChannel
+)
+{
+  onDataChannel(RTCDataChannelEvent::toWrapper(dataChannel));
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr track)
+{
+  if (!track) return WrapperImplTypePtr();
+
+  auto result = make_shared<WrapperImplType>();
+  result->thisWeak_ = result;
+  result->native_ = track;
+  result->defaultSubscription_ = false;
+  result->subscribe();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+  auto result = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!result) return NativeTypePtr();
+  return result->native_;
+}
+
+//------------------------------------------------------------------------------
+void WrapperImplType::subscribe()
+{
+  if (defaultSubscription_) return;
+  if (!native_) return;
+
+  zsLib::AutoLock lock(lock_);
+  if (subscriptionCount_ < 1) {
+    if (!subscription_) return;
+    subscription_->cancel();
+    return;
+  }
+  if (subscription_) return;
+  subscription_ = native_->subscribe(thisWeak_.lock());
+}
+
+//------------------------------------------------------------------------------
+WrapperImplType::WrapperPromiseWithSessionDescriptionPtr WrapperImplType::toWrapper(NativePromiseWithSessionDescriptionPtr promise)
+{
+  if (!promise) return WrapperPromiseWithSessionDescriptionPtr();
+
+  auto result = WrapperPromiseWithSessionDescription::create(Helper::getGuiQueue());
+  promise->thenClosure([result, promise] {
+    if (promise->isRejected()) {
+      Helper::reject(promise, result);
+      return;
+    }
+    result->resolve(RTCSessionDescription::toWrapper(promise->value()));
+  });
+  promise->background();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplType::WrapperPromiseWithSenderPtr WrapperImplType::toWrapper(NativePromiseWithSenderPtr promise)
+{
+  if (!promise) return WrapperPromiseWithSenderPtr();
+
+  auto result = WrapperPromiseWithSender::create(Helper::getGuiQueue());
+  promise->thenClosure([result, promise] {
+    if (promise->isRejected()) {
+      Helper::reject(promise, result);
+      return;
+    }
+    result->resolve(RTCRtpSender::toWrapper(promise->value()));
+  });
+  promise->background();
+  return result;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplType::WrapperPromiseWithDataChannelPtr WrapperImplType::toWrapper(NativePromiseWithDataChannelPtr promise)
+{
+  if (!promise) return WrapperPromiseWithDataChannelPtr();
+
+  auto result = WrapperPromiseWithDataChannel::create(Helper::getGuiQueue());
+  promise->thenClosure([result, promise] {
+    if (promise->isRejected()) {
+      Helper::reject(promise, result);
+      return;
+    }
+    result->resolve(RTCDataChannel::toWrapper(promise->value()));
+  });
+  promise->background();
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnection.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnection.h
new file mode 100644
index 00000000..8ac46ea6
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnection.h
@@ -0,0 +1,150 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCPeerConnection.h"
+
+#include <ortc/adapter/IPeerConnection.h>
+#include <ortc/adapter/ISessionDescription.h>
+#include <ortc/IDataChannel.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCPeerConnection : public wrapper::org::ortc::adapter::RTCPeerConnection,
+                                     public ::ortc::adapter::IPeerConnectionDelegate
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnection, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnection, IPeerConnection);
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::IDataChannel, IDataChannel);
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnectionSubscription, NativeTypeSubscription);
+            ZS_DECLARE_TYPEDEF_PTR(RTCPeerConnection, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCPeerConnection, WrapperType);
+
+            ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWith< ::ortc::adapter::ISessionDescription >, NativePromiseWithSessionDescription);
+            ZS_DECLARE_TYPEDEF_PTR(PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr >, WrapperPromiseWithSessionDescription);
+            ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWith< ::ortc::IRTPSender >, NativePromiseWithSender);
+            ZS_DECLARE_TYPEDEF_PTR(PromiseWithHolderPtr< wrapper::org::ortc::RTCRtpSenderPtr >, WrapperPromiseWithSender);
+            ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWith< ::ortc::IDataChannel >, NativePromiseWithDataChannel);
+            ZS_DECLARE_TYPEDEF_PTR(PromiseWithHolderPtr< wrapper::org::ortc::RTCDataChannelPtr >, WrapperPromiseWithDataChannel);
+
+            RTCPeerConnectionWeakPtr thisWeak_;
+            NativeTypePtr native_;
+            zsLib::Lock lock_;
+            std::atomic<size_t> subscriptionCount_{};
+            bool defaultSubscription_{ true };
+            NativeTypeSubscriptionPtr subscription_;
+
+            RTCPeerConnection();
+            virtual ~RTCPeerConnection();
+
+            // methods RTCStatsProvider
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCStatsReportPtr > > getStats(wrapper::org::ortc::RTCStatsTypeSetPtr statTypes) override;
+
+            // methods RTCPeerConnection
+            virtual void wrapper_init_org_ortc_adapter_RTCPeerConnection() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCPeerConnection(wrapper::org::ortc::adapter::RTCConfigurationPtr configuration) override;
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > createOffer() override;
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > createOffer(wrapper::org::ortc::adapter::RTCOfferOptionsPtr options) override;
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > createAnswer() override;
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > createAnswer(wrapper::org::ortc::adapter::RTCAnswerOptionsPtr options) override;
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > createCapabilities() override;
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::adapter::RTCSessionDescriptionPtr > > createCapabilities(wrapper::org::ortc::adapter::RTCCapabilityOptionsPtr options) override;
+            virtual PromisePtr setLocalDescription(wrapper::org::ortc::adapter::RTCSessionDescriptionPtr description) override;
+            virtual PromisePtr setRemoteDescription(wrapper::org::ortc::adapter::RTCSessionDescriptionPtr description) override;
+            virtual void addIceCandidate(wrapper::org::ortc::adapter::RTCIceCandidatePtr candidate) override;
+            virtual shared_ptr< list< wrapper::org::ortc::RTCIceServerPtr > > getDefaultIceServers() override;
+            virtual void close() override;
+            virtual shared_ptr< list< wrapper::org::ortc::RTCRtpSenderPtr > > getSenders() override;
+            virtual shared_ptr< list< wrapper::org::ortc::RTCRtpReceiverPtr > > getReceivers() override;
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCRtpSenderPtr > > addTrack(wrapper::org::ortc::MediaStreamTrackPtr track) override;
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCRtpSenderPtr > > addTrack(
+              wrapper::org::ortc::MediaStreamTrackPtr track,
+              wrapper::org::ortc::adapter::RTCMediaStreamTrackConfigurationPtr config
+              ) override;
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCRtpSenderPtr > > addTrack(
+              wrapper::org::ortc::MediaStreamTrackPtr track,
+              shared_ptr< list< wrapper::org::ortc::adapter::MediaStreamPtr > > mediaStreams,
+              wrapper::org::ortc::adapter::RTCMediaStreamTrackConfigurationPtr config
+              ) override;
+            virtual void removeTrack(wrapper::org::ortc::RTCRtpSenderPtr sender) override;
+            virtual shared_ptr< PromiseWithHolderPtr< wrapper::org::ortc::RTCDataChannelPtr > > createDataChannel(wrapper::org::ortc::RTCDataChannelParametersPtr parameters) override;
+
+            // properties RTCPeerConnection
+            virtual uint64_t get_objectId() override;
+            virtual wrapper::org::ortc::adapter::RTCSessionDescriptionPtr get_localDescription() override;
+            virtual wrapper::org::ortc::adapter::RTCSessionDescriptionPtr get_currentDescription() override;
+            virtual wrapper::org::ortc::adapter::RTCSessionDescriptionPtr get_pendingDescription() override;
+            virtual wrapper::org::ortc::adapter::RTCSessionDescriptionPtr get_remoteDescription() override;
+            virtual wrapper::org::ortc::adapter::RTCSessionDescriptionPtr get_currentRemoteDescription() override;
+            virtual wrapper::org::ortc::adapter::RTCSessionDescriptionPtr get_pendingRemoteDescription() override;
+            virtual wrapper::org::ortc::adapter::RTCSignalingState get_signalingState() override;
+            virtual wrapper::org::ortc::RTCIceGathererState get_iceGatheringState() override;
+            virtual wrapper::org::ortc::adapter::RTCIceConnectionState get_iceConnectionState() override;
+            virtual wrapper::org::ortc::adapter::RTCPeerConnectionState get_connectionState() override;
+            virtual bool get_canTrickleCandidates() override;
+            virtual wrapper::org::ortc::adapter::RTCConfigurationPtr get_getConfiguration() override;
+            virtual void set_getConfiguration(wrapper::org::ortc::adapter::RTCConfigurationPtr value) override;
+
+            virtual void wrapper_onObserverCountChanged(size_t count) override;
+
+            virtual void onPeerConnectionNegotiationNeeded(IPeerConnectionPtr connection) override;
+            virtual void onPeerConnectionIceCandidate(
+              IPeerConnectionPtr connection,
+              ICECandidatePtr candidate,
+              const char *url
+            ) override;
+            virtual void onPeerConnectionIceCandidateError(
+              IPeerConnectionPtr connection,
+              ICECandidateErrorEventPtr error
+            ) override;
+            virtual void onPeerConnectionSignalingStateChange(
+              IPeerConnectionPtr connection,
+              SignalingStates state
+            ) override;
+            virtual void onPeerConnectionICEGatheringStateChange(
+              IPeerConnectionPtr connection,
+              ICEGatheringStates state
+            ) override;
+            virtual void onPeerConnectionICEConnectionStateChange(
+              IPeerConnectionPtr connection,
+              ICEConnectionStates state
+            ) override;
+            virtual void onPeerConnectionConnectionStateChange(
+              IPeerConnectionPtr connection,
+              PeerConnectionStates state
+            ) override;
+            virtual void onPeerConnectionTrack(
+              IPeerConnectionPtr connection,
+              MediaStreamTrackEventPtr event
+            ) override;
+
+            virtual void onPeerConnectionTrackGone(
+              IPeerConnectionPtr connection,
+              MediaStreamTrackEventPtr event
+            ) override;
+
+            virtual void onPeerConnectionDataChannel(
+              IPeerConnectionPtr connection,
+              IDataChannelPtr dataChannel
+            ) override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr track);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+
+            void subscribe();
+
+            static WrapperPromiseWithSessionDescriptionPtr toWrapper(NativePromiseWithSessionDescriptionPtr promise);
+            static WrapperPromiseWithSenderPtr toWrapper(NativePromiseWithSenderPtr promise);
+            static WrapperPromiseWithDataChannelPtr toWrapper(NativePromiseWithDataChannelPtr promise);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp
new file mode 100644
index 00000000..5398277b
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp
@@ -0,0 +1,93 @@
+
+#include "impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h"
+#include "impl_org_ortc_adapter_RTCIceCandidate.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceErrorEvent::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceErrorEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceErrorEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceErrorEvent::RTCPeerConnectionIceErrorEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCPeerConnectionIceErrorEventPtr wrapper::org::ortc::adapter::RTCPeerConnectionIceErrorEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceErrorEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceErrorEvent::~RTCPeerConnectionIceErrorEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCIceCandidatePtr wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceErrorEvent::get_hostCandidate()
+{
+  return RTCIceCandidate::toWrapper(native_->mHostCandidate);
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceErrorEvent::get_url()
+{
+  return native_->mURL;
+}
+
+//------------------------------------------------------------------------------
+Optional< uint16_t > wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceErrorEvent::get_errorCode()
+{
+  Optional< uint16_t > result {};
+  Helper::optionalSafeIntConvert(native_->mErrorCode, result);
+  return result;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceErrorEvent::get_errorText()
+{
+  return native_->mErrorText;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!impl) return NativeTypePtr();
+
+  return impl->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h
new file mode 100644
index 00000000..b0cbb94c
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h"
+
+#include <ortc/adapter/IPeerConnection.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCPeerConnectionIceErrorEvent : public wrapper::org::ortc::adapter::RTCPeerConnectionIceErrorEvent
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnectionTypes::ICECandidateErrorEvent, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCPeerConnectionIceErrorEvent, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCPeerConnectionIceErrorEvent, WrapperType);
+            RTCPeerConnectionIceErrorEventWeakPtr thisWeak_;
+            NativeTypePtr native_;
+
+            RTCPeerConnectionIceErrorEvent();
+            virtual ~RTCPeerConnectionIceErrorEvent();
+
+            // properties RTCPeerConnectionIceErrorEvent
+            virtual wrapper::org::ortc::adapter::RTCIceCandidatePtr get_hostCandidate() override;
+            virtual String get_url() override;
+            virtual Optional< uint16_t > get_errorCode() override;
+            virtual String get_errorText() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp
new file mode 100644
index 00000000..90d45288
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp
@@ -0,0 +1,68 @@
+
+#include "impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h"
+#include "impl_org_ortc_adapter_RTCIceCandidate.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceEvent::RTCPeerConnectionIceEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCPeerConnectionIceEventPtr wrapper::org::ortc::adapter::RTCPeerConnectionIceEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceEvent::~RTCPeerConnectionIceEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCIceCandidatePtr wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceEvent::get_candidate()
+{
+  return candidate_;
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCPeerConnectionIceEvent::get_uri()
+{
+  return uri_;
+}
+
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(
+  ::ortc::adapter::IPeerConnectionTypes::ICECandidatePtr candidate,
+  const String &uri
+)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->candidate_ = RTCIceCandidate::toWrapper(candidate);
+  pThis->uri_ = uri;
+  return pThis;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h
new file mode 100644
index 00000000..e727b317
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h
@@ -0,0 +1,41 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCPeerConnectionIceEvent.h"
+
+#include <ortc/adapter/IPeerConnection.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCPeerConnectionIceEvent : public wrapper::org::ortc::adapter::RTCPeerConnectionIceEvent
+          {
+            ZS_DECLARE_TYPEDEF_PTR(RTCPeerConnectionIceEvent, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCPeerConnectionIceEvent, WrapperType);
+            RTCPeerConnectionIceEventWeakPtr thisWeak_;
+            wrapper::org::ortc::adapter::RTCIceCandidatePtr candidate_;
+            String uri_;
+
+            RTCPeerConnectionIceEvent();
+            virtual ~RTCPeerConnectionIceEvent();
+
+            // properties RTCPeerConnectionIceEvent
+            virtual wrapper::org::ortc::adapter::RTCIceCandidatePtr get_candidate() override;
+            virtual String get_uri() override;
+
+            static WrapperImplTypePtr toWrapper(
+              ::ortc::adapter::IPeerConnectionTypes::ICECandidatePtr candidate,
+              const String &uri
+            );
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescription.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescription.cpp
new file mode 100644
index 00000000..314cc6bc
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescription.cpp
@@ -0,0 +1,174 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescription.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionDescription.h"
+#include "impl_org_ortc_RTCRtpCapabilities.h"
+#include "impl_org_ortc_RTCRtpParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+#include <ortc/adapter/IHelper.h>
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+namespace wrapper { namespace impl { namespace org { namespace ortc { namespace adapter { ZS_DECLARE_SUBSYSTEM(org_ortc_wrapper_adapter); } } } } }
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescription::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescription::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescription::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescription::RTCSessionDescription()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionPtr wrapper::org::ortc::adapter::RTCSessionDescription::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescription>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescription::~RTCSessionDescription()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescription::wrapper_init_org_ortc_adapter_RTCSessionDescription(
+  wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType type,
+  String description
+  )
+{
+  native_ = NativeType::create(Helper::toNative(type), description);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescription::wrapper_init_org_ortc_adapter_RTCSessionDescription(
+  wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType type,
+  wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionPtr description
+  )
+{
+  auto wrapperDescription = RTCSessionDescriptionDescription::toNative(description);
+  ZS_THROW_INVALID_ARGUMENT_IF(!wrapperDescription);
+  native_ = NativeType::create(Helper::toNative(type), *wrapperDescription);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpParametersPtr wrapper::org::ortc::adapter::RTCSessionDescription::convertCapabilitiesToParameters(wrapper::org::ortc::RTCRtpCapabilitiesPtr capabilitites)
+{
+  auto native = wrapper::impl::org::ortc::RTCRtpCapabilities::toNative(capabilitites);
+  if (!native) return RTCRtpParametersPtr();
+
+  auto result = ::ortc::adapter::IHelper::capabilitiesToParameters(*native);
+  return wrapper::impl::org::ortc::RTCRtpParameters::toWrapper(result);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpCapabilitiesPtr wrapper::org::ortc::adapter::RTCSessionDescription::ConvertParametersToCapabilitites(wrapper::org::ortc::RTCRtpParametersPtr parameters)
+{
+  auto native = wrapper::impl::org::ortc::RTCRtpParameters::toNative(parameters);
+  if (!native) return RTCRtpCapabilitiesPtr();
+
+  auto result = ::ortc::adapter::IHelper::parametersToCapabilities(*native);
+  return wrapper::impl::org::ortc::RTCRtpCapabilities::toWrapper(result);
+}
+
+//------------------------------------------------------------------------------
+uint64_t wrapper::impl::org::ortc::adapter::RTCSessionDescription::get_objectId()
+{
+  return native_->getID();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType wrapper::impl::org::ortc::adapter::RTCSessionDescription::get_type()
+{
+  return Helper::toWrapper(native_->type());
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSdpType wrapper::impl::org::ortc::adapter::RTCSessionDescription::get_sdpType()
+{
+  auto type = native_->type();
+  ZS_THROW_NOT_IMPLEMENTED_IF(NativeType::SignalingType_JSON == type);
+
+  switch (type)
+  {
+    case NativeType::SignalingType_JSON:        break;
+    case NativeType::SignalingType_SDPOffer:    return wrapper::org::ortc::adapter::RTCSdpType_offer;
+    case NativeType::SignalingType_SDPPranswer: return wrapper::org::ortc::adapter::RTCSdpType_pranswer;
+    case NativeType::SignalingType_SDPAnswer:   return wrapper::org::ortc::adapter::RTCSdpType_answer;
+    case NativeType::SignalingType_SDPRollback: return wrapper::org::ortc::adapter::RTCSdpType_rollback;
+  }
+
+  wrapper::org::ortc::adapter::RTCSdpType result {};
+  return result;
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::adapter::RTCSessionDescription::get_isJsonSignalling()
+{
+  return NativeType::SignalingType_JSON == native_->type();
+}
+
+//------------------------------------------------------------------------------
+bool wrapper::impl::org::ortc::adapter::RTCSessionDescription::get_isSdpSignaling()
+{
+  return NativeType::SignalingType_JSON != native_->type();
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionPtr wrapper::impl::org::ortc::adapter::RTCSessionDescription::get_description()
+{
+  return RTCSessionDescriptionDescription::toWrapper(native_->description());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescription::get_formattedDescription()
+{
+  return native_->formattedDescription();
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescription::get_sdp()
+{
+  return native_->formattedDescription();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!impl) return NativeTypePtr();
+
+  return impl->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescription.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescription.h
new file mode 100644
index 00000000..d102e501
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescription.h
@@ -0,0 +1,55 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescription.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescription : public wrapper::org::ortc::adapter::RTCSessionDescription
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescription, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescription, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescription, WrapperType);
+            RTCSessionDescriptionWeakPtr thisWeak_;
+            NativeTypePtr native_;
+
+            RTCSessionDescription();
+            virtual ~RTCSessionDescription();
+
+            // methods RTCSessionDescription
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescription(
+              wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType type,
+              String description
+              ) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescription(
+              wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType type,
+              wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionPtr description
+              ) override;
+
+            // properties RTCSessionDescription
+            virtual uint64_t get_objectId() override;
+            virtual wrapper::org::ortc::adapter::RTCSessionDescriptionSignalingType get_type() override;
+            virtual wrapper::org::ortc::adapter::RTCSdpType get_sdpType() override;
+            virtual bool get_isJsonSignalling() override;
+            virtual bool get_isSdpSignaling() override;
+            virtual wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionPtr get_description() override;
+            virtual String get_formattedDescription() override;
+            virtual String get_sdp() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp
new file mode 100644
index 00000000..e8dd3a34
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp
@@ -0,0 +1,111 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData::RTCSessionDescriptionConnectionData()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionDataPtr wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionData::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData::~RTCSessionDescriptionConnectionData()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData::wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionData()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData::wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionData(wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionDataPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData::wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionData(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionData::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->rtp = RTCSessionDescriptionConnectionDataDetails::toWrapper(native.mRTP);
+  pThis->rtcp = RTCSessionDescriptionConnectionDataDetails::toWrapper(native.mRTCP);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mRTP = RTCSessionDescriptionConnectionDataDetails::toNative(wrapper->rtp);
+  result->mRTCP = RTCSessionDescriptionConnectionDataDetails::toNative(wrapper->rtcp);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h
new file mode 100644
index 00000000..8ae50261
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h
@@ -0,0 +1,42 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionConnectionData.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionConnectionData : public wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionData
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::ConnectionData, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionConnectionData, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionData, WrapperType);
+            RTCSessionDescriptionConnectionDataWeakPtr thisWeak_;
+
+            RTCSessionDescriptionConnectionData();
+            virtual ~RTCSessionDescriptionConnectionData();
+
+            // methods RTCSessionDescriptionConnectionData
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionData() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionData(wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionDataPtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionData(wrapper::org::ortc::JsonPtr json) override;
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp
new file mode 100644
index 00000000..c9eb5fb4
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp
@@ -0,0 +1,114 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::RTCSessionDescriptionConnectionDataDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetailsPtr wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::~RTCSessionDescriptionConnectionDataDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails(wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetailsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mPort, pThis->port);
+  pThis->netType = native.mNetType;
+  pThis->addrType = native.mAddrType;
+  pThis->connectionAddress = native.mConnectionAddress;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->port, result->mPort);
+  result->mNetType = wrapper->netType;
+  result->mAddrType = wrapper->addrType;
+  result->mConnectionAddress = wrapper->connectionAddress;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h
new file mode 100644
index 00000000..2c07a01a
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h
@@ -0,0 +1,42 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionConnectionDataDetails : public wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::ConnectionData::Details, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionConnectionDataDetails, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetails, WrapperType);
+            RTCSessionDescriptionConnectionDataDetailsWeakPtr thisWeak_;
+
+            RTCSessionDescriptionConnectionDataDetails();
+            virtual ~RTCSessionDescriptionConnectionDataDetails();
+
+            // methods RTCSessionDescriptionConnectionDataDetails
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails(wrapper::org::ortc::adapter::RTCSessionDescriptionConnectionDataDetailsPtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails(wrapper::org::ortc::JsonPtr json) override;
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp
new file mode 100644
index 00000000..4a9490ff
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp
@@ -0,0 +1,166 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionDescription.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionTransport.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription::RTCSessionDescriptionDescription()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionPtr wrapper::org::ortc::adapter::RTCSessionDescriptionDescription::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription::~RTCSessionDescriptionDescription()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription::wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescription()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription::wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescription(wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription::wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescription(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescription::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->details = RTCSessionDescriptionDescriptionDetails::toWrapper(native.mDetails);
+  pThis->transports = make_shared< list< wrapper::org::ortc::adapter::RTCSessionDescriptionTransportPtr > >();
+  for (auto iter = native.mTransports.begin(); iter != native.mTransports.end(); ++iter) {
+    auto wrapper = RTCSessionDescriptionTransport::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->transports->push_back(wrapper);
+  }
+  pThis->rtpMediaLines = make_shared< list< wrapper::org::ortc::adapter::RTCSessionDescriptionRtpMediaLinePtr > >();
+  for (auto iter = native.mRTPMediaLines.begin(); iter != native.mRTPMediaLines.end(); ++iter) {
+    auto wrapper = RTCSessionDescriptionRtpMediaLine::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->rtpMediaLines->push_back(wrapper);
+  }
+  pThis->sctpMediaLines = make_shared< list< wrapper::org::ortc::adapter::RTCSessionDescriptionSctpMediaLinePtr > >();
+  for (auto iter = native.mSCTPMediaLines.begin(); iter != native.mSCTPMediaLines.end(); ++iter) {
+    auto wrapper = RTCSessionDescriptionSctpMediaLine::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->sctpMediaLines->push_back(wrapper);
+  }
+  pThis->rtpSenders = make_shared< list< wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSenderPtr > >();
+  for (auto iter = native.mRTPSenders.begin(); iter != native.mRTPSenders.end(); ++iter) {
+    auto wrapper = RTCSessionDescriptionRtpSender::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->rtpSenders->push_back(wrapper);
+  }
+
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mDetails = RTCSessionDescriptionDescriptionDetails::toNative(wrapper->details);
+  if (wrapper->transports) {
+    for (auto iter = wrapper->transports->begin(); iter != wrapper->transports->end(); ++iter) {
+      auto native = RTCSessionDescriptionTransport::toNative(*iter);
+      if (!native) continue;
+      result->mTransports.push_back(native);
+    }
+  }
+  if (wrapper->rtpMediaLines) {
+    for (auto iter = wrapper->rtpMediaLines->begin(); iter != wrapper->rtpMediaLines->end(); ++iter) {
+      auto native = RTCSessionDescriptionRtpMediaLine::toNative(*iter);
+      if (!native) continue;
+      result->mRTPMediaLines.push_back(native);
+    }
+  }
+  if (wrapper->sctpMediaLines) {
+    for (auto iter = wrapper->sctpMediaLines->begin(); iter != wrapper->sctpMediaLines->end(); ++iter) {
+      auto native = RTCSessionDescriptionSctpMediaLine::toNative(*iter);
+      if (!native) continue;
+      result->mSCTPMediaLines.push_back(native);
+    }
+  }
+  if (wrapper->rtpSenders) {
+    for (auto iter = wrapper->rtpSenders->begin(); iter != wrapper->rtpSenders->end(); ++iter) {
+      auto native = RTCSessionDescriptionRtpSender::toNative(*iter);
+      if (!native) continue;
+      result->mRTPSenders.push_back(native);
+    }
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescription.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescription.h
new file mode 100644
index 00000000..4b7e53c0
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescription.h
@@ -0,0 +1,42 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionDescription.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionDescription : public wrapper::org::ortc::adapter::RTCSessionDescriptionDescription
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::Description, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionDescription, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionDescription, WrapperType);
+            RTCSessionDescriptionDescriptionWeakPtr thisWeak_;
+
+            RTCSessionDescriptionDescription();
+            virtual ~RTCSessionDescriptionDescription();
+
+            // methods RTCSessionDescriptionDescription
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescription() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescription(wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionPtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescription(wrapper::org::ortc::JsonPtr json) override;
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp
new file mode 100644
index 00000000..e409d6f7
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp
@@ -0,0 +1,124 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::RTCSessionDescriptionDescriptionDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionDetailsPtr wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::~RTCSessionDescriptionDescriptionDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails(wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionDetailsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->username = native.mUsername;
+  pThis->sessionId = SafeInt<decltype(pThis->sessionId)>(native.mSessionID);
+  pThis->sessionVersion = SafeInt<decltype(pThis->sessionVersion)>(native.mSessionVersion);
+  pThis->unicaseAddress = RTCSessionDescriptionConnectionDataDetails::toWrapper(native.mUnicaseAddress);
+  pThis->sessionName = native.mSessionName;
+  pThis->startTime = SafeInt<decltype(pThis->startTime)>(native.mStartTime);
+  pThis->endTime = SafeInt<decltype(pThis->endTime)>(native.mEndTime);
+  pThis->connectionData = RTCSessionDescriptionConnectionData::toWrapper(native.mConnectionData);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mUsername = wrapper->username;
+  result->mSessionID = SafeInt<decltype(result->mSessionID)>(wrapper->sessionId);
+  result->mSessionVersion = SafeInt<decltype(result->mSessionVersion)>(wrapper->sessionVersion);
+  result->mUnicaseAddress = RTCSessionDescriptionConnectionDataDetails::toNative(wrapper->unicaseAddress);
+  result->mSessionName = wrapper->sessionName;
+  result->mStartTime = SafeInt<decltype(result->mStartTime)>(wrapper->startTime);
+  result->mEndTime = SafeInt<decltype(result->mEndTime)>(wrapper->endTime);
+  result->mConnectionData = RTCSessionDescriptionConnectionData::toNative(wrapper->connectionData);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h
new file mode 100644
index 00000000..305913cc
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h
@@ -0,0 +1,42 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionDescriptionDetails : public wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::Description::Details, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionDescriptionDetails, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionDetails, WrapperType);
+            RTCSessionDescriptionDescriptionDetailsWeakPtr thisWeak_;
+
+            RTCSessionDescriptionDescriptionDetails();
+            virtual ~RTCSessionDescriptionDescriptionDetails();
+
+            // methods RTCSessionDescriptionDescriptionDetails
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails(wrapper::org::ortc::adapter::RTCSessionDescriptionDescriptionDetailsPtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails(wrapper::org::ortc::JsonPtr json) override;
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp
new file mode 100644
index 00000000..380bb563
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp
@@ -0,0 +1,106 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLine::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLine::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLine::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLine::RTCSessionDescriptionMediaLine()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionMediaLinePtr wrapper::org::ortc::adapter::RTCSessionDescriptionMediaLine::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLine>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLine::~RTCSessionDescriptionMediaLine()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLine::toJson()
+{
+  {
+    auto obj = std::dynamic_pointer_cast<::ortc::adapter::ISessionDescriptionTypes::RTPMediaLine>(native_);
+    if (obj) return Json::toWrapper(obj->createElement());
+  }
+  {
+    auto obj = std::dynamic_pointer_cast<::ortc::adapter::ISessionDescriptionTypes::SCTPMediaLine>(native_);
+    if (obj) return Json::toWrapper(obj->createElement());
+  }
+
+  return JsonPtr();
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLine::hash()
+{
+  {
+    auto obj = std::dynamic_pointer_cast<::ortc::adapter::ISessionDescriptionTypes::RTPMediaLine>(native_);
+    if (obj) return obj->hash();
+  }
+  {
+    auto obj = std::dynamic_pointer_cast<::ortc::adapter::ISessionDescriptionTypes::SCTPMediaLine>(native_);
+    if (obj) return obj->hash();
+  }
+
+  return String();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  {
+    auto obj = std::dynamic_pointer_cast<RTCSessionDescriptionRtpMediaLine>(wrapper);
+    if (obj) return RTCSessionDescriptionRtpMediaLine::toNative(obj);
+  }
+  {
+    auto obj = std::dynamic_pointer_cast<RTCSessionDescriptionSctpMediaLine>(wrapper);
+    if (obj) return RTCSessionDescriptionSctpMediaLine::toNative(obj);
+  }
+
+  auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!impl) return NativeTypePtr();
+
+  return impl->native_;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h
new file mode 100644
index 00000000..cee6af5d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionMediaLine.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionMediaLine : public wrapper::org::ortc::adapter::RTCSessionDescriptionMediaLine
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::MediaLine, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionMediaLine, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionMediaLine, WrapperType);
+            RTCSessionDescriptionMediaLineWeakPtr thisWeak_;
+            NativeTypePtr native_;
+
+            RTCSessionDescriptionMediaLine();
+            virtual ~RTCSessionDescriptionMediaLine();
+
+            // methods RTCSessionDescriptionMediaLine
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp
new file mode 100644
index 00000000..bbb1ed96
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp
@@ -0,0 +1,117 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::RTCSessionDescriptionMediaLineDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionMediaLineDetailsPtr wrapper::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::~RTCSessionDescriptionMediaLineDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails(wrapper::org::ortc::adapter::RTCSessionDescriptionMediaLineDetailsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mInternalIndex, pThis->internalIndex);
+  pThis->privateTransportID = native.mPrivateTransportID;
+  pThis->protocol = native.mProtocol;
+  pThis->connectionData = RTCSessionDescriptionConnectionData::toWrapper(native.mConnectionData);
+  pThis->mediaDirection = Helper::toWrapper(native.mMediaDirection);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->internalIndex, result->mInternalIndex);
+  result->mPrivateTransportID = wrapper->privateTransportID;
+  result->mProtocol = wrapper->protocol;
+  result->mConnectionData = RTCSessionDescriptionConnectionData::toNative(wrapper->connectionData);
+  result->mMediaDirection = Helper::toNative(wrapper->mediaDirection);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h
new file mode 100644
index 00000000..d7244337
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h
@@ -0,0 +1,42 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionMediaLineDetails : public wrapper::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::MediaLine::Details, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionMediaLineDetails, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionMediaLineDetails, WrapperType);
+            RTCSessionDescriptionMediaLineDetailsWeakPtr thisWeak_;
+
+            RTCSessionDescriptionMediaLineDetails();
+            virtual ~RTCSessionDescriptionMediaLineDetails();
+
+            // methods RTCSessionDescriptionMediaLineDetails
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails(wrapper::org::ortc::adapter::RTCSessionDescriptionMediaLineDetailsPtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails(wrapper::org::ortc::JsonPtr json) override;
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp
new file mode 100644
index 00000000..8a8a3839
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp
@@ -0,0 +1,119 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h"
+#include "impl_org_ortc_RTCRtpCapabilities.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::RTCSessionDescriptionRtpMediaLine()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionRtpMediaLinePtr wrapper::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::~RTCSessionDescriptionRtpMediaLine()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine(wrapper::org::ortc::adapter::RTCSessionDescriptionRtpMediaLinePtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine::wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->id = native.mID;
+  pThis->transportId = native.mTransportID;
+  pThis->mediaType = native.mMediaType;
+  pThis->details = RTCSessionDescriptionMediaLineDetails::toWrapper(native.mDetails);
+  pThis->senderCapabilities = RTCRtpCapabilities::toWrapper(native.mSenderCapabilities);
+  pThis->receiverCapabilities = RTCRtpCapabilities::toWrapper(native.mReceiverCapabilities);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mID = wrapper->id;
+  result->mTransportID = wrapper->transportId;
+  result->mMediaType = wrapper->mediaType;
+  result->mDetails = RTCSessionDescriptionMediaLineDetails::toNative(wrapper->details);
+  result->mSenderCapabilities = RTCRtpCapabilities::toNative(wrapper->senderCapabilities);
+  result->mReceiverCapabilities = RTCRtpCapabilities::toNative(wrapper->receiverCapabilities);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h
new file mode 100644
index 00000000..9989d7ee
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h
@@ -0,0 +1,44 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionRtpMediaLine : public wrapper::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::RTPMediaLine, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionRtpMediaLine, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionRtpMediaLine, WrapperType);
+            RTCSessionDescriptionRtpMediaLineWeakPtr thisWeak_;
+
+            RTCSessionDescriptionRtpMediaLine();
+            virtual ~RTCSessionDescriptionRtpMediaLine();
+
+            // methods RTCSessionDescriptionMediaLine
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            // methods RTCSessionDescriptionRtpMediaLine
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine(wrapper::org::ortc::adapter::RTCSessionDescriptionRtpMediaLinePtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine(wrapper::org::ortc::JsonPtr json) override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp
new file mode 100644
index 00000000..9ce75b6d
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp
@@ -0,0 +1,121 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h"
+#include "impl_org_ortc_RTCRtpParameters.h"
+#include "impl_org_ortc_Json.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender::RTCSessionDescriptionRtpSender()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSenderPtr wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSender::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender::~RTCSessionDescriptionRtpSender()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender::wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSender()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender::wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSender(wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSenderPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender::wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSender(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSender::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->id = native.mID;
+  pThis->details = RTCSessionDescriptionRtpSenderDetails::toWrapper(native.mDetails);
+  pThis->rtpMediaLineId = native.mRTPMediaLineID;
+  pThis->parameters = RTCRtpParameters::toWrapper(native.mParameters);
+  pThis->mediaStreamTrackId = native.mMediaStreamTrackID;
+  pThis->mediaStreamIds = make_shared< set< String > >(native.mMediaStreamIDs);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mID = wrapper->id;
+  result->mDetails = RTCSessionDescriptionRtpSenderDetails::toNative(wrapper->details);
+  result->mRTPMediaLineID = wrapper->rtpMediaLineId;
+  result->mParameters = RTCRtpParameters::toNative(wrapper->parameters);
+  result->mMediaStreamTrackID = wrapper->mediaStreamTrackId;
+  if (wrapper->mediaStreamIds) {
+    result->mMediaStreamIDs = *(wrapper->mediaStreamIds);
+  }
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h
new file mode 100644
index 00000000..a825859f
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h
@@ -0,0 +1,42 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionRtpSender.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionRtpSender : public wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSender
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::RTPSender, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionRtpSender, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSender, WrapperType);
+            RTCSessionDescriptionRtpSenderWeakPtr thisWeak_;
+
+            RTCSessionDescriptionRtpSender();
+            virtual ~RTCSessionDescriptionRtpSender();
+
+            // methods RTCSessionDescriptionRtpSender
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSender() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSender(wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSenderPtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSender(wrapper::org::ortc::JsonPtr json) override;
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp
new file mode 100644
index 00000000..c8231219
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp
@@ -0,0 +1,108 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::RTCSessionDescriptionRtpSenderDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetailsPtr wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::~RTCSessionDescriptionRtpSenderDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails(wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetailsPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  Helper::optionalSafeIntConvert(native.mInternalRTPMediaLineIndex, pThis->internalRtpMediaLineIndex);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  Helper::optionalSafeIntConvert(wrapper->internalRtpMediaLineIndex, result->mInternalRTPMediaLineIndex);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h
new file mode 100644
index 00000000..d8fcf619
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h
@@ -0,0 +1,42 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionRtpSenderDetails : public wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::RTPSender::Details, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionRtpSenderDetails, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetails, WrapperType);
+            RTCSessionDescriptionRtpSenderDetailsWeakPtr thisWeak_;
+
+            RTCSessionDescriptionRtpSenderDetails();
+            virtual ~RTCSessionDescriptionRtpSenderDetails();
+
+            // methods RTCSessionDescriptionRtpSenderDetails
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails(wrapper::org::ortc::adapter::RTCSessionDescriptionRtpSenderDetailsPtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails(wrapper::org::ortc::JsonPtr json) override;
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp
new file mode 100644
index 00000000..2768e255
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp
@@ -0,0 +1,121 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h"
+#include "impl_org_ortc_RTCSctpCapabilities.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::RTCSessionDescriptionSctpMediaLine()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionSctpMediaLinePtr wrapper::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::~RTCSessionDescriptionSctpMediaLine()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::wrapper_init_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::wrapper_init_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine(wrapper::org::ortc::adapter::RTCSessionDescriptionSctpMediaLinePtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine::wrapper_init_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->id = native.mID;
+  pThis->transportId = native.mTransportID;
+  pThis->mediaType = native.mMediaType;
+  pThis->details = RTCSessionDescriptionMediaLineDetails::toWrapper(native.mDetails);
+  pThis->capabilities = RTCSctpCapabilities::toWrapper(native.mCapabilities);
+  Helper::optionalSafeIntConvert(native.mPort, pThis->port);
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mID = wrapper->id;
+  result->mTransportID = wrapper->transportId;
+  result->mMediaType = wrapper->mediaType;
+  result->mDetails = RTCSessionDescriptionMediaLineDetails::toNative(wrapper->details);
+  result->mCapabilities = RTCSctpCapabilities::toNative(wrapper->capabilities);
+  Helper::optionalSafeIntConvert(wrapper->port, result->mPort);
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h
new file mode 100644
index 00000000..52207108
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h
@@ -0,0 +1,44 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionSctpMediaLine : public wrapper::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::SCTPMediaLine, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionSctpMediaLine, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionSctpMediaLine, WrapperType);
+            RTCSessionDescriptionSctpMediaLineWeakPtr thisWeak_;
+
+            RTCSessionDescriptionSctpMediaLine();
+            virtual ~RTCSessionDescriptionSctpMediaLine();
+
+            // methods RTCSessionDescriptionMediaLine
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            // methods RTCSessionDescriptionSctpMediaLine
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine(wrapper::org::ortc::adapter::RTCSessionDescriptionSctpMediaLinePtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine(wrapper::org::ortc::JsonPtr json) override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp
new file mode 100644
index 00000000..97996491
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp
@@ -0,0 +1,115 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionTransport.h"
+#include "impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport::RTCSessionDescriptionTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionTransportPtr wrapper::org::ortc::adapter::RTCSessionDescriptionTransport::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport::~RTCSessionDescriptionTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport::wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransport()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport::wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransport(wrapper::org::ortc::adapter::RTCSessionDescriptionTransportPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport::wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransport(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement());
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransport::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->transportId = native.mID;
+  pThis->rtp = RTCSessionDescriptionTransportParameters::toWrapper(native.mRTP);
+  pThis->rtcp = RTCSessionDescriptionTransportParameters::toWrapper(native.mRTCP);
+  pThis->useMux = native.mUseMux;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mID = wrapper->transportId;
+  result->mRTP = RTCSessionDescriptionTransportParameters::toNative(wrapper->rtp);
+  result->mRTCP = RTCSessionDescriptionTransportParameters::toNative(wrapper->rtcp);
+  result->mUseMux = wrapper->useMux;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransport.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransport.h
new file mode 100644
index 00000000..08641db7
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransport.h
@@ -0,0 +1,42 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionTransport.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionTransport : public wrapper::org::ortc::adapter::RTCSessionDescriptionTransport
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::Transport, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionTransport, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionTransport, WrapperType);
+            RTCSessionDescriptionTransportWeakPtr thisWeak_;
+
+            RTCSessionDescriptionTransport();
+            virtual ~RTCSessionDescriptionTransport();
+
+            // methods RTCSessionDescriptionTransport
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransport() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransport(wrapper::org::ortc::adapter::RTCSessionDescriptionTransportPtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransport(wrapper::org::ortc::JsonPtr json) override;
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp
new file mode 100644
index 00000000..1b5e08b9
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp
@@ -0,0 +1,132 @@
+
+#include "impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h"
+#include "impl_org_ortc_RTCIceParameters.h"
+#include "impl_org_ortc_RTCDtlsParameters.h"
+#include "impl_org_ortc_RTCSrtpSdesParameters.h"
+#include "impl_org_ortc_RTCIceCandidate.h"
+#include "impl_org_ortc_Json.h"
+#include "impl_org_ortc_Helper.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters::RTCSessionDescriptionTransportParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCSessionDescriptionTransportParametersPtr wrapper::org::ortc::adapter::RTCSessionDescriptionTransportParameters::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters::~RTCSessionDescriptionTransportParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters::wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransportParameters()
+{
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters::wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransportParameters(wrapper::org::ortc::adapter::RTCSessionDescriptionTransportParametersPtr source)
+{
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(toNative(source));
+  if (!wrapper) return;
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+void wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters::wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransportParameters(wrapper::org::ortc::JsonPtr json)
+{
+  if (!json) return;
+
+  WrapperTypePtr pThis = thisWeak_.lock();
+  WrapperTypePtr wrapper = toWrapper(make_shared<NativeType>(Json::toNative(json)));
+  if (!wrapper) return;
+
+  (*pThis) = (*wrapper);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::JsonPtr wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters::toJson()
+{
+  return Json::toWrapper(toNative(thisWeak_.lock())->createElement("RTCSessionDescriptionTransportParameters"));
+}
+
+//------------------------------------------------------------------------------
+String wrapper::impl::org::ortc::adapter::RTCSessionDescriptionTransportParameters::hash()
+{
+  return toNative(thisWeak_.lock())->hash();
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  return toWrapper(*native);
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(const NativeType &native)
+{
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->iceParameters = RTCIceParameters::toWrapper(native.mICEParameters);
+  pThis->dtlsParameters = RTCDtlsParameters::toWrapper(native.mDTLSParameters);
+  pThis->srtpSdesParameters = RTCSrtpSdesParameters::toWrapper(native.mSRTPSDESParameters);
+  pThis->iceCandidates = make_shared< list< wrapper::org::ortc::RTCIceCandidatePtr > >();
+  for (auto iter = native.mICECandidates.begin(); iter != native.mICECandidates.end(); ++iter) {
+    auto wrapper = wrapper::impl::org::ortc::RTCIceCandidate::toWrapper(*iter);
+    if (!wrapper) continue;
+    pThis->iceCandidates->push_back(wrapper);
+  }
+  pThis->endOfCandidates = native.mEndOfCandidates;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto result = make_shared<NativeType>();
+  result->mICEParameters = RTCIceParameters::toNative(wrapper->iceParameters);
+  result->mDTLSParameters = RTCDtlsParameters::toNative(wrapper->dtlsParameters);
+  result->mSRTPSDESParameters = RTCSrtpSdesParameters::toNative(wrapper->srtpSdesParameters);
+  if (wrapper->iceCandidates) {
+    for (auto iter = wrapper->iceCandidates->begin(); iter != wrapper->iceCandidates->end(); ++iter) {
+      auto native = wrapper::impl::org::ortc::RTCIceCandidate::toNative(*iter);
+      if (!native) continue;
+      result->mICECandidates.push_back(native);
+    }
+  }
+  result->mEndOfCandidates = wrapper->endOfCandidates;
+  return result;
+}
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h
new file mode 100644
index 00000000..f187e62b
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h
@@ -0,0 +1,42 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCSessionDescriptionTransportParameters.h"
+
+#include <ortc/adapter/ISessionDescription.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCSessionDescriptionTransportParameters : public wrapper::org::ortc::adapter::RTCSessionDescriptionTransportParameters
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::ISessionDescriptionTypes::Transport::Parameters, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCSessionDescriptionTransportParameters, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCSessionDescriptionTransportParameters, WrapperType);
+            RTCSessionDescriptionTransportParametersWeakPtr thisWeak_;
+
+            RTCSessionDescriptionTransportParameters();
+            virtual ~RTCSessionDescriptionTransportParameters();
+
+            // methods RTCSessionDescriptionTransportParameters
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransportParameters() override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransportParameters(wrapper::org::ortc::adapter::RTCSessionDescriptionTransportParametersPtr source) override;
+            virtual void wrapper_init_org_ortc_adapter_RTCSessionDescriptionTransportParameters(wrapper::org::ortc::JsonPtr json) override;
+            virtual wrapper::org::ortc::JsonPtr toJson() override;
+            virtual String hash() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static WrapperImplTypePtr toWrapper(const NativeType &native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCTrackEvent.cpp b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCTrackEvent.cpp
new file mode 100644
index 00000000..f1cb35db
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCTrackEvent.cpp
@@ -0,0 +1,91 @@
+
+#include "impl_org_ortc_adapter_RTCTrackEvent.h"
+#include "impl_org_ortc_adapter_MediaStream.h"
+#include "impl_org_ortc_MediaStreamTrack.h"
+#include "impl_org_ortc_RTCRtpReceiver.h"
+
+using ::zsLib::String;
+using ::zsLib::Optional;
+using ::zsLib::Any;
+using ::zsLib::AnyPtr;
+using ::zsLib::AnyHolder;
+using ::zsLib::Promise;
+using ::zsLib::PromisePtr;
+using ::zsLib::PromiseWithHolder;
+using ::zsLib::PromiseWithHolderPtr;
+using ::zsLib::eventing::SecureByteBlock;
+using ::zsLib::eventing::SecureByteBlockPtr;
+using ::std::shared_ptr;
+using ::std::weak_ptr;
+using ::std::make_shared;
+using ::std::list;
+using ::std::set;
+using ::std::map;
+
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCTrackEvent::NativeType, NativeType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCTrackEvent::WrapperImplType, WrapperImplType);
+ZS_DECLARE_TYPEDEF_PTR(wrapper::impl::org::ortc::adapter::RTCTrackEvent::WrapperType, WrapperType);
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCTrackEvent::RTCTrackEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::adapter::RTCTrackEventPtr wrapper::org::ortc::adapter::RTCTrackEvent::wrapper_create()
+{
+  auto pThis = make_shared<wrapper::impl::org::ortc::adapter::RTCTrackEvent>();
+  pThis->thisWeak_ = pThis;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+wrapper::impl::org::ortc::adapter::RTCTrackEvent::~RTCTrackEvent()
+{
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::RTCRtpReceiverPtr wrapper::impl::org::ortc::adapter::RTCTrackEvent::get_receiver()
+{
+  return wrapper::impl::org::ortc::RTCRtpReceiver::toWrapper(native_->mReceiver);
+}
+
+//------------------------------------------------------------------------------
+wrapper::org::ortc::MediaStreamTrackPtr wrapper::impl::org::ortc::adapter::RTCTrackEvent::get_track()
+{
+  return wrapper::impl::org::ortc::MediaStreamTrack::toWrapper(native_->mTrack);
+}
+
+//------------------------------------------------------------------------------
+shared_ptr< list< wrapper::org::ortc::adapter::MediaStreamPtr > > wrapper::impl::org::ortc::adapter::RTCTrackEvent::get_mediaStreams()
+{
+  auto result = make_shared< list< wrapper::org::ortc::adapter::MediaStreamPtr > >();
+  for (auto iter = native_->mMediaStreams.begin(); iter != native_->mMediaStreams.end(); ++iter) {
+    auto wrapper = MediaStream::toWrapper(*iter);
+    if (!wrapper) continue;
+    result->push_back(wrapper);
+  }
+  return result;
+}
+
+//------------------------------------------------------------------------------
+WrapperImplTypePtr WrapperImplType::toWrapper(NativeTypePtr native)
+{
+  if (!native) return WrapperImplTypePtr();
+  auto pThis = make_shared<WrapperImplType>();
+  pThis->thisWeak_ = pThis;
+  pThis->native_ = native;
+  return pThis;
+}
+
+//------------------------------------------------------------------------------
+NativeTypePtr WrapperImplType::toNative(WrapperTypePtr wrapper)
+{
+  if (!wrapper) return NativeTypePtr();
+
+  auto impl = std::dynamic_pointer_cast<WrapperImplType>(wrapper);
+  if (!impl) return NativeTypePtr();
+
+  return impl->native_;
+}
+
diff --git a/ortc/idl/wrapper/impl_org_ortc_adapter_RTCTrackEvent.h b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCTrackEvent.h
new file mode 100644
index 00000000..263f2ba5
--- /dev/null
+++ b/ortc/idl/wrapper/impl_org_ortc_adapter_RTCTrackEvent.h
@@ -0,0 +1,40 @@
+
+#pragma once
+
+#include "types.h"
+#include "generated/org_ortc_adapter_RTCTrackEvent.h"
+
+#include <ortc/adapter/IPeerConnection.h>
+
+namespace wrapper {
+  namespace impl {
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          struct RTCTrackEvent : public wrapper::org::ortc::adapter::RTCTrackEvent
+          {
+            ZS_DECLARE_TYPEDEF_PTR(::ortc::adapter::IPeerConnection::MediaStreamTrackEvent, NativeType);
+            ZS_DECLARE_TYPEDEF_PTR(RTCTrackEvent, WrapperImplType);
+            ZS_DECLARE_TYPEDEF_PTR(wrapper::org::ortc::adapter::RTCTrackEvent, WrapperType);
+            RTCTrackEventWeakPtr thisWeak_;
+            NativeTypePtr native_;
+
+            RTCTrackEvent();
+            virtual ~RTCTrackEvent();
+
+            // properties RTCTrackEvent
+            virtual wrapper::org::ortc::RTCRtpReceiverPtr get_receiver() override;
+            virtual wrapper::org::ortc::MediaStreamTrackPtr get_track() override;
+            virtual shared_ptr< list< wrapper::org::ortc::adapter::MediaStreamPtr > > get_mediaStreams() override;
+
+            static WrapperImplTypePtr toWrapper(NativeTypePtr native);
+            static NativeTypePtr toNative(WrapperTypePtr wrapper);
+          };
+
+        } // adapter
+      } // ortc
+    } // org
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/idl/wrapper/types.h b/ortc/idl/wrapper/types.h
new file mode 100644
index 00000000..7adc0b51
--- /dev/null
+++ b/ortc/idl/wrapper/types.h
@@ -0,0 +1,187 @@
+// Generated by zsLibEventingTool
+
+#pragma once
+
+#include "generated/types.h"
+
+namespace wrapper {
+  namespace impl {
+
+    namespace org {
+      namespace ortc {
+        namespace adapter {
+
+          ZS_DECLARE_STRUCT_PTR(MediaStream);
+          ZS_DECLARE_STRUCT_PTR(RTCAnswerOptions);
+          ZS_DECLARE_STRUCT_PTR(RTCCapabilityOptions);
+          ZS_DECLARE_STRUCT_PTR(RTCConfiguration);
+          ZS_DECLARE_STRUCT_PTR(RTCIceCandidate);
+          ZS_DECLARE_STRUCT_PTR(RTCMediaStreamTrackConfiguration);
+          ZS_DECLARE_STRUCT_PTR(RTCOfferAnswerOptions);
+          ZS_DECLARE_STRUCT_PTR(RTCOfferOptions);
+          ZS_DECLARE_STRUCT_PTR(RTCPeerConnection);
+          ZS_DECLARE_STRUCT_PTR(RTCPeerConnectionIceErrorEvent);
+          ZS_DECLARE_STRUCT_PTR(RTCPeerConnectionIceEvent);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescription);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionConnectionData);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionConnectionDataDetails);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionDescription);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionDescriptionDetails);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionMediaLine);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionMediaLineDetails);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionRtpMediaLine);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionRtpSender);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionRtpSenderDetails);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionSctpMediaLine);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionTransport);
+          ZS_DECLARE_STRUCT_PTR(RTCSessionDescriptionTransportParameters);
+          ZS_DECLARE_STRUCT_PTR(RTCTrackEvent);
+
+        } // namespace adapter
+
+        namespace log {
+        } // namespace log
+
+        ZS_DECLARE_STRUCT_PTR(ConstrainBoolean);
+        ZS_DECLARE_STRUCT_PTR(ConstrainBooleanParameters);
+        ZS_DECLARE_STRUCT_PTR(ConstrainDouble);
+        ZS_DECLARE_STRUCT_PTR(ConstrainDoubleRange);
+        ZS_DECLARE_STRUCT_PTR(ConstrainLong);
+        ZS_DECLARE_STRUCT_PTR(ConstrainLongRange);
+        ZS_DECLARE_STRUCT_PTR(ConstrainString);
+        ZS_DECLARE_STRUCT_PTR(ConstrainStringParameters);
+        ZS_DECLARE_STRUCT_PTR(Dispatcher);
+        ZS_DECLARE_STRUCT_PTR(DoubleRange);
+        ZS_DECLARE_STRUCT_PTR(Error);
+        ZS_DECLARE_STRUCT_PTR(ErrorEvent);
+        ZS_DECLARE_STRUCT_PTR(Json);
+        ZS_DECLARE_STRUCT_PTR(Logger);
+        ZS_DECLARE_STRUCT_PTR(LongRange);
+        ZS_DECLARE_STRUCT_PTR(MediaControl);
+        ZS_DECLARE_STRUCT_PTR(MediaDeviceInfo);
+        ZS_DECLARE_STRUCT_PTR(MediaDevices);
+        ZS_DECLARE_STRUCT_PTR(MediaSource);
+        ZS_DECLARE_STRUCT_PTR(MediaStreamConstraints);
+        ZS_DECLARE_STRUCT_PTR(MediaStreamTrack);
+        ZS_DECLARE_STRUCT_PTR(MediaTrackCapabilities);
+        ZS_DECLARE_STRUCT_PTR(MediaTrackConstraintSet);
+        ZS_DECLARE_STRUCT_PTR(MediaTrackConstraints);
+        ZS_DECLARE_STRUCT_PTR(MediaTrackSettings);
+        ZS_DECLARE_STRUCT_PTR(MediaTrackSupportedConstraints);
+        ZS_DECLARE_STRUCT_PTR(MessageQueue);
+        ZS_DECLARE_STRUCT_PTR(OrtcLib);
+        ZS_DECLARE_STRUCT_PTR(OrtcLibWithDispatcher);
+        ZS_DECLARE_STRUCT_PTR(OverconstrainedError);
+        ZS_DECLARE_STRUCT_PTR(OverconstrainedErrorEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCCertificate);
+        ZS_DECLARE_STRUCT_PTR(RTCCertificateStats);
+        ZS_DECLARE_STRUCT_PTR(RTCCodec);
+        ZS_DECLARE_STRUCT_PTR(RTCDataChannel);
+        ZS_DECLARE_STRUCT_PTR(RTCDataChannelEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCDataChannelParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCDataChannelStateChangeEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCDataChannelStats);
+        ZS_DECLARE_STRUCT_PTR(RTCDataTransport);
+        ZS_DECLARE_STRUCT_PTR(RTCDtlsCertificateBinary);
+        ZS_DECLARE_STRUCT_PTR(RTCDtlsFingerprint);
+        ZS_DECLARE_STRUCT_PTR(RTCDtlsParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCDtlsTransport);
+        ZS_DECLARE_STRUCT_PTR(RTCDtlsTransportStateChangeEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCDtlsTransportStats);
+        ZS_DECLARE_STRUCT_PTR(RTCDtmfSender);
+        ZS_DECLARE_STRUCT_PTR(RTCDtmfToneChangeEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCIceCandidate);
+        ZS_DECLARE_STRUCT_PTR(RTCIceCandidateAttributes);
+        ZS_DECLARE_STRUCT_PTR(RTCIceCandidateComplete);
+        ZS_DECLARE_STRUCT_PTR(RTCIceCandidatePair);
+        ZS_DECLARE_STRUCT_PTR(RTCIceCandidatePairChangeEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCIceCandidatePairStats);
+        ZS_DECLARE_STRUCT_PTR(RTCIceGatherInterfacePolicy);
+        ZS_DECLARE_STRUCT_PTR(RTCIceGatherOptions);
+        ZS_DECLARE_STRUCT_PTR(RTCIceGatherer);
+        ZS_DECLARE_STRUCT_PTR(RTCIceGathererCandidate);
+        ZS_DECLARE_STRUCT_PTR(RTCIceGathererCandidateCompleteEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCIceGathererCandidateEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCIceGathererIceErrorEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCIceGathererStateChangeEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCIceGathererStats);
+        ZS_DECLARE_STRUCT_PTR(RTCIceParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCIceServer);
+        ZS_DECLARE_STRUCT_PTR(RTCIceTransport);
+        ZS_DECLARE_STRUCT_PTR(RTCIceTransportController);
+        ZS_DECLARE_STRUCT_PTR(RTCIceTransportOptions);
+        ZS_DECLARE_STRUCT_PTR(RTCIceTransportStateChangeEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCIceTransportStats);
+        ZS_DECLARE_STRUCT_PTR(RTCIdentity);
+        ZS_DECLARE_STRUCT_PTR(RTCIdentityAssertion);
+        ZS_DECLARE_STRUCT_PTR(RTCIdentityError);
+        ZS_DECLARE_STRUCT_PTR(RTCIdentityResult);
+        ZS_DECLARE_STRUCT_PTR(RTCInboundRtpStreamStats);
+        ZS_DECLARE_STRUCT_PTR(RTCMediaStreamStats);
+        ZS_DECLARE_STRUCT_PTR(RTCMediaStreamTrackStats);
+        ZS_DECLARE_STRUCT_PTR(RTCMessageEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCOutboundRtpStreamStats);
+        ZS_DECLARE_STRUCT_PTR(RTCRtcpFeedback);
+        ZS_DECLARE_STRUCT_PTR(RTCRtcpParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtcpTransport);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpCapabilities);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpCodecCapability);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpCodecCapabilityOptions);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpCodecCapabilityParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpCodecParameterSettings);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpCodecParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpContributingSource);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpEncodingParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpFecParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpFlexFecCodecCapabilityParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpFlexFecCodecParameterSettings);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpH264CodecCapabilityParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpH264CodecParameterSettings);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpHeaderExtension);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpHeaderExtensionParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpListener);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpOpusCodecCapabilityOptions);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpOpusCodecCapabilityParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpOpusCodecParameterSettings);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpReceiver);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpRedCodecParameterSettings);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpRtxCodecCapabilityParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpRtxCodecParameterSettings);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpRtxParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpSender);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpStreamStats);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpTransport);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpUnhandledEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpVp8CodecCapabilityParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCRtpVp8CodecParameterSettings);
+        ZS_DECLARE_STRUCT_PTR(RTCSctpCapabilities);
+        ZS_DECLARE_STRUCT_PTR(RTCSctpTransport);
+        ZS_DECLARE_STRUCT_PTR(RTCSctpTransportListener);
+        ZS_DECLARE_STRUCT_PTR(RTCSctpTransportListenerEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCSctpTransportStateChangeEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCSctpTransportStats);
+        ZS_DECLARE_STRUCT_PTR(RTCSrtpSdesCryptoParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCSrtpSdesKeyParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCSrtpSdesParameters);
+        ZS_DECLARE_STRUCT_PTR(RTCSrtpSdesTransport);
+        ZS_DECLARE_STRUCT_PTR(RTCSrtpSdesTransportLifetimeRemainingEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCSrtpTransportStats);
+        ZS_DECLARE_STRUCT_PTR(RTCSsrcConflictEvent);
+        ZS_DECLARE_STRUCT_PTR(RTCStats);
+        ZS_DECLARE_STRUCT_PTR(RTCStatsProvider);
+        ZS_DECLARE_STRUCT_PTR(RTCStatsReport);
+        ZS_DECLARE_STRUCT_PTR(RTCStatsTypeSet);
+        ZS_DECLARE_STRUCT_PTR(Settings);
+        ZS_DECLARE_STRUCT_PTR(StringOrStringList);
+
+      } // namespace ortc
+    } // namespace org
+
+    namespace zs {
+      namespace exceptions {
+      } // namespace exceptions
+    } // namespace zs
+  } // namespace impl
+} // namespace wrapper
+
diff --git a/ortc/internal/ortc.h b/ortc/internal/ortc.h
index 9251f503..ad34c417 100644
--- a/ortc/internal/ortc.h
+++ b/ortc/internal/ortc.h
@@ -37,26 +37,39 @@
 #include <ortc/internal/ortc_ORTC.h>
 #include <ortc/internal/ortc_Helper.h>
 #include <ortc/internal/ortc_Certificate.h>
+#include <ortc/internal/ortc_DataChannel.h>
 #include <ortc/internal/ortc_DTLSTransport.h>
 #include <ortc/internal/ortc_ICEGatherer.h>
 #include <ortc/internal/ortc_ICEGathererRouter.h>
 #include <ortc/internal/ortc_ICETransport.h>
 #include <ortc/internal/ortc_ICETransportController.h>
+#include <ortc/internal/ortc_IMediaDevice.h>
+#include <ortc/internal/ortc_IMediaDeviceCapture.h>
+#include <ortc/internal/ortc_IMediaDeviceRender.h>
+#include <ortc/internal/ortc_IMediaStreamTrack.h>
+#include <ortc/internal/ortc_IMediaStreamTrackChannel.h>
+#include <ortc/internal/ortc_IMediaStreamTrackMonitor.h>
+#include <ortc/internal/ortc_IMediaStreamTrackSubscriber.h>
+#include <ortc/internal/ortc_IRTP.h>
+#include <ortc/internal/ortc_IRTPDecoder.h>
+#include <ortc/internal/ortc_IRTPEncoder.h>
+#include <ortc/internal/ortc_ISecureTransport.h>
+#include <ortc/internal/ortc_ISRTPTransport.h>
+#include <ortc/internal/ortc_MediaDeviceCaptureAudio.h>
+#include <ortc/internal/ortc_MediaDeviceCaptureVideo.h>
+#include <ortc/internal/ortc_MediaDeviceRenderAudio.h>
 #include <ortc/internal/ortc_MediaDevices.h>
+#include <ortc/internal/ortc_MediaEngine.h>
+#include <ortc/internal/ortc_MediaStreamTrack.h>
+#include <ortc/internal/ortc_MediaStreamTrackChannel.h>
+#include <ortc/internal/ortc_MediaStreamTrackSubscriberMedia.h>
+#include <ortc/internal/ortc_MediaStreamTrackSubscriberRTP.h>
+#include <ortc/internal/ortc_MediaChannelTraceHelper.h>
 #include <ortc/internal/ortc_RTPListener.h>
-#include <ortc/internal/ortc_RTPMediaEngine.h>
 #include <ortc/internal/ortc_RTPReceiver.h>
 #include <ortc/internal/ortc_RTPReceiverChannel.h>
-#include <ortc/internal/ortc_RTPReceiverChannelMediaBase.h>
-#include <ortc/internal/ortc_RTPReceiverChannelAudio.h>
-#include <ortc/internal/ortc_RTPReceiverChannelVideo.h>
 #include <ortc/internal/ortc_RTPSender.h>
 #include <ortc/internal/ortc_RTPSenderChannel.h>
-#include <ortc/internal/ortc_RTPSenderChannelMediaBase.h>
-#include <ortc/internal/ortc_RTPSenderChannelAudio.h>
-#include <ortc/internal/ortc_RTPSenderChannelVideo.h>
 #include <ortc/internal/ortc_SCTPTransport.h>
-#include <ortc/internal/ortc_ISecureTransport.h>
 #include <ortc/internal/ortc_SRTPSDESTransport.h>
-#include <ortc/internal/ortc_ISRTPTransport.h>
 #include <ortc/internal/ortc_SRTPTransport.h>
diff --git a/ortc/internal/ortcEvents.h b/ortc/internal/ortcEvents.h
new file mode 100644
index 00000000..52141918
--- /dev/null
+++ b/ortc/internal/ortcEvents.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include <zsLib/eventing/noop.h>
+#ifdef _WIN32
+
+#include "ortc.events_win.h"
+
+#else
+
+#include <zsLib/eventing/Log.h>
+#include <stdint.h>
+
+namespace zsLib {
+  namespace eventing {
+    
+    template <typename TWriteType>
+    void eventWriteBuffer(BYTE * &p, TWriteType value)
+    {
+      memcpy(&p, &value, sizeof(value));
+      p += sizeof(value);
+    }
+    inline void eventWriteBuffer(BYTE ** &p, const BYTE *buffer, size_t * &bufferSizes, size_t size)
+    {
+      (*p) = const_cast<BYTE *>(buffer);
+      (*bufferSizes) = size;
+      ++p;
+      ++bufferSizes;
+    }
+    inline void eventWriteBuffer(BYTE ** &p, const char *str, size_t * &bufferSizes)
+    {
+      (*p) = const_cast<BYTE *>(reinterpret_cast<const BYTE *>(str));
+      (*bufferSizes) = (NULL == str ? 0 : strlen(str)) * sizeof(char);
+      ++p;
+      ++bufferSizes;
+    }
+    inline void eventWriteBuffer(const BYTE ** &p, const wchar_t *str, size_t * &bufferSizes)
+    {
+      (*p) = reinterpret_cast<const BYTE *>(str);
+      (*bufferSizes) = (NULL == str ? 0 : wcslen(str)) * sizeof(wchar_t);
+      ++p;
+      ++bufferSizes;
+    }
+  }
+}
+#endif // _WIN32
diff --git a/ortc/internal/ortc_Certificate.h b/ortc/internal/ortc_Certificate.h
index a8a44faf..96729873 100644
--- a/ortc/internal/ortc_Certificate.h
+++ b/ortc/internal/ortc_Certificate.h
@@ -164,11 +164,11 @@ namespace ortc
 
       static PromiseWithCertificatePtr generateCertificate(ElementPtr keygenAlgorithm) throw (NotSupportedError);
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual Time expires() const override;
+      Time expires() const override;
 
-      virtual FingerprintPtr fingerprint() const override;
+      FingerprintPtr fingerprint() const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -177,10 +177,10 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const;
 
-      virtual KeyPairType getKeyPair() const override;
-      virtual CertificateObjectType getCertificate() const override;
+      KeyPairType getKeyPair() const override;
+      CertificateObjectType getCertificate() const override;
 
-      virtual SecureByteBlockPtr getDigest(const String &algorithm) const override;
+      SecureByteBlockPtr getDigest(const String &algorithm) const override;
 
       // (duplicate) virtual FingerprintPtr fingerprint() const override;
 
@@ -194,14 +194,14 @@ namespace ortc
       #pragma mark Certificate => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark Certificate => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
     public:
       //-----------------------------------------------------------------------
diff --git a/ortc/internal/ortc_DTLSTransport.h b/ortc/internal/ortc_DTLSTransport.h
index 47bb3172..61661931 100644
--- a/ortc/internal/ortc_DTLSTransport.h
+++ b/ortc/internal/ortc_DTLSTransport.h
@@ -199,7 +199,7 @@ namespace ortc
       #pragma mark DTLSTransport => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -217,26 +217,26 @@ namespace ortc
       static DTLSTransportPtr convert(IRTPTransportPtr rtpTransport);
       static DTLSTransportPtr convert(IRTCPTransportPtr rtcpTransport);
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual IDTLSTransportSubscriptionPtr subscribe(IDTLSTransportDelegatePtr delegate) override;
+      IDTLSTransportSubscriptionPtr subscribe(IDTLSTransportDelegatePtr delegate) override;
 
-      virtual CertificateListPtr certificates() const override;
-      virtual IICETransportPtr transport() const override;
+      CertificateListPtr certificates() const override;
+      IICETransportPtr transport() const override;
 
-      virtual States state() const override;
+      States state() const override;
 
-      virtual ParametersPtr getLocalParameters() const override;
-      virtual ParametersPtr getRemoteParameters() const override;
+      ParametersPtr getLocalParameters() const override;
+      ParametersPtr getRemoteParameters() const override;
 
-      virtual SecureByteBlockListPtr getRemoteCertificates() const override;
+      SecureByteBlockListPtr getRemoteCertificates() const override;
 
       virtual void start(const Parameters &remoteParameters) throw (
                                                                     InvalidStateError,
                                                                     InvalidParameters
                                                                     ) override;
 
-      virtual void stop() override;
+      void stop() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -263,7 +263,7 @@ namespace ortc
                               size_t bufferLengthInBytes
                               ) override;
 
-      virtual IICETransportPtr getICETransport() const override;
+      IICETransportPtr getICETransport() const override;
 
 
       //-----------------------------------------------------------------------
@@ -340,7 +340,7 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual RTPListenerPtr getListener() const override;
+      RTPListenerPtr getListener() const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -351,13 +351,13 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual ISecureTransportSubscriptionPtr subscribe(ISecureTransportDelegatePtr delegate) override;
+      ISecureTransportSubscriptionPtr subscribe(ISecureTransportDelegatePtr delegate) override;
 
-      virtual ISecureTransportTypes::States state(ISecureTransportTypes::States ignored) const override;
+      ISecureTransportTypes::States state(ISecureTransportTypes::States ignored) const override;
 
-      virtual bool isClientRole() const override;
+      bool isClientRole() const override;
 
-      virtual UseDataTransportPtr getDataTransport() const override;
+      UseDataTransportPtr getDataTransport() const override;
 
       virtual bool sendDataPacket(
                                   const BYTE *buffer,
@@ -369,45 +369,45 @@ namespace ortc
       #pragma mark DTLSTransport => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark DTLSTransport => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark DTLSTransport => IDTLSTransportAsyncDelegate
       #pragma mark
 
-      virtual void onAdapterSendPacket() override;
-      virtual void onDeliverPendingIncomingRTP() override;
+      void onAdapterSendPacket() override;
+      void onDeliverPendingIncomingRTP() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark DTLSTransport => IICETransportDelegate
       #pragma mark
 
-      virtual void onICETransportStateChange(
-                                             IICETransportPtr transport,
-                                             IICETransport::States state
-                                             ) override;
-
-      virtual void onICETransportCandidatePairAvailable(
-                                                        IICETransportPtr transport,
-                                                        CandidatePairPtr candidatePair
-                                                        ) override;
-      virtual void onICETransportCandidatePairGone(
-                                                   IICETransportPtr transport,
-                                                   CandidatePairPtr candidatePair
-                                                   ) override;
-      virtual void onICETransportCandidatePairChanged(
-                                                      IICETransportPtr transport,
-                                                      CandidatePairPtr candidatePair
-                                                      ) override;
+      void onICETransportStateChange(
+                                     IICETransportPtr transport,
+                                     IICETransport::States state
+                                     ) override;
+
+      void onICETransportCandidatePairAvailable(
+                                                IICETransportPtr transport,
+                                                CandidatePairPtr candidatePair
+                                                ) override;
+      void onICETransportCandidatePairGone(
+                                           IICETransportPtr transport,
+                                           CandidatePairPtr candidatePair
+                                           ) override;
+      void onICETransportCandidatePairChanged(
+                                              IICETransportPtr transport,
+                                              CandidatePairPtr candidatePair
+                                              ) override;
 
 
       //-----------------------------------------------------------------------
diff --git a/ortc/internal/ortc_DTMFSender.h b/ortc/internal/ortc_DTMFSender.h
index 21369a53..d6fcda51 100644
--- a/ortc/internal/ortc_DTMFSender.h
+++ b/ortc/internal/ortc_DTMFSender.h
@@ -128,26 +128,26 @@ namespace ortc
                                   IRTPSenderPtr sender
                                   );
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual IDTMFSenderSubscriptionPtr subscribe(IDTMFSenderDelegatePtr delegate) override;
+      IDTMFSenderSubscriptionPtr subscribe(IDTMFSenderDelegatePtr delegate) override;
 
-      virtual bool canInsertDTMF() const override;
+      bool canInsertDTMF() const override;
 
-      virtual void insertDTMF(
-                              const char *tones,
-                              Milliseconds duration = Milliseconds(70),
-                              Milliseconds interToneGap = Milliseconds(70)
-                              ) throw (
-                                       InvalidStateError,
-                                       InvalidCharacterError
-                                       ) override;
+      void insertDTMF(
+                      const char *tones,
+                      Milliseconds duration = Milliseconds(70),
+                      Milliseconds interToneGap = Milliseconds(70)
+                      ) throw (
+                               InvalidStateError,
+                               InvalidCharacterError
+                               ) override;
 
-      virtual IRTPSenderPtr sender() const override;
+      IRTPSenderPtr sender() const override;
 
-      virtual String toneBuffer() const override;
-      virtual Milliseconds duration() const override;
-      virtual Milliseconds interToneGap() const override;
+      String toneBuffer() const override;
+      Milliseconds duration() const override;
+      Milliseconds interToneGap() const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -163,17 +163,17 @@ namespace ortc
       #pragma mark DTMFSender => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark DTMFSender => IDTMFSenderDelegate
       #pragma mark
 
-      virtual void onDTMFSenderToneChanged(
-                                           IDTMFSenderPtr sender,
-                                           String tone
-                                           ) override;
+      void onDTMFSenderToneChanged(
+                                   IDTMFSenderPtr sender,
+                                   String tone
+                                   ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
diff --git a/ortc/internal/ortc_DataChannel.h b/ortc/internal/ortc_DataChannel.h
index f6bba105..1e16cde0 100644
--- a/ortc/internal/ortc_DataChannel.h
+++ b/ortc/internal/ortc_DataChannel.h
@@ -86,6 +86,8 @@ namespace ortc
 
       virtual void requestShutdown() = 0;
       virtual void notifyClosed() = 0;
+
+      virtual void notifyRemapFailure() = 0;
     };
 
     //-------------------------------------------------------------------------
@@ -100,6 +102,7 @@ namespace ortc
     {
       virtual void onRequestShutdown() = 0;
       virtual void onNotifiedClosed() = 0;
+      virtual void onNotifiedRemapFailure() = 0;
     };
   }
 }
@@ -107,6 +110,7 @@ namespace ortc
 ZS_DECLARE_PROXY_BEGIN(ortc::internal::IDataChannelAsyncDelegate)
 ZS_DECLARE_PROXY_METHOD_0(onRequestShutdown)
 ZS_DECLARE_PROXY_METHOD_0(onNotifiedClosed)
+ZS_DECLARE_PROXY_METHOD_0(onNotifiedRemapFailure)
 ZS_DECLARE_PROXY_END()
 
 namespace ortc
@@ -189,38 +193,38 @@ namespace ortc
                                    const Parameters &params
                                    );
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual IDataChannelSubscriptionPtr subscribe(IDataChannelDelegatePtr delegate) override;
+      IDataChannelSubscriptionPtr subscribe(IDataChannelDelegatePtr delegate) override;
 
-      virtual IDataTransportPtr transport() const override;
+      IDataTransportPtr transport() const override;
 
-      virtual ParametersPtr parameters() const override;
+      ParametersPtr parameters() const override;
 
-      virtual States readyState() const override;
+      States readyState() const override;
 
-      virtual size_t bufferedAmount() const override;
-      virtual size_t bufferedAmountLowThreshold() const override;
-      virtual void bufferedAmountLowThreshold(size_t value) override;
+      size_t bufferedAmount() const override;
+      size_t bufferedAmountLowThreshold() const override;
+      void bufferedAmountLowThreshold(size_t value) override;
 
-      virtual String binaryType() const override;
-      virtual void binaryType(const char *str) override;
+      String binaryType() const override;
+      void binaryType(const char *str) override;
 
-      virtual void close() override;
+      void close() override;
 
-      virtual void send(const String &data) override;
-      virtual void send(const SecureByteBlock &data) override;
-      virtual void send(
-                        const BYTE *buffer,
-                        size_t bufferSizeInBytes
-                        ) override;
+      void send(const String &data) override;
+      void send(const SecureByteBlock &data) override;
+      void send(
+                const BYTE *buffer,
+                size_t bufferSizeInBytes
+                ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark DataChannel => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -236,41 +240,44 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual bool isIncoming() const override {return mIncoming;}
+      bool isIncoming() const override {return mIncoming;}
+
+      bool handleSCTPPacket(SCTPPacketIncomingPtr packet) override;
 
-      virtual bool handleSCTPPacket(SCTPPacketIncomingPtr packet) override;
+      void requestShutdown() override;
+      void notifyClosed() override;
 
-      virtual void requestShutdown() override;
-      virtual void notifyClosed() override;
+      void notifyRemapFailure() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark DataChannel => ISCTPTransportForDataChannelDelegate
       #pragma mark
       
-      virtual void onSCTPTransportStateChanged() override;
+      void onSCTPTransportStateChanged() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark DataChannel => IDataChannelAsyncDelegate
       #pragma mark
 
-      virtual void onRequestShutdown() override;
-      virtual void onNotifiedClosed() override;
+      void onRequestShutdown() override;
+      void onNotifiedClosed() override;
+      void onNotifiedRemapFailure() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark DataChannel => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
       
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark DataChannel => IPromiseSettledDelegate
       #pragma mark
 
-      virtual void onPromiseSettled(PromisePtr promise) override;
+      void onPromiseSettled(PromisePtr promise) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
diff --git a/ortc/internal/ortc_ICEGatherer.h b/ortc/internal/ortc_ICEGatherer.h
index a99a21c2..718421cb 100644
--- a/ortc/internal/ortc_ICEGatherer.h
+++ b/ortc/internal/ortc_ICEGatherer.h
@@ -364,7 +364,7 @@ namespace ortc
       #pragma mark ICEGatherer => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -378,21 +378,21 @@ namespace ortc
                                    const Options &options
                                    );
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual IICEGathererSubscriptionPtr subscribe(IICEGathererDelegatePtr delegate) override;
+      IICEGathererSubscriptionPtr subscribe(IICEGathererDelegatePtr delegate) override;
 
-      virtual Components component() const override;
-      virtual States state() const override;
+      Components component() const override;
+      States state() const override;
 
-      virtual ParametersPtr getLocalParameters() const override;
-      virtual CandidateListPtr getLocalCandidates() const override;
+      ParametersPtr getLocalParameters() const override;
+      CandidateListPtr getLocalCandidates() const override;
 
-      virtual IICEGathererPtr createAssociatedGatherer(IICEGathererDelegatePtr delegate) throw(InvalidStateError) override;
+      IICEGathererPtr createAssociatedGatherer(IICEGathererDelegatePtr delegate) throw(InvalidStateError) override;
 
-      virtual void gather(const Optional<Options> &options = Optional<Options>()) override;
+      void gather(const Optional<Options> &options = Optional<Options>()) override;
 
-      virtual void close() override;
+      void close() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -404,126 +404,126 @@ namespace ortc
       // (duplicate) virtual Components component() const = 0;
       // (duplicate) virtual States state() const = 0;
 
-      virtual void installTransport(
-                                    ICETransportPtr transport,
-                                    const String &remoteUFrag
-                                    ) override;
-      virtual void notifyTransportStateChange(ICETransportPtr transport) override;
-      virtual void removeTransport(ICETransport &transport) override;
+      void installTransport(
+                            ICETransportPtr transport,
+                            const String &remoteUFrag
+                            ) override;
+      void notifyTransportStateChange(ICETransportPtr transport) override;
+      void removeTransport(ICETransport &transport) override;
 
-      virtual ForICETransportPtr getRTCPGatherer() const override;
+      ForICETransportPtr getRTCPGatherer() const override;
 
       // (duplicate) virtual IICEGathererSubscriptionPtr subscribe(IICEGathererDelegatePtr delegate) = 0;
       // (duplicate) virtual CandidateListPtr getLocalCandidates() const = 0;
 
-      virtual bool isContinousGathering() const override;
-      virtual String getUsernameFrag() const override {return mUsernameFrag;}
-      virtual String getPassword() const override {return mPassword;}
+      bool isContinousGathering() const override;
+      String getUsernameFrag() const override {return mUsernameFrag;}
+      String getPassword() const override {return mPassword;}
 
-      virtual ICEGathererRouterPtr getGathererRouter() const override;
+      ICEGathererRouterPtr getGathererRouter() const override;
 
-      virtual void removeRoute(RouterRoutePtr routerRoute) override;
-      virtual void remoteAllRelatedRoutes(ICETransport &transport) override;
+      void removeRoute(RouterRoutePtr routerRoute) override;
+      void remoteAllRelatedRoutes(ICETransport &transport) override;
 
-      virtual bool sendPacket(
-                              UseICETransport &transport,
-                              RouterRoutePtr routerRoute,
-                              const BYTE *buffer,
-                              size_t bufferSizeInBytes
-                              ) override;
+      bool sendPacket(
+                      UseICETransport &transport,
+                      RouterRoutePtr routerRoute,
+                      const BYTE *buffer,
+                      size_t bufferSizeInBytes
+                      ) override;
 
-      virtual void notifyLikelyReflexiveActivity(RouterRoutePtr routerRoute) override;
+      void notifyLikelyReflexiveActivity(RouterRoutePtr routerRoute) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICEGatherer => IGathererAsyncDelegate
       #pragma mark
 
-      virtual void onNotifyDeliverRouteBufferedPackets(
-                                                       UseICETransportPtr transport,
-                                                       PUID routerRouteID
-                                                       ) override;
+      void onNotifyDeliverRouteBufferedPackets(
+                                               UseICETransportPtr transport,
+                                               PUID routerRouteID
+                                               ) override;
 
-      virtual void onResolveStatsPromise(IStatsProvider::PromiseWithStatsReportPtr promise) override;
+      void onResolveStatsPromise(IStatsProvider::PromiseWithStatsReportPtr promise) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICEGatherer => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICEGatherer => IDNSDelegate
       #pragma mark
 
-      virtual void onLookupCompleted(IDNSQueryPtr query) override;
+      void onLookupCompleted(IDNSQueryPtr query) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICEGatherer => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICEGatherer => ISocketDelegate
       #pragma mark
 
-      virtual void onReadReady(SocketPtr socket) override;
-      virtual void onWriteReady(SocketPtr socket) override;
-      virtual void onException(SocketPtr socket) override;
+      void onReadReady(SocketPtr socket) override;
+      void onWriteReady(SocketPtr socket) override;
+      void onException(SocketPtr socket) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICEGatherer => IBackOffDelegate
       #pragma mark
 
-      virtual void onBackOffTimerStateChanged(
-                                              IBackOffTimerPtr timer,
-                                              IBackOffTimer::States state
-                                              ) override;
+      void onBackOffTimerStateChanged(
+                                      IBackOffTimerPtr timer,
+                                      IBackOffTimer::States state
+                                      ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICEGatherer => ISTUNDiscoveryDelegate
       #pragma mark
 
-      virtual void onSTUNDiscoverySendPacket(
-                                             ISTUNDiscoveryPtr discovery,
-                                             IPAddress destination,
-                                             SecureByteBlockPtr packet
-                                             ) override;
+      void onSTUNDiscoverySendPacket(
+                                     ISTUNDiscoveryPtr discovery,
+                                     IPAddress destination,
+                                     SecureByteBlockPtr packet
+                                     ) override;
 
-      virtual void onSTUNDiscoveryCompleted(ISTUNDiscoveryPtr discovery) override;
+      void onSTUNDiscoveryCompleted(ISTUNDiscoveryPtr discovery) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICEGatherer => ITURNSocketDelegate
       #pragma mark
 
-      virtual void onTURNSocketStateChanged(
-                                            ITURNSocketPtr socket,
-                                            TURNSocketStates state
-                                            ) override;
+      void onTURNSocketStateChanged(
+                                    ITURNSocketPtr socket,
+                                    TURNSocketStates state
+                                    ) override;
 
-      virtual void handleTURNSocketReceivedPacket(
-                                                  ITURNSocketPtr socket,
-                                                  IPAddress source,
-                                                  const BYTE *packet,
-                                                  size_t packetLengthInBytes
-                                                  ) override;
+      void handleTURNSocketReceivedPacket(
+                                          ITURNSocketPtr socket,
+                                          IPAddress source,
+                                          const BYTE *packet,
+                                          size_t packetLengthInBytes
+                                          ) override;
 
-      virtual bool notifyTURNSocketSendPacket(
-                                              ITURNSocketPtr socket,
-                                              IPAddress destination,
-                                              const BYTE *packet,
-                                              size_t packetLengthInBytes
-                                              ) override;
+      bool notifyTURNSocketSendPacket(
+                                      ITURNSocketPtr socket,
+                                      IPAddress destination,
+                                      const BYTE *packet,
+                                      size_t packetLengthInBytes
+                                      ) override;
 
-      virtual void onTURNSocketWriteReady(ITURNSocketPtr socket) override;
+      void onTURNSocketWriteReady(ITURNSocketPtr socket) override;
 
 
     public:
@@ -868,7 +868,10 @@ namespace ortc
         RelayPortPtr mRelayPort;  // send via relay port
         TCPPortPtr mTCPPort;      // send via TCP socket
 
-        void trace(const char *function, const char *message = NULL) const;
+        void trace(
+                   const char *function = NULL,
+                   const char *message = NULL
+                   ) const;
         ElementPtr toDebug() const;
       };
 
@@ -942,7 +945,7 @@ namespace ortc
       bool stepCalculateOptionsHash();
       bool stepResolveHostIPs();
       bool stepGetHostIPs();
-      void stepGetHostIPs_WinRT();
+      void stepGetHostIPs_WinUWP();
       void stepGetHostIPs_Win32();
       void stepGetHostIPs_ifaddr();
       bool stepCalculateHostsHash();
diff --git a/ortc/internal/ortc_ICEGathererRouter.h b/ortc/internal/ortc_ICEGathererRouter.h
index e84d5d63..e1e2e716 100644
--- a/ortc/internal/ortc_ICEGathererRouter.h
+++ b/ortc/internal/ortc_ICEGathererRouter.h
@@ -130,7 +130,10 @@ namespace ortc
         CandidatePtr mLocalCandidate;
         IPAddress mRemoteIP;
 
-        void trace(const char *function, const char *message = NULL) const;
+        void trace(
+                   const char *function = NULL,
+                   const char *message = NULL
+                   ) const;
         ElementPtr toDebug() const;
       };
 
diff --git a/ortc/internal/ortc_ICETransport.h b/ortc/internal/ortc_ICETransport.h
index ea44bd8e..a112cb8f 100644
--- a/ortc/internal/ortc_ICETransport.h
+++ b/ortc/internal/ortc_ICETransport.h
@@ -336,7 +336,7 @@ namespace ortc
       #pragma mark ICETransport => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -350,35 +350,35 @@ namespace ortc
                                     IICEGathererPtr gatherer
                                     );
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual IICETransportSubscriptionPtr subscribe(IICETransportDelegatePtr delegate) override;
+      IICETransportSubscriptionPtr subscribe(IICETransportDelegatePtr delegate) override;
 
-      virtual IICEGathererPtr iceGatherer() const override;
+      IICEGathererPtr iceGatherer() const override;
 
-      virtual Roles role() const override;
-      virtual Components component() const override;
-      virtual States state() const override;
+      Roles role() const override;
+      Components component() const override;
+      States state() const override;
 
-      virtual CandidateListPtr getRemoteCandidates() const override;
+      CandidateListPtr getRemoteCandidates() const override;
 
-      virtual CandidatePairPtr getSelectedCandidatePair() const override;
+      CandidatePairPtr getSelectedCandidatePair() const override;
 
-      virtual void start(
-                         IICEGathererPtr gatherer,
-                         const Parameters &remoteParameters,
-                         Optional<Options> options = Optional<Options>()
-                         ) throw (InvalidParameters) override;
+      void start(
+                 IICEGathererPtr gatherer,
+                 const Parameters &remoteParameters,
+                 Optional<Options> options = Optional<Options>()
+                 ) throw (InvalidParameters) override;
 
-      virtual void stop() override;
+      void stop() override;
 
-      virtual ParametersPtr getRemoteParameters() const override;
+      ParametersPtr getRemoteParameters() const override;
 
-      virtual IICETransportPtr createAssociatedTransport(IICETransportDelegatePtr delegate) throw (InvalidStateError) override;
+      IICETransportPtr createAssociatedTransport(IICETransportDelegatePtr delegate) throw (InvalidStateError) override;
 
-      virtual void addRemoteCandidate(const GatherCandidate &remoteCandidate) throw (InvalidStateError, InvalidParameters) override;
-      virtual void setRemoteCandidates(const CandidateList &remoteCandidates) throw (InvalidStateError, InvalidParameters) override;
-      virtual void removeRemoteCandidate(const GatherCandidate &remoteCandidate) throw (InvalidStateError, InvalidParameters) override;
+      void addRemoteCandidate(const GatherCandidate &remoteCandidate) throw (InvalidStateError, InvalidParameters) override;
+      void setRemoteCandidates(const CandidateList &remoteCandidates) throw (InvalidStateError, InvalidParameters) override;
+      void removeRemoteCandidate(const GatherCandidate &remoteCandidate) throw (InvalidStateError, InvalidParameters) override;
 
       virtual void keepWarm(
                             const CandidatePair &candidatePair,
@@ -628,7 +628,10 @@ namespace ortc
         bool isFailed() const {return State_Failed == mState;}
         bool isBlacklisted() const {return State_Blacklisted == mState;}
 
-        void trace(const char *function, const char *message = NULL) const;
+        void trace(
+                   const char *function = NULL,
+                   const char *message = NULL
+                   ) const;
 
       protected:
         Log::Params log(const char *message) const;
diff --git a/ortc/internal/ortc_ICETransportController.h b/ortc/internal/ortc_ICETransportController.h
index e5de6bd1..dfa31386 100644
--- a/ortc/internal/ortc_ICETransportController.h
+++ b/ortc/internal/ortc_ICETransportController.h
@@ -161,23 +161,23 @@ namespace ortc
 
       static ICETransportControllerPtr create();
 
-      virtual PUID getID() const;
+      PUID getID() const override;
 
-      virtual ICETransportList getTransports() const;
-      virtual void addTransport(
-                                IICETransportPtr transport,
-                                Optional<size_t> index = Optional<size_t>()
-                                ) throw(
-                                        InvalidParameters,
-                                        InvalidStateError
-                                        );
+      ICETransportList getTransports() const override;
+      void addTransport(
+                        IICETransportPtr transport,
+                        Optional<size_t> index = Optional<size_t>()
+                        ) throw(
+                                InvalidParameters,
+                                InvalidStateError
+                                ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICETransportController => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -186,37 +186,37 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual PromisePtr notifyWhenUnfrozen(
-                                            ICETransportPtr transport,
-                                            const String &localFoundation,
-                                            const String &remoteFoundation
-                                            );
+      PromisePtr notifyWhenUnfrozen(
+                                    ICETransportPtr transport,
+                                    const String &localFoundation,
+                                    const String &remoteFoundation
+                                    ) override;
 
-      virtual void notifyDetached(ICETransportPtr transport);
+      void notifyDetached(ICETransportPtr transport) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICETransportController => ITransportControllerAsyncDelegate
       #pragma mark
 
-      virtual void onTransportControllerNotifyWhenUnfrozen(
-                                                           PromisePtr promise,
-                                                           UseICETransportPtr transport,
-                                                           const char *localFoundation,
-                                                           const char *remoteFoundation
-                                                           );
+      void onTransportControllerNotifyWhenUnfrozen(
+                                                   PromisePtr promise,
+                                                   UseICETransportPtr transport,
+                                                   const char *localFoundation,
+                                                   const char *remoteFoundation
+                                                   ) override;
 
-      virtual void onTransportControllerNotifyDetached(
-                                                       UseICETransportPtr transport,
-                                                       AttachedOrderID detachedOrder
-                                                       );
+      void onTransportControllerNotifyDetached(
+                                               UseICETransportPtr transport,
+                                               AttachedOrderID detachedOrder
+                                               ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark ICETransportController => IWakeDelegate
       #pragma mark
 
-      virtual void onWake();
+      void onWake() override;
 
     protected:
       //-----------------------------------------------------------------------
diff --git a/ortc/internal/ortc_RTPReceiverChannelMediaBase.h b/ortc/internal/ortc_IMediaDevice.h
similarity index 52%
rename from ortc/internal/ortc_RTPReceiverChannelMediaBase.h
rename to ortc/internal/ortc_IMediaDevice.h
index 1ad9b726..a5ef5469 100644
--- a/ortc/internal/ortc_RTPReceiverChannelMediaBase.h
+++ b/ortc/internal/ortc_IMediaDevice.h
@@ -1,6 +1,6 @@
 /*
 
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
+ Copyright (c) 2017, Optical Tone Ltd.
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -32,92 +32,81 @@
 #pragma once
 
 #include <ortc/internal/types.h>
-#include <ortc/internal/ortc_ISecureTransport.h>
 
-#include <ortc/IICETransport.h>
-#include <ortc/IDTLSTransport.h>
-#include <ortc/IRTPTypes.h>
-#include <ortc/IStatsProvider.h>
-
-#include <zsLib/MessageQueueAssociator.h>
-#include <zsLib/ITimer.h>
-
-
-//#define ORTC_SETTING_SCTP_TRANSPORT_MAX_MESSAGE_SIZE "ortc/sctp/max-message-size"
+#include <ortc/IMediaStreamTrack.h>
 
 namespace ortc
 {
   namespace internal
   {
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelMediaBaseForRTPReceiverChannel)
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelMediaBaseForMediaStreamTrack)
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelForRTPReceiverChannelMediaBase)
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiverChannelMediaBase)
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceForMediaEngine);
 
+    
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark IRTPReceiverChannelMediaBaseForRTPReceiverChannel
+    #pragma mark (helpers)
     #pragma mark
 
-    interaction IRTPReceiverChannelMediaBaseForRTPReceiverChannel
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForRTPReceiverChannel, ForRTPReceiverChannel);
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-
-      static ElementPtr toDebug(ForRTPReceiverChannelPtr object);
-
-      virtual PUID getID() const = 0;
-
-      virtual void notifyTransportState(ISecureTransportTypes::States state) = 0;
-
-      virtual void notifyUpdate(ParametersPtr params) = 0;
-
-      virtual bool handlePacket(RTPPacketPtr packet) = 0;
-
-      virtual bool handlePacket(RTCPPacketPtr packet) = 0;
-
-      virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) = 0;
-    };
+    IMediaStreamTrackTypes::SettingsPtr obtainBestMode(
+                                                       const std::list<IMediaStreamTrackTypes::TrackConstraintsPtr> &allConstraints,
+                                                       const std::list<IMediaStreamTrackTypes::SettingsPtr> &availableModes
+                                                       );
 
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     #pragma mark
-    #pragma mark IRTPReceiverChannelMediaBaseForMediaStreamTrack
+    #pragma mark IMediaDevice
     #pragma mark
 
-    interaction IRTPReceiverChannelMediaBaseForMediaStreamTrack
+    interaction IMediaDevice
     {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForMediaStreamTrack, ForMediaStreamTrack)
+      typedef PUID MediaDeviceObjectID;
+
+      enum States
+      {
+        State_First,
+
+        State_Pending = State_First,
+        State_Active,
+        State_Reinitializing,
+        State_ShuttingDown,
+        State_Shutdown,
+
+        State_Last = State_Shutdown,
+      };
 
-      static ElementPtr toDebug(ForMediaStreamTrackPtr object);
+      static const char *toString(States state);
 
-      virtual PUID getID() const = 0;
+      virtual MediaDeviceObjectID getID() const = 0;
+      virtual void cancel() = 0;
+
+      virtual States getState() const = 0;
     };
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
     #pragma mark
-    #pragma mark IRTPReceiverChannelMediaBaseForRTPMediaEngine
+    #pragma mark IMediaDeviceForMediaEngine
     #pragma mark
 
-    interaction IRTPReceiverChannelMediaBaseForRTPMediaEngine
+    interaction IMediaDeviceForMediaEngine
     {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForRTPMediaEngine, ForRTPMediaEngine)
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceForMediaEngine, ForMediaEngine);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::States, States);
 
-      static ElementPtr toDebug(ForRTPMediaEnginePtr object);
+      virtual bool isDeviceIdle() = 0;
+      virtual void shutdown() = 0;
 
-      virtual PUID getID() const = 0;
+      virtual States getState() const = 0;
+      bool isShuttingDown() const { return IMediaDevice::State_ShuttingDown == getState(); }
+      bool isShutdown() const     { return IMediaDevice::State_Shutdown == getState(); }
     };
 
   }
diff --git a/ortc/internal/ortc_IMediaDeviceCapture.h b/ortc/internal/ortc_IMediaDeviceCapture.h
new file mode 100644
index 00000000..8be20cde
--- /dev/null
+++ b/ortc/internal/ortc_IMediaDeviceCapture.h
@@ -0,0 +1,242 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_IMediaDevice.h>
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceCaptureForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceCaptureAudioForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceCaptureVideoForMediaEngine);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDevice);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceCapture);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceCaptureAudio);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceCaptureVideo);
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCapture
+    #pragma mark
+
+    interaction IMediaDeviceCapture : public IMediaDevice
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+
+      typedef zsLib::PromiseWithHolderPtr<IMediaDeviceCapturePtr> MediaDeviceCapturePromise;
+      ZS_DECLARE_PTR(MediaDeviceCapturePromise);
+
+      static MediaDeviceCapturePromisePtr create(
+                                                 MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                 Kinds kind,
+                                                 const TrackConstraints &constraints,
+                                                 IMediaDeviceCaptureDelegatePtr delegate
+                                                 );
+
+      virtual ~IMediaDeviceCapture() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureDelegate
+    #pragma mark
+
+    interaction IMediaDeviceCaptureDelegate
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::States, States);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      virtual void notifyMediaDeviceCaptureAudioFrame(
+                                                      ImmutableMediaChannelTracePtr trace,
+                                                      AudioFramePtr frame
+                                                      ) = 0;
+      virtual void notifyMediaDeviceCaptureVideoFrame(
+                                                      ImmutableMediaChannelTracePtr trace,
+                                                      VideoFramePtr frame
+                                                      ) = 0;
+      virtual void onMediaDeviceCaptureStateChanged(
+                                                    IMediaDeviceCapturePtr device,
+                                                    States state
+                                                    ) = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureSubscription
+    #pragma mark
+
+    interaction IMediaDeviceCaptureSubscription
+    {
+      virtual PUID getID() const = 0;
+
+      virtual void cancel() = 0;
+
+      virtual void background() = 0;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureAudio
+    #pragma mark
+
+    interaction IMediaDeviceCaptureAudio : public IMediaDeviceCapture
+    {
+      virtual ~IMediaDeviceCaptureAudio() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureVideo
+    #pragma mark
+
+    interaction IMediaDeviceCaptureVideo : public IMediaDeviceCapture
+    {
+      virtual ~IMediaDeviceCaptureVideo() {}
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureForMediaEngine
+    #pragma mark
+
+    interaction IMediaDeviceCaptureForMediaEngine : public IMediaDeviceForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceCaptureForMediaEngine, ForMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::MediaDeviceObjectID, MediaDeviceObjectID);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+
+      typedef zsLib::PromiseWithHolderPtr<IMediaDeviceCapturePtr> MediaDeviceCapturePromise;
+      ZS_DECLARE_PTR(MediaDeviceCapturePromise);
+
+      virtual void mediaDeviceCaptureSubscribe(
+                                               MediaDeviceCapturePromisePtr promise,
+                                               MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                               TrackConstraintsPtr constraints,
+                                               IMediaDeviceCaptureDelegatePtr delegate
+                                               ) = 0;
+    };
+
+    
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureAudioForMediaEngine
+    #pragma mark
+
+    interaction IMediaDeviceCaptureAudioForMediaEngine : public IMediaDeviceCaptureForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceCaptureAudioForMediaEngine, ForMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceCaptureAudio, UseMediaEngine);
+
+      static ForMediaEnginePtr create(
+                                      UseMediaEnginePtr mediaEngine,
+                                      const String &deviceID
+                                      );
+    };
+
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureVideoForMediaEngine
+    #pragma mark
+
+    interaction IMediaDeviceCaptureVideoForMediaEngine : public IMediaDeviceCaptureForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceCaptureVideoForMediaEngine, ForMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceCaptureVideo, UseMediaEngine);
+
+      static ForMediaEnginePtr create(
+                                      UseMediaEnginePtr mediaEngine,
+                                      const String &deviceID
+                                      );
+    };
+  }
+}
+
+ZS_DECLARE_PROXY_BEGIN(ortc::internal::IMediaDeviceCaptureDelegate)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::AudioFramePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::VideoFramePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IMediaDeviceCapturePtr, IMediaDeviceCapturePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IMediaDevice::States, States)
+ZS_DECLARE_PROXY_METHOD_SYNC_2(notifyMediaDeviceCaptureAudioFrame, ImmutableMediaChannelTracePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_METHOD_SYNC_2(notifyMediaDeviceCaptureVideoFrame, ImmutableMediaChannelTracePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_METHOD_2(onMediaDeviceCaptureStateChanged, IMediaDeviceCapturePtr, States)
+ZS_DECLARE_PROXY_END()
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_BEGIN(ortc::internal::IMediaDeviceCaptureDelegate, ortc::internal::IMediaDeviceCaptureSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::AudioFramePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::VideoFramePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::internal::IMediaDeviceCapturePtr, IMediaDeviceCapturePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::internal::IMediaDevice::States, States)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_SYNC_2(notifyMediaDeviceCaptureAudioFrame, ImmutableMediaChannelTracePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_SYNC_2(notifyMediaDeviceCaptureVideoFrame, ImmutableMediaChannelTracePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaDeviceCaptureStateChanged, IMediaDeviceCapturePtr, States)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
diff --git a/ortc/internal/ortc_IMediaDeviceRender.h b/ortc/internal/ortc_IMediaDeviceRender.h
new file mode 100644
index 00000000..2015306a
--- /dev/null
+++ b/ortc/internal/ortc_IMediaDeviceRender.h
@@ -0,0 +1,207 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_IMediaDevice.h>
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceRenderForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceRenderAudioForMediaEngine);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDevice);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceRender);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceRenderAudio);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceRender
+    #pragma mark
+
+    interaction IMediaDeviceRender : public IMediaDevice
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceRender, ForMediaStreamTrack);
+
+      typedef IMediaStreamTrackTypes::MediaChannelID MediaChannelID;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::MediaDeviceObjectID, MediaDeviceObjectID);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      typedef zsLib::PromiseWithHolderPtr<IMediaDeviceRenderPtr> MediaDeviceRenderPromise;
+      ZS_DECLARE_PTR(MediaDeviceRenderPromise);
+
+      static MediaDeviceRenderPromisePtr create(
+                                                MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                const TrackConstraints &constraints,
+                                                IMediaDeviceRenderDelegatePtr delegate
+                                                );
+
+      virtual void notifyAudioFrame(
+                                    ImmutableMediaChannelTracePtr trace,
+                                    AudioFramePtr frame
+                                    ) = 0;
+      virtual void notifyVideoFrame(
+                                    ImmutableMediaChannelTracePtr trace,
+                                    VideoFramePtr frame
+                                    ) = 0;
+
+      virtual ~IMediaDeviceRender() {}
+    };
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceRenderAudio
+    #pragma mark
+
+    interaction IMediaDeviceRenderAudio : public IMediaDeviceRender
+    {
+      virtual void notifyVideoFrame(
+                                    ImmutableMediaChannelTracePtr trace,
+                                    VideoFramePtr frame
+                                    ) override {} // ignored
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceRenderDelegate
+    #pragma mark
+
+    interaction IMediaDeviceRenderDelegate
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::States, States);
+
+      virtual void onMediaDeviceRenderStateChanged(
+                                                   IMediaDeviceRenderPtr device,
+                                                   States state
+                                                   ) = 0;
+
+      virtual ~IMediaDeviceRenderDelegate() {}
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceRenderSubscription
+    #pragma mark
+
+    interaction IMediaDeviceRenderSubscription
+    {
+      virtual PUID getID() const = 0;
+
+      virtual void cancel() = 0;
+
+      virtual void background() = 0;
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceRenderForMediaEngine
+    #pragma mark
+
+    interaction IMediaDeviceRenderForMediaEngine : public IMediaDeviceForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceRenderForMediaEngine, ForMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::MediaDeviceObjectID, MediaDeviceObjectID);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+
+      typedef zsLib::PromiseWithHolderPtr<IMediaDeviceRenderPtr> MediaDeviceRenderPromise;
+      ZS_DECLARE_PTR(MediaDeviceRenderPromise);
+
+      virtual void mediaDeviceRenderSubscribe(
+                                              MediaDeviceRenderPromisePtr promise,
+                                              MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                              TrackConstraintsPtr constraints,
+                                              IMediaDeviceRenderDelegatePtr delegate
+                                              ) = 0;
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceRenderAudioForMediaEngine
+    #pragma mark
+
+    interaction IMediaDeviceRenderAudioForMediaEngine : public IMediaDeviceRenderForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceRenderAudioForMediaEngine, ForMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceRenderAudio, UseMediaEngine);
+
+      static ForMediaEnginePtr create(
+                                      UseMediaEnginePtr mediaEngine,
+                                      const String &deviceID
+                                      );
+    };
+
+  }
+}
+
+
+ZS_DECLARE_PROXY_BEGIN(ortc::internal::IMediaDeviceRenderDelegate)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IMediaDeviceRenderPtr, IMediaDeviceRenderPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IMediaDevice::States, States)
+ZS_DECLARE_PROXY_METHOD_2(onMediaDeviceRenderStateChanged, IMediaDeviceRenderPtr, States)
+ZS_DECLARE_PROXY_END()
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_BEGIN(ortc::internal::IMediaDeviceRenderDelegate, ortc::internal::IMediaDeviceRenderSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::internal::IMediaDeviceRenderPtr, IMediaDeviceRenderPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::internal::IMediaDevice::States, States)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaDeviceRenderStateChanged, IMediaDeviceRenderPtr, States)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
diff --git a/ortc/internal/ortc_IMediaStreamTrack.h b/ortc/internal/ortc_IMediaStreamTrack.h
new file mode 100644
index 00000000..6ce714e0
--- /dev/null
+++ b/ortc/internal/ortc_IMediaStreamTrack.h
@@ -0,0 +1,321 @@
+/*
+ 
+ Copyright (c) 2014, Hookflash Inc. / Hookflash Inc.
+ All rights reserved.
+ 
+ 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.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ 
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+#include <ortc/IMediaStreamTrack.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrack);
+    ZS_DECLARE_INTERACTION_PROXY(IMediaStreamTrackRTPDelegate);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackRTPSubscription);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForMediaStreamTrackChannel);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForMediaStreamTrackSubscriber);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForMediaStreamTrackSubscriberMedia);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForMediaStreamTrackSubscriberRTP);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelForMediaStreamTrack);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackSubscriberForMediaStreamTrack);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackSubscriberMediaForMediaStreamTrack);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackSubscriberRTPForMediaStreamTrack);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiver);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiverChannel);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSender);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSenderChannel);
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrack
+    #pragma mark
+  
+    interaction IMediaStreamTrack : public ortc::IMediaStreamTrack
+    {
+      // WARNING: extreme caution must be done not to cause a deadlock or delaying media by blocking. Gather information
+      // needed within a lock but do any operations outside a lock as fast as possible.
+      virtual IMediaStreamTrackRTPSubscriptionPtr subscribeRTP(
+                                                               const Parameters &rtpEncodingParams,
+                                                               IMediaStreamTrackRTPDelegatePtr delegate
+                                                               ) = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackRTPDelegate
+    #pragma mark
+
+    interaction IMediaStreamTrackRTPDelegate : public IMediaStreamTrackDelegate
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+
+      virtual void notifyMediaStreamTrackRTPPacket(
+                                                   ImmutableMediaChannelTracePtr trace,
+                                                   RTPPacketPtr packet
+                                                   ) = 0;
+      virtual void notifyMediaStreamTrackRTCPPacket(
+                                                    ImmutableMediaChannelTracePtr trace,
+                                                    RTCPPacketPtr packet
+                                                    ) = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackRTPSubscription
+    #pragma mark
+  
+    interaction IMediaStreamTrackRTPSubscription
+    {
+      virtual PUID getID() const = 0;
+    
+      virtual void cancel() = 0;
+
+      virtual void background() = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForMediaStreamTrackChannel
+    #pragma mark
+  
+    interaction IMediaStreamTrackForMediaStreamTrackChannel
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForMediaStreamTrackChannel, ForMediaStreamTrackChannel);
+
+      virtual ~IMediaStreamTrackForMediaStreamTrackChannel() {}
+    };
+
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForMediaStreamTrackSubscriber
+    #pragma mark
+  
+    interaction IMediaStreamTrackForMediaStreamTrackSubscriber
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForMediaStreamTrackSubscriber, ForMediaStreamTrackSubscriber);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberForMediaStreamTrack, UseSubscriber);
+
+      virtual void notifySubscriberCancelled(UseSubscriberPtr subscriber) = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForMediaStreamTrackSubscriberMedia
+    #pragma mark
+  
+    interaction IMediaStreamTrackForMediaStreamTrackSubscriberMedia : public IMediaStreamTrackForMediaStreamTrackSubscriber
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForMediaStreamTrackSubscriberMedia, ForMediaStreamTrackSubscriberMedia);
+
+      virtual ~IMediaStreamTrackForMediaStreamTrackSubscriberMedia() {}
+    };
+
+    
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForMediaStreamTrackSubscriberRTP
+    #pragma mark
+  
+    interaction IMediaStreamTrackForMediaStreamTrackSubscriberRTP : public IMediaStreamTrackForMediaStreamTrackSubscriber
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForMediaStreamTrackSubscriberRTP, ForMediaStreamTrackSubscriberRTP);
+
+      virtual ~IMediaStreamTrackForMediaStreamTrackSubscriberRTP() {}
+    };
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForMediaDevices
+    #pragma mark
+
+    interaction IMediaStreamTrackForMediaDevices
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForMediaDevices, ForMediaDevices);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+
+      static ForMediaDevicesPtr createForMediaDevices(
+                                                      IMediaStreamTrackTypes::Kinds kind,
+                                                      const TrackConstraints &constraints
+                                                      );
+
+      virtual PUID getID() const = 0;
+    };
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForMediaStreamTrackSelector
+    #pragma mark
+
+    interaction IMediaStreamTrackForMediaStreamTrackSelector
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForMediaStreamTrackSelector, ForMediaStreamTrackSelector);
+
+      static ForMediaStreamTrackSelectorPtr createForMediaStreamTrackSelector(IMediaStreamTrackTypes::Kinds kind);
+
+      virtual PUID getID() const = 0;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForRTPReceiver
+    #pragma mark
+
+    interaction IMediaStreamTrackForRTPReceiver
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiver, ForReceiver);
+
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+
+      static ForReceiverPtr createForReceiver(IMediaStreamTrackTypes::Kinds kind);
+
+      virtual PUID getID() const = 0;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForRTPReceiverChannel
+    #pragma mark
+
+    interaction IMediaStreamTrackForRTPReceiverChannel
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiverChannel, ForReceiverChannel);
+
+      typedef IMediaStreamTrackTypes::Kinds Kinds;
+
+      virtual PUID getID() const = 0;
+      virtual Kinds kind() const = 0;
+    };
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForRTPSender
+    #pragma mark
+
+    interaction IMediaStreamTrackForRTPSender
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSender, ForSender);
+
+      typedef IMediaStreamTrackTypes::Kinds Kinds;
+
+      virtual PUID getID() const = 0;
+      virtual Kinds kind() const = 0;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackForRTPSenderChannel
+    #pragma mark
+
+    interaction IMediaStreamTrackForRTPSenderChannel
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannel, ForSenderChannel);
+
+      virtual PUID getID() const = 0;
+    };
+
+  }
+}
+
+ZS_DECLARE_PROXY_BEGIN(ortc::internal::IMediaStreamTrackRTPDelegate)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackPtr, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::OverconstrainedErrorPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::RTPPacketPtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::RTCPPacketPtr, RTCPPacketPtr)
+ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrackPtr, bool)
+ZS_DECLARE_PROXY_METHOD_1(onMediaStreamTrackEnded, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackOverConstrained, IMediaStreamTrackPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_METHOD_SYNC_2(notifyMediaStreamTrackRTPPacket, ImmutableMediaChannelTracePtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_METHOD_SYNC_2(notifyMediaStreamTrackRTCPPacket, ImmutableMediaChannelTracePtr, RTCPPacketPtr)
+ZS_DECLARE_PROXY_END()
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_BEGIN(ortc::internal::IMediaStreamTrackRTPDelegate, ortc::internal::IMediaStreamTrackRTPSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackPtr, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::OverconstrainedErrorPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::RTPPacketPtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::RTCPPacketPtr, RTCPPacketPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrackPtr, bool)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_1(onMediaStreamTrackEnded, IMediaStreamTrackPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackOverConstrained, IMediaStreamTrackPtr, OverconstrainedErrorPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_SYNC_2(notifyMediaStreamTrackRTPPacket, ImmutableMediaChannelTracePtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_SYNC_2(notifyMediaStreamTrackRTCPPacket, ImmutableMediaChannelTracePtr, RTCPPacketPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
diff --git a/ortc/internal/ortc_IMediaStreamTrackChannel.h b/ortc/internal/ortc_IMediaStreamTrackChannel.h
new file mode 100644
index 00000000..224ea843
--- /dev/null
+++ b/ortc/internal/ortc_IMediaStreamTrackChannel.h
@@ -0,0 +1,231 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelDelegate);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelMediaDelegate);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelRTPDelegate);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelForMediaStreamTrack);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriber);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriberMedia);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriberRTP);
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackChannelDelegate
+    #pragma mark
+
+    interaction IMediaStreamTrackChannelDelegate
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+
+      virtual void notifyMediaChannelCancelled(ImmutableMediaChannelTracePtr trace) = 0;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackChannelMediaDelegate
+    #pragma mark
+
+    interaction IMediaStreamTrackChannelMediaDelegate : public IMediaStreamTrackChannelDelegate
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      virtual void notifyMediaChannelAudioFrame(
+                                                ImmutableMediaChannelTracePtr trace,
+                                                AudioFramePtr frame
+                                                ) = 0;
+      virtual void notifyMediaChannelVideoFrame(
+                                                ImmutableMediaChannelTracePtr trace,
+                                                AudioFramePtr frame
+                                                ) = 0;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackChannelRTPDelegate
+    #pragma mark
+
+    interaction IMediaStreamTrackChannelRTPDelegate : public IMediaStreamTrackChannelDelegate
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      virtual void notifyMediaChannelRTPPacket(
+                                               ImmutableMediaChannelTracePtr trace,
+                                               RTPPacketPtr packet
+                                               ) = 0;
+      virtual void notifyMediaChannelRTCPPacket(
+                                                ImmutableMediaChannelTracePtr trace,
+                                                RTPPacketPtr packet
+                                                ) = 0;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackChannelForMediaStreamTrack
+    #pragma mark
+
+    interaction IMediaStreamTrackChannelForMediaStreamTrack
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrack, ForMediaStreamTrack);
+
+      typedef PUID SubscriberObjectID;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      static ForMediaStreamTrackPtr create(
+                                           size_t timeIndex,
+                                           ImmutableMediaChannelTracePtr trace
+                                           );
+
+      virtual PUID getID() const = 0;
+
+      virtual void shutdown() = 0;
+
+      virtual void notifyAudioFrame(
+                                    size_t timeIndex,
+                                    ImmutableMediaChannelTracePtr trace,
+                                    AudioFramePtr frame
+                                    ) = 0;
+      virtual void notifyVideoFrame(
+                                    size_t timeIndex,
+                                    ImmutableMediaChannelTracePtr trace,
+                                    VideoFramePtr frame
+                                    ) = 0;
+
+      virtual void notifyRTPPacket(
+                                   size_t timeIndex,
+                                   ImmutableMediaChannelTracePtr trace,
+                                   RTPPacketPtr packet
+                                   ) = 0;
+      virtual void notifyRTCPPacket(
+                                    size_t timeIndex,
+                                    ImmutableMediaChannelTracePtr trace,
+                                    RTPPacketPtr packet
+                                    ) = 0;
+
+      virtual void subscribeComplete() = 0;
+
+      virtual bool shouldCancel(size_t cleanOlderThanTimeIndex) = 0;
+
+      virtual void notifyMediaChannelGone(ImmutableMediaChannelTracePtr trace) = 0;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackChannelForMediaStreamTrackSubscriber
+    #pragma mark
+
+    interaction IMediaStreamTrackChannelForMediaStreamTrackSubscriber
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriber, ForMediaStreamTrackSubscriber);
+
+      typedef PUID SubscriberObjectID;
+
+      virtual void notifyCancelled(SubscriberObjectID subscriberID) = 0;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackChannelForMediaStreamTrackSubscriberMedia
+    #pragma mark
+
+    interaction IMediaStreamTrackChannelForMediaStreamTrackSubscriberMedia : public IMediaStreamTrackChannelForMediaStreamTrackSubscriber
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriberMedia, ForMediaStreamTrackSubscriberMedia);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+
+      virtual void subscribeMedia(
+                                  SubscriberObjectID subscriberID,
+                                  IMediaStreamTrackChannelMediaDelegatePtr delegate
+                                  ) = 0;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackChannelForMediaStreamTrackSubscriberRTP
+    #pragma mark
+
+    interaction IMediaStreamTrackChannelForMediaStreamTrackSubscriberRTP : public IMediaStreamTrackChannelForMediaStreamTrackSubscriber
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriberRTP, ForMediaStreamTrackSubscriberRTP);
+
+      typedef PUID SubscriberObjectID;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::ImmutableParameters, ImmutableParameters);
+
+      virtual void subscribeRTP(
+                                SubscriberObjectID subscriberID,
+                                ImmutableParametersPtr params,
+                                IMediaStreamTrackChannelRTPDelegatePtr delegate
+                                ) = 0;
+    };
+
+
+  } // namespace internal
+} // namespace ortc
diff --git a/ortc/internal/ortc_IMediaStreamTrackMonitor.h b/ortc/internal/ortc_IMediaStreamTrackMonitor.h
new file mode 100644
index 00000000..1aeccbe8
--- /dev/null
+++ b/ortc/internal/ortc_IMediaStreamTrackMonitor.h
@@ -0,0 +1,360 @@
+/*
+ 
+ Copyright (c) 2014, Hookflash Inc. / Hookflash Inc.
+ All rights reserved.
+ 
+ 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.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ 
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/IMediaStreamTrack.h>
+#include <ortc/IRTPTypes.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackMonitor);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackMonitorMediaChannel);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackMonitorSubscriberMedia);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackMonitorSubscriberRTP);
+    ZS_DECLARE_INTERACTION_PROXY(IMediaStreamTrackMonitorDelegate);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackMonitorMediaChannelDelegate);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackMonitorMediaSubscriberMediaDelegate);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackMonitorMediaSubscriberRTPDelegate);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForMediaStreamTrackMonitor);
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackMonitorTypes
+    #pragma mark
+  
+    interaction IMediaStreamTrackMonitorTypes
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::ImmutableParameters, ImmutableParameters);
+
+      typedef PUID ChannelID;
+      typedef PUID SubscriberID;
+
+      typedef PUID MonitorChannelID;
+      typedef PUID MonitorSubscriberMediaID;
+      typedef PUID MonitorSubscriberRTPID;
+
+      typedef AnyPtr MonitorChannelContextPtr;
+      typedef AnyPtr MonitorSubscriberMediaContextPtr;
+      typedef AnyPtr MonitorSubscriberRTPContextPtr;
+
+      struct NotifyMediaChannelAvailableInput
+      {
+        ChannelID channelID_ {};
+        ImmutableMediaChannelTracePtr inMediaChannelTrace_;
+        IMediaStreamTrackMonitorMediaChannelDelegatePtr delegate;
+      };
+
+      struct NotifyMediaChannelAvailableOutput
+      {
+        MonitorChannelID id_ {};
+        MonitorChannelContextPtr context_ {};
+        IMediaStreamTrackMonitorMediaChannelPtr monitor_;
+      };
+
+      struct NotifyMediaChannelSubscribedMediaInput
+      {
+        SubscriberID subscriberID_ {};
+        IMediaStreamTrackMonitorMediaSubscriberMediaDelegatePtr delegate_;
+      };
+
+      struct NotifyMediaChannelSubscribedMediaOutput
+      {
+        MonitorSubscriberMediaID id_ {};
+        MonitorSubscriberMediaContextPtr context_ {};
+        IMediaStreamTrackMonitorSubscriberMediaPtr monitor_;
+      };
+
+      struct NotifyMediaChannelSubscribedRTPInput
+      {
+        SubscriberID subscriberID_{};
+        IMediaStreamTrackMonitorMediaSubscriberRTPDelegatePtr delegate_;
+      };
+
+      struct NotifyMediaChannelSubscribedRTPOutput
+      {
+        MonitorSubscriberRTPID id_ {};
+        MonitorSubscriberRTPContextPtr context_ {};
+        IMediaStreamTrackMonitorSubscriberRTPPtr monitor_;
+      };
+
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackMonitor
+    #pragma mark
+
+    interaction IMediaStreamTrackMonitor : public IMediaStreamTrackMonitorTypes
+    {
+      static IMediaStreamTrackMonitorPtr create(ortc::IMediaStreamTrackPtr track);
+
+      virtual PUID getID() const = 0;
+
+      virtual void stop() const = 0;
+
+      virtual void notifyMediaChannelAvailable(
+                                               NotifyMediaChannelAvailableInput &input,
+                                               NotifyMediaChannelAvailableInput &output
+                                               ) = 0;
+
+      virtual void notifyMediaChannelSubscribedMedia(
+                                                     NotifyMediaChannelSubscribedMediaInput &input,
+                                                     NotifyMediaChannelSubscribedMediaInput &output
+                                                     ) = 0;
+
+      virtual void notifyMediaChannelSubscribedRTP(
+                                                   NotifyMediaChannelSubscribedRTPInput &input,
+                                                   NotifyMediaChannelSubscribedRTPInput &output
+                                                   ) = 0;
+
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackMonitorDelegate
+    #pragma mark
+
+    interaction IMediaStreamTrackMonitorDelegate
+    {
+      virtual ~IMediaStreamTrackMonitorDelegate() {}
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackMonitorSubscription
+    #pragma mark
+  
+    interaction IMediaStreamTrackMonitorSubscription
+    {
+      virtual PUID getID() const = 0;
+    
+      virtual void cancel() = 0;
+
+      virtual void background() = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackMonitorMediaChannel
+    #pragma mark
+  
+    interaction IMediaStreamTrackMonitorMediaChannel : public IMediaStreamTrackMonitorTypes
+    {
+      virtual void notifyMediaChannelGone(
+                                          MonitorChannelID id,
+                                          MonitorChannelContextPtr context
+                                          ) = 0;
+
+      virtual void notifyMediaChannelRTPPacket(
+                                               MonitorChannelID id,
+                                               MonitorChannelContextPtr context,
+                                               RTPPacketPtr packet,
+                                               bool &outFilterPacket
+                                               ) = 0;
+
+      virtual void notifyMediaChannelRTCPPacket(
+                                                MonitorChannelID id,
+                                                MonitorChannelContextPtr context,
+                                                RTCPPacketPtr packet,
+                                                bool &outFilterPacket
+                                                ) = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackMonitorMediaChannelDelegate
+    #pragma mark
+
+    interaction IMediaStreamTrackMonitorMediaChannelDelegate : public IMediaStreamTrackMonitorTypes
+    {
+      virtual void notifyMonitorMediaChannelRTPPacket(
+                                                      MonitorChannelID id,
+                                                      RTPPacketPtr packet
+                                                      ) = 0;
+      virtual void notifyMonitorMediaChannelRTCPPacket(
+                                                       MonitorChannelID id,
+                                                       RTPPacketPtr packet
+                                                       ) = 0;
+    };
+
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackMonitorSubscriberMedia
+    #pragma mark
+  
+    interaction IMediaStreamTrackMonitorSubscriberMedia : public IMediaStreamTrackMonitorTypes
+    {
+      virtual void notifyMonitorSubscriberMediaGone(
+                                                    MonitorSubscriberMediaID id,
+                                                    MonitorSubscriberMediaContextPtr context
+                                                    ) = 0;
+
+      virtual void notifyMonitorSubscriberMediaAudio(
+                                                     MonitorSubscriberMediaID id,
+                                                     MonitorSubscriberMediaContextPtr context,
+                                                     AudioFramePtr frame,
+                                                     bool &outFilterFrame
+                                                     ) = 0;
+
+      virtual void notifyMonitorSubscriberMediaVideo(
+                                                     MonitorSubscriberMediaID id,
+                                                     MonitorSubscriberMediaContextPtr context,
+                                                     VideoFramePtr frame,
+                                                     bool &outFilterFrame
+                                                     ) = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackMonitorSubscriberMediaDelegate
+    #pragma mark
+
+    interaction IMediaStreamTrackMonitorSubscriberMediaDelegate : public IMediaStreamTrackMonitorTypes
+    {
+      virtual void notifyMonitorSubscriberMediaAudio(
+                                                     MonitorSubscriberMediaID id,
+                                                     AudioFramePtr frame
+                                                     ) = 0;
+      virtual void notifyMonitorSubscriberMediaVideo(
+                                                     MonitorSubscriberMediaID id,
+                                                     VideoFramePtr frame
+                                                     ) = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackMonitorSubscriberRTP
+    #pragma mark
+  
+    interaction IMediaStreamTrackMonitorSubscriberRTP : public IMediaStreamTrackMonitorTypes
+    {
+      virtual void notifyMonitorSubscriberRTPGone(
+                                                  MonitorSubscriberRTPID id,
+                                                  MonitorSubscriberMediaContextPtr context
+                                                  ) = 0;
+
+      virtual void notifyMonitorSubscriberEncoderRTPPacket(
+                                                           MonitorSubscriberRTPID id,
+                                                           MonitorSubscriberMediaContextPtr context,
+                                                           RTPPacketPtr packet,
+                                                           bool &outFilterPacket
+                                                           ) = 0;
+
+      virtual void notifyMonitorSubscriberEncoderRTPRTCPPacket(
+                                                               MonitorSubscriberRTPID id,
+                                                               MonitorSubscriberMediaContextPtr context,
+                                                               RTCPPacketPtr packet,
+                                                               bool &outFilterPacket
+                                                               ) = 0;
+
+      virtual void notifyMonitorSubscriberRTPFeedback(
+                                                      MonitorSubscriberRTPID id,
+                                                      MonitorSubscriberMediaContextPtr context,
+                                                      RTCPPacketPtr packet,
+                                                      bool &outFilterPacket
+                                                      ) = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackMonitorSubscriberRTPDelegate
+    #pragma mark
+
+    interaction IMediaStreamTrackMonitorSubscriberRTPDelegate : public IMediaStreamTrackMonitorTypes
+    {
+      virtual void notifyMonitorSubscriberRTPEncoderRTPPacket(
+                                                        MonitorSubscriberRTPID id,
+                                                        RTPPacketPtr packet
+                                                        ) = 0;
+      virtual void notifyMonitorSubscriberRTPEncoderRTCPPacket(
+                                                         MonitorSubscriberRTPID id,
+                                                         RTPPacketPtr packet
+                                                         ) = 0;
+
+      virtual void notifyMonitorSubscriberRTPFeedback(
+                                                      MonitorSubscriberRTPID id,
+                                                      RTPPacketPtr packet
+                                                      ) = 0;
+    };
+  }
+}
+
+ZS_DECLARE_PROXY_BEGIN(ortc::internal::IMediaStreamTrackMonitorDelegate)
+//ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackPtr, IMediaStreamTrackPtr)
+//ZS_DECLARE_PROXY_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrackPtr, bool)
+ZS_DECLARE_PROXY_END()
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_BEGIN(ortc::internal::IMediaStreamTrackMonitorDelegate, ortc::internal::IMediaStreamTrackMonitorSubscription)
+//ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackPtr, IMediaStreamTrackPtr)
+//ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onMediaStreamTrackMute, IMediaStreamTrackPtr, bool)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
diff --git a/ortc/internal/ortc_IMediaStreamTrackSubscriber.h b/ortc/internal/ortc_IMediaStreamTrackSubscriber.h
new file mode 100644
index 00000000..382cd94e
--- /dev/null
+++ b/ortc/internal/ortc_IMediaStreamTrackSubscriber.h
@@ -0,0 +1,143 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/IMediaStreamTrack.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriber);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriberMedia);
+    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriberRTP);
+
+    
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackSubscriberForMediaStreamTrack
+    #pragma mark
+
+    interaction IMediaStreamTrackSubscriberForMediaStreamTrack
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberForMediaStreamTrack, ForMediaStreamTrack);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriber, UseMediaChannelBase);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::OverconstrainedError, OverconstrainedError);
+
+      virtual PUID getID() const = 0;
+
+      virtual void shutdown() = 0;
+
+      virtual void notifyTrackMute(bool isMuted) = 0;
+      virtual void notifyTrackEnded() = 0;
+      virtual void notifyOverConstrained(OverconstrainedErrorPtr error) = 0;
+
+      virtual void notifyChannel(
+                                 UseMediaChannelBasePtr mediaChannel,
+                                 ImmutableMediaChannelTracePtr trace
+                                 ) = 0;
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackSubscriberMediaForMediaStreamTrack
+    #pragma mark
+
+    interaction IMediaStreamTrackSubscriberMediaForMediaStreamTrack : public IMediaStreamTrackSubscriberForMediaStreamTrack
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberMediaForMediaStreamTrack, ForMediaStreamTrack);
+
+      static ForMediaStreamTrackPtr create(
+                                           IMediaStreamTrackMediaSubscriptionPtr &outSubscription,
+                                           IMediaStreamTrackSyncMediaDelegatePtr syncDelegate,
+                                           IMediaStreamTrackAsyncMediaDelegatePtr asyncDelegate
+                                           );
+
+      virtual ~IMediaStreamTrackSubscriberMediaForMediaStreamTrack();
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackSubscriberRTPForMediaStreamTrack
+    #pragma mark
+
+    interaction IMediaStreamTrackSubscriberRTPForMediaStreamTrack : public IMediaStreamTrackSubscriberForMediaStreamTrack
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberRTPForMediaStreamTrack, ForMediaStreamTrack);
+
+      static ForMediaStreamTrackPtr create(
+                                           IMediaStreamTrackMediaSubscriptionPtr &outSubscription,
+                                           IMediaStreamTrackRTPDelegatePtr delegate
+                                           );
+
+      virtual ~IMediaStreamTrackSubscriberRTPForMediaStreamTrack();
+    };
+
+    
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackSubscriberForMediaStreamTrackChannel
+    #pragma mark
+
+    interaction IMediaStreamTrackSubscriberForMediaStreamTrackChannel
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberForMediaStreamTrackChannel, ForMediaStreamTrackChannel);
+
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackSubscriberMediaForMediaStreamTrackChannel
+    #pragma mark
+
+    interaction IMediaStreamTrackSubscriberMediaForMediaStreamTrackChannel
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberMediaForMediaStreamTrackChannel, ForMediaStreamTrackChannel);
+    };
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackSubscriberRTPForMediaStreamTrackChannel
+    #pragma mark
+
+    interaction IMediaStreamTrackSubscriberRTPForMediaStreamTrackChannel
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberRTPForMediaStreamTrackChannel, ForMediaStreamTrackChannel);
+    };
+
+  } // namespace internal
+} // namespace ortc
diff --git a/ortc/internal/ortc_IRTP.h b/ortc/internal/ortc_IRTP.h
new file mode 100644
index 00000000..88c9911b
--- /dev/null
+++ b/ortc/internal/ortc_IRTP.h
@@ -0,0 +1,105 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+#include <ortc/internal/ortc_RTPTypes.h>
+#include <ortc/internal/ortc_IRTP.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IRTPForMediaEngine);
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTP
+    #pragma mark
+
+    interaction IRTP
+    {
+      typedef PUID RTPObjectID;
+
+      enum States
+      {
+        State_First,
+
+        State_Pending = State_First,
+        State_Ready,
+        State_ShuttingDown,
+        State_Shutdown,
+
+        State_Last = State_Shutdown,
+      };
+
+      static const char *toString(States state);
+      static States toState(const char *stateStr) throw (InvalidParameters);
+
+      virtual RTPObjectID getID() const = 0;
+      virtual void cancel() = 0;
+
+      virtual States getState() const = 0;
+
+      virtual ~IRTP() {}
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPForMediaEngine
+    #pragma mark
+
+    interaction IRTPForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPForMediaEngine, ForMediaEngine);
+
+      typedef IRTP::RTPObjectID RTPObjectID;
+      ZS_DECLARE_TYPEDEF_PTR(IRTP::States, States);
+
+      virtual RTPObjectID getID() const = 0;
+      virtual void shutdown() = 0;
+
+      virtual States getState() const = 0;
+      bool isShuttingDown() const { return IRTP::State_ShuttingDown == getState(); }
+      bool isShutdown() const     { return IRTP::State_Shutdown == getState(); }
+
+      virtual ~IRTPForMediaEngine() {}
+    };
+
+  }
+}
diff --git a/ortc/internal/ortc_IRTPDecoder.h b/ortc/internal/ortc_IRTPDecoder.h
new file mode 100644
index 00000000..c1e9054d
--- /dev/null
+++ b/ortc/internal/ortc_IRTPDecoder.h
@@ -0,0 +1,286 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+#include <ortc/internal/ortc_IRTP.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IRTPDecoderForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IRTPDecoderAudioForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IRTPDecoderVideoForMediaEngine);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForRTPDecoderAudio);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForRTPDecoderVideo);
+
+    ZS_DECLARE_INTERACTION_PROXY(IRTPDecoderAysncDelegate);
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoder
+    #pragma mark
+
+    interaction IRTPDecoder : public IRTP
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+
+      virtual void notifyRTPPacket(
+                                   ImmutableMediaChannelTracePtr trace,
+                                   RTPPacketPtr packet
+                                   ) = 0;
+      virtual void notifyRTCPPacket(
+                                    ImmutableMediaChannelTracePtr trace,
+                                    RTCPPacketPtr packet
+                                    ) = 0;
+
+      virtual ~IRTPDecoder() {}
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderAudio
+    #pragma mark
+
+    interaction IRTPDecoderAudio : public IRTPDecoder
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderAudioPtr>, PromiseWithRTPDecoderAudio);
+
+      static PromiseWithRTPDecoderAudioPtr create(
+                                                  const Parameters &parameters,
+                                                  IRTPDecoderDelegatePtr delegate
+                                                  );
+
+      virtual ~IRTPDecoderAudio() {}
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderVideo
+    #pragma mark
+
+    interaction IRTPDecoderVideo : public IRTPDecoder
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderVideoPtr>, PromiseWithRTPDecoderVideo);
+
+      static PromiseWithRTPDecoderVideoPtr create(
+                                                  const Parameters &parameters,
+                                                  IRTPDecoderDelegatePtr delegate
+                                                  );
+    
+      virtual ~IRTPDecoderVideo() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderDelegate
+    #pragma mark
+
+    interaction IRTPDecoderDelegate
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IRTP::States, States);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      virtual void notifyRTPDecoderAudioFrame(
+                                              ImmutableMediaChannelTracePtr trace,
+                                              AudioFramePtr frame
+                                              ) = 0;
+      virtual void notifyRTPDecoderVideoFrame(
+                                              ImmutableMediaChannelTracePtr trace,
+                                              VideoFramePtr frame
+                                              ) = 0;
+
+      virtual void onRTPDecoderStateChanged(
+                                            IRTPDecoderPtr decoder,
+                                            States state
+                                            ) = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderSubscription
+    #pragma mark
+
+    interaction IRTPDecoderSubscription
+    {
+      virtual PUID getID() const = 0;
+
+      virtual void cancel() = 0;
+
+      virtual void background() = 0;
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderForMediaEngine
+    #pragma mark
+
+    interaction IRTPDecoderForMediaEngine : public IRTPForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPDecoderForMediaEngine, ForMediaEngine);
+
+      virtual ~IRTPDecoderForMediaEngine() {}
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderAudioForMediaEngine
+    #pragma mark
+
+    interaction IRTPDecoderAudioForMediaEngine : public IRTPDecoderForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPDecoderAudioForMediaEngine, ForMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderAudio, UseMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderAudioPtr>, PromiseWithRTPDecoderAudio);
+
+      static ForMediaEnginePtr create(
+                                      PromiseWithRTPDecoderAudioPtr promise,
+                                      UseMediaEnginePtr mediaEngine,
+                                      ParametersPtr parameters,
+                                      IRTPDecoderDelegatePtr delegate
+                                      );
+
+      virtual ~IRTPDecoderAudioForMediaEngine() {}
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderVideoForMediaEngine
+    #pragma mark
+
+    interaction IRTPDecoderVideoForMediaEngine : public IRTPDecoderForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPDecoderVideoForMediaEngine, ForMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderVideo, UseMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderVideoPtr>, PromiseWithRTPDecoderVideo);
+
+      static ForMediaEnginePtr create(
+                                      PromiseWithRTPDecoderVideoPtr promise,
+                                      UseMediaEnginePtr mediaEngine,
+                                      ParametersPtr parameters,
+                                      IRTPDecoderDelegatePtr delegate
+                                      );
+
+      virtual ~IRTPDecoderVideoForMediaEngine() {}
+    };
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderAsyncDelegate
+    #pragma mark
+
+    interaction IRTPDecoderAysncDelegate
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+
+      virtual void onRTPDecoderRTPPacket(
+                                         ImmutableMediaChannelTracePtr trace,
+                                         RTPPacketPtr packet
+                                         ) = 0;
+      virtual void onRTPDecoderRTCPPacket(
+                                          ImmutableMediaChannelTracePtr trace,
+                                          RTCPPacketPtr packet
+                                          ) = 0;
+    };
+  }
+}
+
+ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPDecoderDelegate)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::AudioFramePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::VideoFramePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPDecoderPtr, IRTPDecoderPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTP::States, States)
+ZS_DECLARE_PROXY_METHOD_SYNC_2(notifyRTPDecoderAudioFrame, ImmutableMediaChannelTracePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_METHOD_SYNC_2(notifyRTPDecoderVideoFrame, ImmutableMediaChannelTracePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_METHOD_2(onRTPDecoderStateChanged, IRTPDecoderPtr, States)
+ZS_DECLARE_PROXY_END()
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_BEGIN(ortc::internal::IRTPDecoderDelegate, ortc::internal::IRTPDecoderSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::AudioFramePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::VideoFramePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::internal::IRTPDecoderPtr, IRTPDecoderPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::internal::IRTP::States, States)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_SYNC_2(notifyRTPDecoderAudioFrame, ImmutableMediaChannelTracePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_SYNC_2(notifyRTPDecoderVideoFrame, ImmutableMediaChannelTracePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onRTPDecoderStateChanged, IRTPDecoderPtr, States)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
+
+
+ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPDecoderAysncDelegate)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::RTPPacketPtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::RTCPPacketPtr, RTCPPacketPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_METHOD_2(onRTPDecoderRTPPacket, ImmutableMediaChannelTracePtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_METHOD_2(onRTPDecoderRTCPPacket, ImmutableMediaChannelTracePtr, RTCPPacketPtr)
+ZS_DECLARE_PROXY_END()
diff --git a/ortc/internal/ortc_IRTPEncoder.h b/ortc/internal/ortc_IRTPEncoder.h
new file mode 100644
index 00000000..2554924f
--- /dev/null
+++ b/ortc/internal/ortc_IRTPEncoder.h
@@ -0,0 +1,293 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+#include <ortc/internal/ortc_IRTP.h>
+
+#include <ortc/IMediaStreamTrack.h>
+
+#include <zsLib/Promise.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IRTPEncoderForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IRTPEncoderAudioForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IRTPEncoderVideoForMediaEngine);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForRTPEncoderAudio);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForRTPEncoderVideo);
+
+    ZS_DECLARE_INTERACTION_PROXY(IRTPEncoderAysncDelegate);
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoder
+    #pragma mark
+
+    interaction IRTPEncoder : public IRTP
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      virtual void notifyAudioFrame(
+                                    ImmutableMediaChannelTracePtr trace,
+                                    AudioFramePtr frame
+                                    ) = 0;
+      virtual void notifyVideoFrame(
+                                    ImmutableMediaChannelTracePtr trace,
+                                    VideoFramePtr frame
+                                    ) = 0;
+
+      virtual ~IRTPEncoder() {}
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderAudio
+    #pragma mark
+
+    interaction IRTPEncoderAudio : public IRTPEncoder
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderAudioPtr>, PromiseWithRTPEncoderAudio);
+
+      static PromiseWithRTPEncoderAudioPtr create(
+                                                  const Parameters &parameters,
+                                                  IRTPEncoderDelegatePtr delegate
+                                                  );
+
+      virtual ~IRTPEncoderAudio() {}
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderVideo
+    #pragma mark
+
+    interaction IRTPEncoderVideo : public IRTPEncoder
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderVideoPtr>, PromiseWithRTPEncoderVideo);
+
+      static PromiseWithRTPEncoderVideoPtr create(
+                                                  const Parameters &parameters,
+                                                  IRTPEncoderDelegatePtr delegate
+                                                  );
+
+      virtual ~IRTPEncoderVideo() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderDelegate
+    #pragma mark
+
+    interaction IRTPEncoderDelegate
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IRTP::States, States);
+
+      virtual void notifyRTPEncoderRTPPacket(
+                                             ImmutableMediaChannelTracePtr trace,
+                                             RTPPacketPtr packet
+                                             ) = 0;
+      virtual void notifyRTPEncoderRTCPPacket(
+                                              ImmutableMediaChannelTracePtr trace,
+                                              RTCPPacketPtr packet
+                                              ) = 0;
+
+      virtual void onRTPEncoderStateChanged(
+                                            IRTPEncoderPtr encoder,
+                                            States state
+                                            ) = 0;
+    };
+
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderSubscription
+    #pragma mark
+
+    interaction IRTPEncoderSubscription
+    {
+      virtual PUID getID() const = 0;
+
+      virtual void cancel() = 0;
+
+      virtual void background() = 0;
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderForMediaEngine
+    #pragma mark
+
+    interaction IRTPEncoderForMediaEngine : public IRTPForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPEncoderForMediaEngine, ForMediaEngine);
+
+      virtual ~IRTPEncoderForMediaEngine() {}
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderAudioForMediaEngine
+    #pragma mark
+
+    interaction IRTPEncoderAudioForMediaEngine : public IRTPEncoderForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPEncoderAudioForMediaEngine, ForMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderAudio, UseMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderAudioPtr>, PromiseWithRTPEncoderAudio);
+
+      static ForMediaEnginePtr create(
+                                      PromiseWithRTPEncoderAudioPtr promise,
+                                      UseMediaEnginePtr mediaEngine,
+                                      ParametersPtr parameters,
+                                      IRTPEncoderDelegatePtr delegate
+                                      );
+
+      virtual ~IRTPEncoderAudioForMediaEngine() {}
+    };
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderVideoForMediaEngine
+    #pragma mark
+
+    interaction IRTPEncoderVideoForMediaEngine : public IRTPEncoderForMediaEngine
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IRTPEncoderVideoForMediaEngine, ForMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderVideo, UseMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderVideoPtr>, PromiseWithRTPEncoderVideo);
+
+      static ForMediaEnginePtr create(
+                                      PromiseWithRTPEncoderVideoPtr promise,
+                                      UseMediaEnginePtr mediaEngine,
+                                      ParametersPtr parameters,
+                                      IRTPEncoderDelegatePtr delegate
+                                      );
+
+      virtual ~IRTPEncoderVideoForMediaEngine() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderAsyncDelegate
+    #pragma mark
+
+    interaction IRTPEncoderAysncDelegate
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      virtual void onRTPEncoderAudioFrame(
+                                          ImmutableMediaChannelTracePtr trace,
+                                          AudioFramePtr frame
+                                          ) = 0;
+      virtual void onRTPEncoderVideoFrame(
+                                          ImmutableMediaChannelTracePtr trace,
+                                          VideoFramePtr frame
+                                          ) = 0;
+    };
+
+  }
+}
+
+
+
+ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPEncoderDelegate)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::RTPPacketPtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::RTCPPacketPtr, RTCPPacketPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPEncoderPtr, IRTPEncoderPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTP::States, States)
+ZS_DECLARE_PROXY_METHOD_SYNC_2(notifyRTPEncoderRTPPacket, ImmutableMediaChannelTracePtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_METHOD_SYNC_2(notifyRTPEncoderRTCPPacket, ImmutableMediaChannelTracePtr, RTCPPacketPtr)
+ZS_DECLARE_PROXY_METHOD_2(onRTPEncoderStateChanged, IRTPEncoderPtr, States)
+ZS_DECLARE_PROXY_END()
+
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_BEGIN(ortc::internal::IRTPEncoderDelegate, ortc::internal::IRTPEncoderSubscription)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::RTPPacketPtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::RTCPPacketPtr, RTCPPacketPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::internal::IRTPEncoderPtr, IRTPEncoderPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_TYPEDEF(ortc::internal::IRTP::States, States)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_SYNC_2(notifyRTPEncoderRTPPacket, ImmutableMediaChannelTracePtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_SYNC_2(notifyRTPEncoderRTCPPacket, ImmutableMediaChannelTracePtr, RTCPPacketPtr)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_METHOD_2(onRTPEncoderStateChanged, IRTPEncoderPtr, States)
+ZS_DECLARE_PROXY_SUBSCRIPTIONS_END()
+
+ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPEncoderAysncDelegate)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::ImmutableMediaChannelTracePtr, ImmutableMediaChannelTracePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPEncoderAysncDelegate::AudioFramePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPEncoderAysncDelegate::VideoFramePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_METHOD_2(onRTPEncoderAudioFrame, ImmutableMediaChannelTracePtr, AudioFramePtr)
+ZS_DECLARE_PROXY_METHOD_2(onRTPEncoderVideoFrame, ImmutableMediaChannelTracePtr, VideoFramePtr)
+ZS_DECLARE_PROXY_END()
diff --git a/ortc/internal/ortc_Identity.h b/ortc/internal/ortc_Identity.h
index 15037728..f8382ce4 100644
--- a/ortc/internal/ortc_Identity.h
+++ b/ortc/internal/ortc_Identity.h
@@ -98,33 +98,33 @@ namespace ortc
 
       static IdentityPtr create(IDTLSTransportPtr transport);
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual AssertionPtr peerIdentity() const override;
+      AssertionPtr peerIdentity() const override;
 
-      virtual IDTLSTransportPtr transport() const override;
+      IDTLSTransportPtr transport() const override;
 
-      virtual PromiseWithResultPtr getIdentityAssertion(
-                                                        const char *provider,
-                                                        const char *protoocl = "default",
-                                                        const char *username = NULL
-                                                        ) throw (InvalidStateError) override;
+      PromiseWithResultPtr getIdentityAssertion(
+                                                const char *provider,
+                                                const char *protoocol = "default",
+                                                const char *username = NULL
+                                                ) throw (InvalidStateError) override;
 
-      virtual PromiseWithAssertionPtr setIdentityAssertion(const String &assertion) override;
+      PromiseWithAssertionPtr setIdentityAssertion(const String &assertion) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark Identity => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark Identity => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
diff --git a/ortc/internal/ortc_MediaChannelTraceHelper.h b/ortc/internal/ortc_MediaChannelTraceHelper.h
new file mode 100644
index 00000000..f6c09277
--- /dev/null
+++ b/ortc/internal/ortc_MediaChannelTraceHelper.h
@@ -0,0 +1,90 @@
+/*
+ 
+ Copyright (c) 2014, Hookflash Inc. / Hookflash Inc.
+ All rights reserved.
+ 
+ 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.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ 
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+#include <ortc/internal/ortc_IMediaStreamTrack.h>
+
+#include <unordered_map>
+
+#define ORTC_SETTING_MEDIA_CHANNEL_TRACE_HELPER_USAGE_INACTIVITY_AGE_PURGE_TIME_IN_SECONDS "ortc/media-channel-trace-helper/usage-inactivity-age-purge-time-in-seconds"
+#define ORTC_SETTING_MEDIA_CHANNEL_TRACE_HELPER_USAGE_INACTIVITY_AGE_CHECK_MODULAS_VALUE "ortc/media-channel-trace-helper/usage-inactivity-age-check-modulas-value"
+
+namespace ortc
+{
+  namespace internal
+  {
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    //---------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaChannelTraceHelper
+    #pragma mark
+
+    class MediaChannelTraceHelper : public SharedRecursiveLock
+    {
+    public:
+      typedef IMediaStreamTrackTypes::MediaChannelID MediaChannelID;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+
+      typedef uintptr_t TraceHandle;
+
+      struct TraceSourceInfo
+      {
+        int lastUsageAt_ {};
+        ImmutableMediaChannelTracePtr trace_;
+      };
+
+      typedef std::unordered_map<TraceHandle, TraceSourceInfo> TraceSourceInfoMap;
+
+    public:
+      MediaChannelTraceHelper(MediaChannelID mediaChannelID);
+
+      ImmutableMediaChannelTracePtr trace(ImmutableMediaChannelTracePtr sourceTrace);
+
+    protected:
+      void doPurge();
+
+    protected:
+      AutoPUID id_;
+      MediaChannelID selfChannelID_ {};
+      std::atomic<int> lastUsageCount_ {};
+      TraceSourceInfoMap traceSources_;
+
+      Time lastAgeCountTimeAt_ {};
+      int lastAgeCountValueAtTime_ {};
+      Seconds agePurge_ {};
+      int ageCheck_ {};
+    };
+  }
+}
diff --git a/ortc/internal/ortc_MediaDeviceCaptureAudio.h b/ortc/internal/ortc_MediaDeviceCaptureAudio.h
new file mode 100644
index 00000000..53d7f90e
--- /dev/null
+++ b/ortc/internal/ortc_MediaDeviceCaptureAudio.h
@@ -0,0 +1,497 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_IMediaDeviceCapture.h>
+#include <ortc/internal/ortc_MediaChannelTraceHelper.h>
+#include <ortc/IMediaDevices.h>
+
+#include <zsLib/IWakeDelegate.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio (helpers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureAudio
+    #pragma mark
+    
+    class MediaDeviceCaptureAudio : public Any,
+                                    public Noop,
+                                    public MessageQueueAssociator,
+                                    public SharedRecursiveLock,
+                                    public IMediaDeviceCaptureAudioForMediaEngine,
+                                    public zsLib::IWakeDelegate,
+                                    public zsLib::IPromiseSettledDelegate
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IMediaDeviceCaptureAudioForMediaEngine;
+
+      ZS_DECLARE_CLASS_PTR(Media);
+      ZS_DECLARE_CLASS_PTR(MediaSubscriber);
+
+      friend class Media;
+      friend class MediaSubscriber;
+
+      typedef PUID ObjectID;
+      typedef std::map<ObjectID, MediaSubscriberPtr> MediaSubscriberMap;
+      ZS_DECLARE_PTR(MediaSubscriberMap);
+
+      typedef IMediaStreamTrackTypes::MediaChannelID MediaChannelID;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::MediaChannelTrace, MediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithSettingsList, PromiseWithSettingsList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::States, States);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithSettingsList, UsePromiseWithSettingsList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Settings, UseSettings);
+      ZS_DECLARE_TYPEDEF_PTR(std::list<UseSettingsPtr>, SettingsList);
+
+      ZS_DECLARE_TYPEDEF_PTR(std::list<IMediaStreamTrackTypes::TrackConstraintsPtr>, TrackConstraintsList);
+
+      struct PendingSubscriber
+      {
+        MediaDeviceCapturePromisePtr promise_;
+        MediaDeviceObjectID repaceExistingDeviceObjectID_ {};
+        TrackConstraintsPtr constraints_;
+        IMediaDeviceCaptureDelegatePtr delegate_;
+      };
+
+      ZS_DECLARE_TYPEDEF_PTR(std::list<PendingSubscriber>, PendingSubscriberList);
+
+    public:
+      MediaDeviceCaptureAudio(
+                              const make_private &,
+                              IMessageQueuePtr queue,
+                              UseMediaEnginePtr mediaEngine,
+                              const String &deviceID
+                              );
+
+    protected:
+      MediaDeviceCaptureAudio(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create())
+      {}
+
+      void init();
+
+    public:
+      virtual ~MediaDeviceCaptureAudio();
+
+      static MediaDeviceCaptureAudioPtr create(
+                                               UseMediaEnginePtr mediaEngine,
+                                               const String &deviceID
+                                               );
+
+      static MediaDeviceCaptureAudioPtr convert(ForMediaEnginePtr object);
+
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio => (for Media)
+      #pragma mark
+
+      void notifyMediaStateChanged();
+      void notifyMediaFailure(
+                              MediaPtr media,
+                              WORD errorCode,
+                              const char *reason
+                              );
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio => (for MediaSubscribers)
+      #pragma mark
+
+      PUID getID() const { return id_; }
+      void notifySusbcriberGone();
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio => IMediaDeviceForMediaEngine
+      #pragma mark
+
+      bool isDeviceIdle() override;
+      void shutdown() override;
+
+      States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio => IMediaDeviceCaptureForMediaEngine
+      #pragma mark
+
+      void mediaDeviceCaptureSubscribe(
+                                       MediaDeviceCapturePromisePtr promise,
+                                       MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                       TrackConstraintsPtr constraints,
+                                       IMediaDeviceCaptureDelegatePtr delegate
+                                       ) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio => IMediaDeviceCaptureAudioForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio => IWakeDelegate
+      #pragma mark
+
+      void onWake() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio => IPromiseSettledDelegate
+      #pragma mark
+
+      void onPromiseSettled(PromisePtr promise) override;
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio => (internal)
+      #pragma mark
+
+      bool isPending() const { return IMediaDevice::State_Pending == currentState_; }
+      bool isReady() const { return IMediaDevice::State_Active == currentState_; }
+      bool isReinitializing() const { return IMediaDevice::State_Reinitializing == currentState_; }
+      bool isShuttingDown() const { return IMediaDevice::State_ShuttingDown == currentState_; }
+      bool isShutdown() const { return IMediaDevice::State_Shutdown == currentState_; }
+
+      void cancel();
+
+      bool stepShutdownPendingRequests();
+      bool stepShutdownSubscribers();
+      bool stepShutdownMedia();
+
+      void step();
+      bool stepMediaReinitializationShutdown();
+      bool stepDiscoverModes();
+      bool stepFigureOutMode();
+      bool stepWaitForMediaDevice();
+
+      void setState(States state);
+      void setError(PromisePtr promise);
+      void setError(WORD error, const char *inReason);
+
+    public:
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio::Media
+      #pragma mark
+
+      class Media : public MessageQueueAssociator,
+                    public SharedRecursiveLock,
+                    public zsLib::IWakeDelegate
+      {
+      protected:
+        struct make_private {};
+
+        enum MediaStates
+        {
+          MediaState_Pending,
+          MediaState_Ready,
+          MediaState_ShuttingDown,
+          MediaState_Shutdown,
+        };
+
+        static const char *toString(MediaStates state);
+
+      public:
+        ZS_DECLARE_TYPEDEF_PTR(MediaDeviceCaptureAudio, UseOuter);
+
+      public:
+        Media(
+              const make_private &,
+              IMessageQueuePtr queue,
+              UseOuterPtr outer,
+              const String &deviceID,
+              UseSettingsPtr settings
+              );
+
+      protected:
+        void init();
+
+      public:
+        virtual ~Media();
+
+        static MediaPtr create(
+                               IMessageQueuePtr queue,
+                               UseOuterPtr outer,
+                               const String &deviceID,
+                               UseSettingsPtr settings
+                               );
+
+      public:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::Media => (for MediaDeviceCaptureAudio)
+        #pragma mark
+
+        MediaChannelID getID() const { return id_; }
+
+        void shutdown();
+        bool isReady() const;
+        bool isShuttingDown() const;
+        bool isShutdown() const;
+
+        void notifySubscribersChanged(MediaSubscriberMapPtr subscribers);
+
+        //-----------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::Media => IWakeDelegate
+        #pragma mark
+
+        void onWake() override;
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::Media => (internal)
+        #pragma mark
+
+        void cancel();
+        void step();
+
+        void setState(MediaStates state);
+        void setError(PromisePtr promise);
+        void setError(WORD errorCode, const char *inReason);
+
+        void internalNotifySubscribersOfFrame(AudioFramePtr frame);
+
+      public:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::Media => (data)
+        #pragma mark
+
+        AutoPUID id_;
+        MediaWeakPtr thisWeak_;
+
+        MediaPtr gracefulShutdownReference_;
+
+        UseOuterWeakPtr outer_;
+        MediaSubscriberMapPtr subscribers_;
+        String deviceID_;
+        UseSettingsPtr settings_;
+        MediaChannelTracePtr trace_;
+
+        MediaStates currentState_ {MediaState_Pending};
+        WORD lastError_ {};
+        String lastErrorReason_;
+      };
+
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio::MediaSubscriber
+      #pragma mark
+
+      class MediaSubscriber : public MessageQueueAssociator,
+                              public SharedRecursiveLock,
+                              public IMediaDeviceCaptureAudio
+      {
+      protected:
+        struct make_private {};
+
+      public:
+        ZS_DECLARE_TYPEDEF_PTR(MediaDeviceCaptureAudio, UseOuter);
+
+      public:
+        MediaSubscriber(
+                        const make_private &,
+                        IMessageQueuePtr queue,
+                        UseOuterPtr outer,
+                        TrackConstraintsPtr constraints,
+                        IMediaDeviceCaptureDelegatePtr delegate
+                        );
+
+      protected:
+        void init();
+
+      public:
+        virtual ~MediaSubscriber();
+
+        static MediaSubscriberPtr create(
+                                         IMessageQueuePtr queue,
+                                         UseOuterPtr outer,
+                                         TrackConstraintsPtr constraints,
+                                         IMediaDeviceCaptureDelegatePtr delegate
+                                         );
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => (for MediaDeviceCaptureAudio)
+        #pragma mark
+
+        MediaDeviceObjectID getID() const override { return id_; }
+        void shutdown();
+        bool isShutdown() const;
+        void notifyStateChanged(States state);
+        TrackConstraintsPtr getConstraints() const { return constraints_; }
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => (for Media)
+        #pragma mark
+
+        void notifyFrame(
+                         ImmutableMediaChannelTracePtr trace,
+                         AudioFramePtr frame
+                         );
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => IMediaDevice
+        #pragma mark
+
+        // (duplicate) virtual MediaDeviceObjectID getID() const override { return id_; }
+        void cancel() override;
+
+        States getState() const override;
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => IMediaDeviceCapture
+        #pragma mark
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => IMediaDeviceCaptureAudio
+        #pragma mark
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => (internal)
+        #pragma mark
+
+        void setState(States state);
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureAudio::MediaSubscriber => (data)
+        #pragma mark
+
+        AutoPUID id_;
+        MediaSubscriberWeakPtr thisWeak_;
+
+        UseOuterWeakPtr outer_;
+        TrackConstraintsPtr constraints_;
+
+        IMediaDeviceCaptureDelegateWeakPtr notifyDelegate_;
+        IMediaDeviceCaptureDelegatePtr delegate_;
+
+        States lastReportedState_;
+
+        MediaChannelTraceHelper traceHelper_;
+      };
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureAudio => (data)
+      #pragma mark
+
+      AutoPUID id_;
+      MediaDeviceCaptureAudioWeakPtr thisWeak_;
+
+      MediaDeviceCaptureAudioPtr gracefulShutdownReference_;
+
+      UseMediaEngineWeakPtr mediaEngine_;
+      String deviceID_;
+
+      States currentState_ {IMediaDevice::State_Pending};
+      WORD lastError_ {};
+      String lastErrorReason_;
+
+      PromiseWithSettingsListPtr deviceModesPromise_;
+      SettingsList deviceModes_;
+
+      PendingSubscriberList pendingSubscribers_;
+      MediaSubscriberMapPtr subscribers_;
+
+      std::atomic<bool> recheckMode_ {};
+      UseSettingsPtr requiredSettings_;
+      MediaPtr media_;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureAudioFactory
+    #pragma mark
+
+    interaction IMediaDeviceCaptureAudioFactory
+    {
+      static IMediaDeviceCaptureAudioFactory &singleton();
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceCaptureAudio, UseMediaEngine);
+
+      virtual MediaDeviceCaptureAudioPtr create(
+                                                UseMediaEnginePtr mediaEngine,
+                                                const String &deviceID
+                                                );
+    };
+
+    class MediaDeviceCaptureAudioFactory : public IFactory<IMediaDeviceCaptureAudioFactory> {};
+  }
+}
diff --git a/ortc/internal/ortc_MediaDeviceCaptureVideo.h b/ortc/internal/ortc_MediaDeviceCaptureVideo.h
new file mode 100644
index 00000000..890413c5
--- /dev/null
+++ b/ortc/internal/ortc_MediaDeviceCaptureVideo.h
@@ -0,0 +1,502 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_IMediaDeviceCapture.h>
+#include <ortc/internal/ortc_MediaChannelTraceHelper.h>
+#include <ortc/IMediaDevices.h>
+
+#include <zsLib/IWakeDelegate.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceCaptureVideoForMediaEngine);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceCaptureVideo);
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo (helpers)
+    #pragma mark
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceCaptureVideo
+    #pragma mark
+    
+    class MediaDeviceCaptureVideo : public Any,
+                                    public Noop,
+                                    public MessageQueueAssociator,
+                                    public SharedRecursiveLock,
+                                    public IMediaDeviceCaptureVideoForMediaEngine,
+                                    public zsLib::IWakeDelegate,
+                                    public zsLib::IPromiseSettledDelegate
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IMediaDeviceCaptureVideoForMediaEngine;
+
+      ZS_DECLARE_CLASS_PTR(Media);
+      ZS_DECLARE_CLASS_PTR(MediaSubscriber);
+
+      friend class Media;
+      friend class MediaSubscriber;
+
+      typedef PUID ObjectID;
+      typedef std::map<ObjectID, MediaSubscriberPtr> MediaSubscriberMap;
+      ZS_DECLARE_PTR(MediaSubscriberMap);
+
+      typedef IMediaStreamTrackTypes::MediaChannelID MediaChannelID;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::MediaChannelTrace, MediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithSettingsList, PromiseWithSettingsList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::States, States);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithSettingsList, UsePromiseWithSettingsList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Settings, UseSettings);
+      ZS_DECLARE_TYPEDEF_PTR(std::list<UseSettingsPtr>, SettingsList);
+
+      ZS_DECLARE_TYPEDEF_PTR(std::list<IMediaStreamTrackTypes::TrackConstraintsPtr>, TrackConstraintsList);
+
+      struct PendingSubscriber
+      {
+        MediaDeviceCapturePromisePtr promise_;
+        MediaDeviceObjectID repaceExistingDeviceObjectID_ {};
+        TrackConstraintsPtr constraints_;
+        IMediaDeviceCaptureDelegatePtr delegate_;
+      };
+
+      ZS_DECLARE_TYPEDEF_PTR(std::list<PendingSubscriber>, PendingSubscriberList);
+
+    public:
+      MediaDeviceCaptureVideo(
+                              const make_private &,
+                              IMessageQueuePtr queue,
+                              UseMediaEnginePtr mediaEngine,
+                              const String &deviceID
+                              );
+
+    protected:
+      MediaDeviceCaptureVideo(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create())
+      {}
+
+      void init();
+
+    public:
+      virtual ~MediaDeviceCaptureVideo();
+
+      static MediaDeviceCaptureVideoPtr create(
+                                               UseMediaEnginePtr mediaEngine,
+                                               const String &deviceID
+                                               );
+
+      static MediaDeviceCaptureVideoPtr convert(ForMediaEnginePtr object);
+
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo => (for Media)
+      #pragma mark
+
+      void notifyMediaStateChanged();
+      void notifyMediaFailure(
+                              MediaPtr media,
+                              WORD errorCode,
+                              const char *reason
+                              );
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo => (for MediaSubscribers)
+      #pragma mark
+
+      PUID getID() const { return id_; }
+      void notifySusbcriberGone();
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo => IMediaDeviceForMediaEngine
+      #pragma mark
+
+      bool isDeviceIdle() override;
+      void shutdown() override;
+
+      States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo => IMediaDeviceCaptureForMediaEngine
+      #pragma mark
+
+      virtual void mediaDeviceCaptureSubscribe(
+                                               MediaDeviceCapturePromisePtr promise,
+                                               MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                               TrackConstraintsPtr constraints,
+                                               IMediaDeviceCaptureDelegatePtr delegate
+                                               ) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo => IMediaDeviceCaptureVideoForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo => IWakeDelegate
+      #pragma mark
+
+      void onWake() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo => IPromiseSettledDelegate
+      #pragma mark
+
+      void onPromiseSettled(PromisePtr promise) override;
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo => (internal)
+      #pragma mark
+
+      bool isPending() const { return IMediaDevice::State_Pending == currentState_; }
+      bool isReady() const { return IMediaDevice::State_Active == currentState_; }
+      bool isReinitializing() const { return IMediaDevice::State_Reinitializing == currentState_; }
+      bool isShuttingDown() const { return IMediaDevice::State_ShuttingDown == currentState_; }
+      bool isShutdown() const { return IMediaDevice::State_Shutdown == currentState_; }
+
+      void cancel();
+
+      bool stepShutdownPendingRequests();
+      bool stepShutdownSubscribers();
+      bool stepShutdownMedia();
+
+      void step();
+      bool stepMediaReinitializationShutdown();
+      bool stepDiscoverModes();
+      bool stepFigureOutMode();
+      bool stepWaitForMediaDevice();
+
+      void setState(States state);
+      void setError(PromisePtr promise);
+      void setError(WORD error, const char *inReason);
+
+    public:
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo::Media
+      #pragma mark
+
+      class Media : public MessageQueueAssociator,
+                    public SharedRecursiveLock,
+                    public zsLib::IWakeDelegate
+      {
+      protected:
+        struct make_private {};
+
+        enum MediaStates
+        {
+          MediaState_Pending,
+          MediaState_Ready,
+          MediaState_ShuttingDown,
+          MediaState_Shutdown,
+        };
+
+        static const char *toString(MediaStates state);
+
+      public:
+        ZS_DECLARE_TYPEDEF_PTR(MediaDeviceCaptureVideo, UseOuter);
+
+      public:
+        Media(
+              const make_private &,
+              IMessageQueuePtr queue,
+              UseOuterPtr outer,
+              const String &deviceID,
+              UseSettingsPtr settings
+              );
+
+      protected:
+        void init();
+
+      public:
+        virtual ~Media();
+
+        static MediaPtr create(
+                               IMessageQueuePtr queue,
+                               UseOuterPtr outer,
+                               const String &deviceID,
+                               UseSettingsPtr settings
+                               );
+
+      public:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::Media => (for MediaDeviceCaptureVideo)
+        #pragma mark
+
+        MediaChannelID getID() const { return id_; }
+
+        void shutdown();
+        bool isReady() const;
+        bool isShuttingDown() const;
+        bool isShutdown() const;
+
+        void notifySubscribersChanged(MediaSubscriberMapPtr subscribers);
+
+        //-----------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::Media => IWakeDelegate
+        #pragma mark
+
+        void onWake() override;
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::Media => (internal)
+        #pragma mark
+
+        void cancel();
+        void step();
+
+        void setState(MediaStates state);
+        void setError(PromisePtr promise);
+        void setError(WORD errorCode, const char *inReason);
+
+        void internalNotifySubscribersOfFrame(VideoFramePtr frame);
+
+      public:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::Media => (data)
+        #pragma mark
+
+        AutoPUID id_;
+        MediaWeakPtr thisWeak_;
+
+        MediaPtr gracefulShutdownReference_;
+
+        UseOuterWeakPtr outer_;
+        MediaSubscriberMapPtr subscribers_;
+        String deviceID_;
+        UseSettingsPtr settings_;
+        MediaChannelTracePtr trace_;
+
+        MediaStates currentState_ {MediaState_Pending};
+        WORD lastError_ {};
+        String lastErrorReason_;
+      };
+
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo::MediaSubscriber
+      #pragma mark
+
+      class MediaSubscriber : public MessageQueueAssociator,
+                              public SharedRecursiveLock,
+                              public IMediaDeviceCaptureVideo
+      {
+      protected:
+        struct make_private {};
+
+      public:
+        ZS_DECLARE_TYPEDEF_PTR(MediaDeviceCaptureVideo, UseOuter);
+
+      public:
+        MediaSubscriber(
+                        const make_private &,
+                        IMessageQueuePtr queue,
+                        UseOuterPtr outer,
+                        TrackConstraintsPtr constraints,
+                        IMediaDeviceCaptureDelegatePtr delegate
+                        );
+
+      protected:
+        void init();
+
+      public:
+        virtual ~MediaSubscriber();
+
+        static MediaSubscriberPtr create(
+                                         IMessageQueuePtr queue,
+                                         UseOuterPtr outer,
+                                         TrackConstraintsPtr constraints,
+                                         IMediaDeviceCaptureDelegatePtr delegate
+                                         );
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => (for MediaDeviceCaptureVideo)
+        #pragma mark
+
+        MediaDeviceObjectID getID() const override { return id_; }
+        void shutdown();
+        bool isShutdown() const;
+        void notifyStateChanged(States state);
+        TrackConstraintsPtr getConstraints() const { return constraints_; }
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => (for Media)
+        #pragma mark
+
+        void notifyFrame(
+                         ImmutableMediaChannelTracePtr trace,
+                         VideoFramePtr frame
+                         );
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => IMediaDevice
+        #pragma mark
+
+        // (duplicate) virtual MediaDeviceObjectID getID() const override { return id_; }
+        void cancel() override;
+
+        States getState() const override;
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => IMediaDeviceCapture
+        #pragma mark
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => IMediaDeviceCaptureVideo
+        #pragma mark
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => (internal)
+        #pragma mark
+
+        void setState(States state);
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceCaptureVideo::MediaSubscriber => (data)
+        #pragma mark
+
+        AutoPUID id_;
+        MediaSubscriberWeakPtr thisWeak_;
+
+        UseOuterWeakPtr outer_;
+        TrackConstraintsPtr constraints_;
+
+        IMediaDeviceCaptureDelegateWeakPtr notifyDelegate_;
+        IMediaDeviceCaptureDelegatePtr delegate_;
+
+        States lastReportedState_;
+
+        MediaChannelTraceHelper traceHelper_;
+      };
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceCaptureVideo => (data)
+      #pragma mark
+
+      AutoPUID id_;
+      MediaDeviceCaptureVideoWeakPtr thisWeak_;
+
+      MediaDeviceCaptureVideoPtr gracefulShutdownReference_;
+
+      UseMediaEngineWeakPtr mediaEngine_;
+      String deviceID_;
+
+      States currentState_ {IMediaDevice::State_Pending};
+      WORD lastError_ {};
+      String lastErrorReason_;
+
+      PromiseWithSettingsListPtr deviceModesPromise_;
+      SettingsList deviceModes_;
+
+      PendingSubscriberList pendingSubscribers_;
+      MediaSubscriberMapPtr subscribers_;
+
+      std::atomic<bool> recheckMode_ {};
+      UseSettingsPtr requiredSettings_;
+      MediaPtr media_;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceCaptureVideoFactory
+    #pragma mark
+
+    interaction IMediaDeviceCaptureVideoFactory
+    {
+      static IMediaDeviceCaptureVideoFactory &singleton();
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceCaptureVideo, UseMediaEngine);
+
+      virtual MediaDeviceCaptureVideoPtr create(
+                                                UseMediaEnginePtr mediaEngine,
+                                                const String &deviceID
+                                                );
+    };
+
+    class MediaDeviceCaptureVideoFactory : public IFactory<IMediaDeviceCaptureVideoFactory> {};
+  }
+}
diff --git a/ortc/internal/ortc_MediaDeviceRenderAudio.h b/ortc/internal/ortc_MediaDeviceRenderAudio.h
new file mode 100644
index 00000000..33d13afa
--- /dev/null
+++ b/ortc/internal/ortc_MediaDeviceRenderAudio.h
@@ -0,0 +1,502 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_IMediaDeviceRender.h>
+#include <ortc/internal/ortc_MediaChannelTraceHelper.h>
+#include <ortc/IMediaDevices.h>
+
+#include <zsLib/IWakeDelegate.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio (helpers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaDeviceRenderAudio
+    #pragma mark
+    
+    class MediaDeviceRenderAudio : public Any,
+                                   public Noop,
+                                   public MessageQueueAssociator,
+                                   public SharedRecursiveLock,
+                                   public IMediaDeviceRenderAudioForMediaEngine,
+                                   public zsLib::IWakeDelegate,
+                                   public zsLib::IPromiseSettledDelegate
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IMediaDeviceRenderAudioForMediaEngine;
+
+      ZS_DECLARE_CLASS_PTR(Media);
+      ZS_DECLARE_CLASS_PTR(MediaSubscriber);
+
+      friend class Media;
+      friend class MediaSubscriber;
+
+      typedef PUID ObjectID;
+      typedef std::map<ObjectID, MediaSubscriberPtr> MediaSubscriberMap;
+      ZS_DECLARE_PTR(MediaSubscriberMap);
+
+      typedef IMediaStreamTrackTypes::MediaChannelID MediaChannelID;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithSettingsList, PromiseWithSettingsList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::States, States);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithSettingsList, UsePromiseWithSettingsList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Settings, UseSettings);
+      ZS_DECLARE_TYPEDEF_PTR(std::list<UseSettingsPtr>, SettingsList);
+
+      ZS_DECLARE_TYPEDEF_PTR(std::list<IMediaStreamTrackTypes::TrackConstraintsPtr>, TrackConstraintsList);
+
+      struct PendingSubscriber
+      {
+        MediaDeviceRenderPromisePtr promise_;
+        MediaDeviceObjectID repaceExistingDeviceObjectID_ {};
+        TrackConstraintsPtr constraints_;
+        IMediaDeviceRenderDelegatePtr delegate_;
+      };
+
+      ZS_DECLARE_TYPEDEF_PTR(std::list<PendingSubscriber>, PendingSubscriberList);
+
+    public:
+      MediaDeviceRenderAudio(
+                              const make_private &,
+                              IMessageQueuePtr queue,
+                              UseMediaEnginePtr mediaEngine,
+                              const String &deviceID
+                              );
+
+    protected:
+      MediaDeviceRenderAudio(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create())
+      {}
+
+      void init();
+
+    public:
+      virtual ~MediaDeviceRenderAudio();
+
+      static MediaDeviceRenderAudioPtr create(
+                                               UseMediaEnginePtr mediaEngine,
+                                               const String &deviceID
+                                               );
+
+      static MediaDeviceRenderAudioPtr convert(ForMediaEnginePtr object);
+
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio => (for Media)
+      #pragma mark
+
+      void notifyMediaStateChanged();
+      void notifyMediaFailure(
+                              MediaPtr media,
+                              WORD errorCode,
+                              const char *reason
+                              );
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio => (for MediaSubscribers)
+      #pragma mark
+
+      PUID getID() const { return id_; }
+      void notifySusbcriberGone();
+      void notifyAudioFrame(
+                            ImmutableMediaChannelTracePtr trace,
+                            AudioFramePtr frame
+                            );
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio => IMediaDeviceForMediaEngine
+      #pragma mark
+
+      bool isDeviceIdle() override;
+      void shutdown() override;
+
+      States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio => IMediaDeviceRenderForMediaEngine
+      #pragma mark
+
+      void mediaDeviceRenderSubscribe(
+                                      MediaDeviceRenderPromisePtr promise,
+                                      MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                      TrackConstraintsPtr constraints,
+                                      IMediaDeviceRenderDelegatePtr delegate
+                                      ) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio => IMediaDeviceRenderAudioForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio => IWakeDelegate
+      #pragma mark
+
+      void onWake() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio => IPromiseSettledDelegate
+      #pragma mark
+
+      void onPromiseSettled(PromisePtr promise) override;
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio => (internal)
+      #pragma mark
+
+      bool isPending() const { return IMediaDevice::State_Pending == currentState_; }
+      bool isReady() const { return IMediaDevice::State_Active == currentState_; }
+      bool isReinitializing() const { return IMediaDevice::State_Reinitializing == currentState_; }
+      bool isShuttingDown() const { return IMediaDevice::State_ShuttingDown == currentState_; }
+      bool isShutdown() const { return IMediaDevice::State_Shutdown == currentState_; }
+
+      void cancel();
+
+      bool stepShutdownPendingRequests();
+      bool stepShutdownSubscribers();
+      bool stepShutdownMedia();
+
+      void step();
+      bool stepMediaReinitializationShutdown();
+      bool stepDiscoverModes();
+      bool stepFigureOutMode();
+      bool stepWaitForMediaDevice();
+
+      void setState(States state);
+      void setError(PromisePtr promise);
+      void setError(WORD error, const char *inReason);
+
+    public:
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio::Media
+      #pragma mark
+
+      class Media : public MessageQueueAssociator,
+                    public SharedRecursiveLock,
+                    public zsLib::IWakeDelegate
+      {
+      protected:
+        struct make_private {};
+
+        enum MediaStates
+        {
+          MediaState_Pending,
+          MediaState_Ready,
+          MediaState_ShuttingDown,
+          MediaState_Shutdown,
+        };
+
+        static const char *toString(MediaStates state);
+
+      public:
+        ZS_DECLARE_TYPEDEF_PTR(MediaDeviceRenderAudio, UseOuter);
+
+      public:
+        Media(
+              const make_private &,
+              IMessageQueuePtr queue,
+              UseOuterPtr outer,
+              const String &deviceID,
+              UseSettingsPtr settings
+              );
+
+      protected:
+        void init();
+
+      public:
+        virtual ~Media();
+
+        static MediaPtr create(
+                               IMessageQueuePtr queue,
+                               UseOuterPtr outer,
+                               const String &deviceID,
+                               UseSettingsPtr settings
+                               );
+
+      public:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::Media => (for MediaDeviceRenderAudio)
+        #pragma mark
+
+        MediaChannelID getID() const { return id_; }
+
+        void shutdown();
+        bool isReady() const;
+        bool isShuttingDown() const;
+        bool isShutdown() const;
+
+        void notifySubscribersChanged(MediaSubscriberMapPtr subscribers);
+
+        void notifyAudioFrame(
+                              ImmutableMediaChannelTracePtr trace,
+                              AudioFramePtr frame
+                              );
+
+        //-----------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::Media => IWakeDelegate
+        #pragma mark
+
+        virtual void onWake() override;
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::Media => (internal)
+        #pragma mark
+
+        void cancel();
+        void step();
+
+        void setState(MediaStates state);
+        void setError(PromisePtr promise);
+        void setError(WORD errorCode, const char *inReason);
+
+      public:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::Media => (data)
+        #pragma mark
+
+        AutoPUID id_;
+        MediaWeakPtr thisWeak_;
+
+        MediaPtr gracefulShutdownReference_;
+
+        UseOuterWeakPtr outer_;
+        MediaSubscriberMapPtr subscribers_;
+        String deviceID_;
+        UseSettingsPtr settings_;
+
+        MediaStates currentState_ {MediaState_Pending};
+        WORD lastError_ {};
+        String lastErrorReason_;
+      };
+
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio::MediaSubscriber
+      #pragma mark
+
+      class MediaSubscriber : public MessageQueueAssociator,
+                              public SharedRecursiveLock,
+                              public IMediaDeviceRenderAudio
+      {
+      protected:
+        struct make_private {};
+
+      public:
+        ZS_DECLARE_TYPEDEF_PTR(MediaDeviceRenderAudio, UseOuter);
+
+      public:
+        MediaSubscriber(
+                        const make_private &,
+                        IMessageQueuePtr queue,
+                        UseOuterPtr outer,
+                        TrackConstraintsPtr constraints,
+                        IMediaDeviceRenderDelegatePtr delegate
+                        );
+
+      protected:
+        void init();
+
+      public:
+        virtual ~MediaSubscriber();
+
+        static MediaSubscriberPtr create(
+                                         IMessageQueuePtr queue,
+                                         UseOuterPtr outer,
+                                         TrackConstraintsPtr constraints,
+                                         IMediaDeviceRenderDelegatePtr delegate
+                                         );
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::MediaSubscriber => (for MediaDeviceRenderAudio)
+        #pragma mark
+
+        virtual MediaDeviceObjectID getID() const override { return id_; }
+        void shutdown();
+        bool isShutdown() const;
+        void notifyStateChanged(States state);
+        TrackConstraintsPtr getConstraints() const { return constraints_; }
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::MediaSubscriber => (for Media)
+        #pragma mark
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::MediaSubscriber => IMediaDevice
+        #pragma mark
+
+        // (duplicate) virtual MediaDeviceObjectID getID() const override { return id_; }
+        virtual void cancel() override;
+
+        virtual States getState() const override;
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::MediaSubscriber => IMediaDeviceRender
+        #pragma mark
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::MediaSubscriber => IMediaDeviceRenderAudio
+        #pragma mark
+
+        virtual void notifyAudioFrame(
+                                      ImmutableMediaChannelTracePtr trace,
+                                      AudioFramePtr frame
+                                      ) override;
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::MediaSubscriber => (internal)
+        #pragma mark
+
+        void setState(States state);
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaDeviceRenderAudio::MediaSubscriber => (data)
+        #pragma mark
+
+        AutoPUID id_;
+        MediaSubscriberWeakPtr thisWeak_;
+
+        UseOuterWeakPtr outer_;
+        TrackConstraintsPtr constraints_;
+
+        IMediaDeviceRenderDelegateWeakPtr notifyDelegate_;
+        IMediaDeviceRenderDelegatePtr delegate_;
+
+        States lastReportedState_;
+        MediaChannelTraceHelper traceHelper_;
+      };
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaDeviceRenderAudio => (data)
+      #pragma mark
+
+      AutoPUID id_;
+      MediaDeviceRenderAudioWeakPtr thisWeak_;
+
+      MediaDeviceRenderAudioPtr gracefulShutdownReference_;
+
+      UseMediaEngineWeakPtr mediaEngine_;
+      String deviceID_;
+
+      States currentState_ {IMediaDevice::State_Pending};
+      WORD lastError_ {};
+      String lastErrorReason_;
+
+      PromiseWithSettingsListPtr deviceModesPromise_;
+      SettingsList deviceModes_;
+
+      PendingSubscriberList pendingSubscribers_;
+      MediaSubscriberMapPtr subscribers_;
+
+      std::atomic<bool> recheckMode_ {};
+      UseSettingsPtr requiredSettings_;
+      MediaPtr media_;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaDeviceRenderAudioFactory
+    #pragma mark
+
+    interaction IMediaDeviceRenderAudioFactory
+    {
+      static IMediaDeviceRenderAudioFactory &singleton();
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceRenderAudio, UseMediaEngine);
+
+      virtual MediaDeviceRenderAudioPtr create(
+                                                UseMediaEnginePtr mediaEngine,
+                                                const String &deviceID
+                                                );
+    };
+
+    class MediaDeviceRenderAudioFactory : public IFactory<IMediaDeviceRenderAudioFactory> {};
+  }
+}
diff --git a/ortc/internal/ortc_MediaDevices.h b/ortc/internal/ortc_MediaDevices.h
index a695d8da..3805f4ae 100644
--- a/ortc/internal/ortc_MediaDevices.h
+++ b/ortc/internal/ortc_MediaDevices.h
@@ -58,11 +58,13 @@ namespace ortc
 
     interaction IMediaDevicesAsyncDelegate
     {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::Constraints, Constraints)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithDeviceList, PromiseWithDeviceList)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithMediaStreamTrackListPtr, PromiseWithMediaStreamTrackListPtr)
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::Constraints, Constraints);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithDeviceList, PromiseWithDeviceList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithMediaStreamTrackList, PromiseWithMediaStreamTrackList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithSettingsList, PromiseWithSettingsList);
 
       virtual void onEnumerateDevices(PromiseWithDeviceListPtr promise) = 0;
+      virtual void onEnumerateDefaultModes(PromiseWithSettingsListPtr promise, const char *deviceID) = 0;
 
       virtual void onGetUserMedia(PromiseWithMediaStreamTrackListPtr promise, ConstraintsPtr constraints) = 0;
     };
@@ -100,9 +102,10 @@ namespace ortc
       };
       static const char *toString(States state);
 
-      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::Constraints, Constraints)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithDeviceList, PromiseWithDeviceList)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithMediaStreamTrackList, PromiseWithMediaStreamTrackList)
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::Constraints, Constraints);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithDeviceList, PromiseWithDeviceList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithMediaStreamTrackList, PromiseWithMediaStreamTrackList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithSettingsList, PromiseWithSettingsList);
 
     public:
       MediaDevices(
@@ -138,6 +141,7 @@ namespace ortc
       static SupportedConstraintsPtr getSupportedConstraints();
 
       static PromiseWithDeviceListPtr enumerateDevices();
+      static PromiseWithSettingsListPtr enumerateDefaultModes(const char *deviceID);
 
       static PromiseWithMediaStreamTrackListPtr getUserMedia(const Constraints &constraints = Constraints());
 
@@ -148,30 +152,34 @@ namespace ortc
       #pragma mark MediaDevices => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark MediaDevices => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark MediaDevices => IMediaDevicesAsyncDelegate
       #pragma mark
 
-      virtual void onEnumerateDevices(PromiseWithDeviceListPtr promise) override;
+      void onEnumerateDevices(PromiseWithDeviceListPtr promise) override;
+      void onEnumerateDefaultModes(
+                                   PromiseWithSettingsListPtr promise,
+                                   const char *deviceID
+                                   ) override;
 
-      virtual void onGetUserMedia(PromiseWithMediaStreamTrackListPtr promise, ConstraintsPtr constraints) override;
+      void onGetUserMedia(PromiseWithMediaStreamTrackListPtr promise, ConstraintsPtr constraints) override;
 
       //---------------------------------------------------------------------
       #pragma mark
       #pragma mark MessageQueueManager => ISingletonManagerDelegate
       #pragma mark
 
-      virtual void notifySingletonCleanup() override;
+      void notifySingletonCleanup() override;
 
     protected:
       //-----------------------------------------------------------------------
@@ -223,10 +231,11 @@ namespace ortc
 
     interaction IMediaDevicesFactory
     {
-      typedef IMediaDevicesTypes::Constraints Constraints;
-      typedef IMediaDevicesTypes::SupportedConstraintsPtr SupportedConstraintsPtr;
-      typedef IMediaDevicesTypes::PromiseWithDeviceListPtr PromiseWithDeviceListPtr;
-      typedef IMediaDevicesTypes::PromiseWithMediaStreamTrackListPtr PromiseWithMediaStreamTrackListPtr;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::Constraints, Constraints);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::SupportedConstraints, SupportedConstraints);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithDeviceList, PromiseWithDeviceList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithMediaStreamTrackList, PromiseWithMediaStreamTrackList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithSettingsList, PromiseWithSettingsList);
 
       static IMediaDevicesFactory &singleton();
 
@@ -237,6 +246,7 @@ namespace ortc
       virtual SupportedConstraintsPtr getSupportedConstraints();
 
       virtual PromiseWithDeviceListPtr enumerateDevices();
+      virtual PromiseWithSettingsListPtr enumerateDefaultModes(const char *deviceID);
 
       virtual PromiseWithMediaStreamTrackListPtr getUserMedia(const Constraints &constraints = Constraints());
 
@@ -252,6 +262,7 @@ ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaDevicesTypes::ConstraintsPtr, ConstraintsPt
 ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IMediaDevicesAsyncDelegate::PromiseWithDeviceListPtr, PromiseWithDeviceListPtr)
 ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IMediaDevicesAsyncDelegate::PromiseWithMediaStreamTrackListPtr, PromiseWithMediaStreamTrackListPtr)
 ZS_DECLARE_PROXY_METHOD_1(onEnumerateDevices, PromiseWithDeviceListPtr)
+ZS_DECLARE_PROXY_METHOD_2(onEnumerateDefaultModes, PromiseWithSettingsListPtr, const char *)
 ZS_DECLARE_PROXY_METHOD_2(onGetUserMedia, PromiseWithMediaStreamTrackListPtr, ConstraintsPtr)
 ZS_DECLARE_PROXY_END()
 
diff --git a/ortc/internal/ortc_MediaEngine.h b/ortc/internal/ortc_MediaEngine.h
new file mode 100644
index 00000000..870a882b
--- /dev/null
+++ b/ortc/internal/ortc_MediaEngine.h
@@ -0,0 +1,976 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_IMediaDeviceCapture.h>
+#include <ortc/internal/ortc_IMediaDeviceRender.h>
+#include <ortc/internal/ortc_IRTPEncoder.h>
+#include <ortc/internal/ortc_IRTPDecoder.h>
+#include <ortc/internal/ortc_ORTC.h>
+
+#include <ortc/IMediaDevices.h>
+#include <ortc/IMediaStreamTrack.h>
+
+#include <ortc/services/IHTTP.h>
+
+#include <zsLib/Promise.h>
+#include <zsLib/IWakeDelegate.h>
+#include <zsLib/ITimer.h>
+
+#include <webrtc/rtc_base/logging.h>
+#include <webrtc/system_wrappers/include/trace.h>
+//#include <webrtc/rtc_base/tracelog.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineFactory);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceCapture);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceCaptureAudio);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceCaptureVideo);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceRender);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaDeviceRenderAudio);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForRTPSenderChannelAudio);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForRTPSenderChannelVideo);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForRTPReceiverChannelAudio);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForRTPReceiverChannelVideo);
+
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceCaptureAudioForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceCaptureVideoForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceRenderAudioForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IRTPEncoderForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IRTPEncoderAudioForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IRTPEncoderVideoForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IRTPDecoderForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IRTPDecoderAudioForMediaEngine);
+    ZS_DECLARE_INTERACTION_PTR(IRTPDecoderVideoForMediaEngine);
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForORTC
+    #pragma mark
+
+    interaction IMediaEngineForORTC
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForORTC, ForORTC);
+    
+      static void setLogLevel(Log::Level level);
+      static void ntpServerTime(const Milliseconds &value);
+      static void startMediaTracing();
+      static void stopMediaTracing();
+      static bool isMediaTracing();
+      static bool saveMediaTrace(String filename);
+      static bool saveMediaTrace(String host, int port);
+
+      virtual ~IMediaEngineForORTC() {}
+    };
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForMediaDevice
+    #pragma mark
+
+    interaction IMediaEngineForMediaDevice
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDevice, ForDevice);
+
+      virtual void notifyDeviceIsIdleOrShutdownStateChanged() = 0;
+
+      virtual ~IMediaEngineForMediaDevice() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForMediaDeviceCapture
+    #pragma mark
+
+    interaction IMediaEngineForMediaDeviceCapture : public IMediaEngineForMediaDevice
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::MediaDeviceObjectID, MediaDeviceObjectID);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceCapture, ForMediaDeviceCapture);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+
+      typedef zsLib::PromiseWithHolderPtr<IMediaDeviceCapturePtr> MediaDeviceCapturePromise;
+      ZS_DECLARE_PTR(MediaDeviceCapturePromise);
+
+      static MediaDeviceCapturePromisePtr createMediaDeviceCapture(
+                                                                   MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                   Kinds kind,
+                                                                   const TrackConstraints &constraints,
+                                                                   IMediaDeviceCaptureDelegatePtr delegate
+                                                                   );
+
+      virtual ~IMediaEngineForMediaDeviceCapture() {}
+    };
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForMediaDeviceCaptureAudio
+    #pragma mark
+
+    interaction IMediaEngineForMediaDeviceCaptureAudio : public IMediaEngineForMediaDeviceCapture
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceCaptureAudio, ForMediaDeviceCaptureAudio);
+
+      virtual ~IMediaEngineForMediaDeviceCaptureAudio() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForMediaDeviceCaptureVideo
+    #pragma mark
+
+    interaction IMediaEngineForMediaDeviceCaptureVideo : public IMediaEngineForMediaDeviceCapture
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceCaptureVideo, ForMediaDeviceCaptureVideo);
+
+      virtual ~IMediaEngineForMediaDeviceCaptureVideo() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForMediaDeviceRender
+    #pragma mark
+
+    interaction IMediaEngineForMediaDeviceRender : public IMediaEngineForMediaDevice
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceRender, ForMediaDeviceRender);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::MediaDeviceObjectID, MediaDeviceObjectID);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+
+      typedef zsLib::PromiseWithHolderPtr<IMediaDeviceRenderPtr> MediaDeviceRenderPromise;
+      ZS_DECLARE_PTR(MediaDeviceRenderPromise);
+
+      static MediaDeviceRenderPromisePtr createMediaDeviceRender(
+                                                                 MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                 const TrackConstraints &constraints,
+                                                                 IMediaDeviceRenderDelegatePtr delegate
+                                                                 );
+
+      virtual ~IMediaEngineForMediaDeviceRender() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForMediaDeviceRenderAudio : public IMediaEngineForMediaDeviceRender
+    #pragma mark
+
+    interaction IMediaEngineForMediaDeviceRenderAudio : public IMediaEngineForMediaDeviceRender
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaDeviceRenderAudio, ForMediaDeviceRenderAudio);
+
+      virtual ~IMediaEngineForMediaDeviceRenderAudio() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTP
+    #pragma mark
+
+    interaction IMediaEngineForRTP
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTP, ForRTP);
+
+    virtual void notifyRTPShutdownStateChanged() = 0;
+
+      virtual ~IMediaEngineForRTP() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPDecoder
+    #pragma mark
+
+    interaction IMediaEngineForRTPDecoder : public IMediaEngineForRTP
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoder, ForRTPDecode);
+
+      virtual ~IMediaEngineForRTPDecoder() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPDecoderAudio
+    #pragma mark
+
+    interaction IMediaEngineForRTPDecoderAudio : public IMediaEngineForRTPDecoder
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderAudio, ForRTPDecodeAudio);
+
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderAudioPtr>, PromiseWithRTPDecoderAudio);
+
+      static PromiseWithRTPDecoderAudioPtr createRTPDecoderAudio(
+                                                                 const Parameters &parameters,
+                                                                 IRTPDecoderDelegatePtr delegate
+                                                                 );
+
+      virtual ~IMediaEngineForRTPDecoderAudio() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPDecoderVideo
+    #pragma mark
+
+    interaction IMediaEngineForRTPDecoderVideo : public IMediaEngineForRTPDecoder
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderVideo, ForRTPDecodeVideo);
+
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderVideoPtr>, PromiseWithRTPDecoderVideo);
+
+      static PromiseWithRTPDecoderVideoPtr createRTPDecoderVideo(
+                                                                 const Parameters &parameters,
+                                                                 IRTPDecoderDelegatePtr delegate
+                                                                 );
+
+      virtual ~IMediaEngineForRTPDecoderVideo() {}
+    };
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPEncoder
+    #pragma mark
+
+    interaction IMediaEngineForRTPEncoder : public IMediaEngineForRTP
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoder, ForRTPEncode);
+
+      virtual ~IMediaEngineForRTPEncoder() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPEncoderAudio
+    #pragma mark
+
+    interaction IMediaEngineForRTPEncoderAudio : public IMediaEngineForRTPEncoder
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderAudio, ForRTPEncodeAudio);
+
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderAudioPtr>, PromiseWithRTPEncoderAudio);
+
+      static PromiseWithRTPEncoderAudioPtr createRTPEncoderAudio(
+                                                                 const Parameters &parameters,
+                                                                 IRTPEncoderDelegatePtr delegate
+                                                                 );
+
+      virtual ~IMediaEngineForRTPEncoderAudio() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineForRTPEncoderVideo
+    #pragma mark
+
+    interaction IMediaEngineForRTPEncoderVideo : public IMediaEngineForRTPEncoder
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderVideo, ForRTPEncodeVideo);
+
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderVideoPtr>, PromiseWithRTPEncoderVideo);
+
+      static PromiseWithRTPEncoderVideoPtr createRTPEncoderVideo(
+                                                                 const Parameters &parameters,
+                                                                 IRTPEncoderDelegatePtr delegate
+                                                                 );
+
+      virtual ~IMediaEngineForRTPEncoderVideo() {}
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaEngine
+    #pragma mark
+
+    class MediaEngine : public Any,
+                        public Noop,
+                        public MessageQueueAssociator,
+                        public SharedRecursiveLock,
+                        public IMediaEngineForORTC,
+                        public IMediaEngineForMediaDeviceCaptureAudio,
+                        public IMediaEngineForMediaDeviceCaptureVideo,
+                        public IMediaEngineForMediaDeviceRenderAudio,
+                        public IMediaEngineForRTPDecoderAudio,
+                        public IMediaEngineForRTPDecoderVideo,
+                        public IMediaEngineForRTPEncoderAudio,
+                        public IMediaEngineForRTPEncoderVideo,
+                        public IMediaDevicesDelegate,
+                        public zsLib::IWakeDelegate,
+                        public zsLib::ITimerDelegate,
+                        public zsLib::IPromiseSettledDelegate
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IMediaEngineFactory;
+      friend interaction IMediaEngineForORTC;
+      friend interaction IMediaEngineForMediaDeviceCapture;
+      friend interaction IMediaEngineForMediaDeviceCaptureAudio;
+      friend interaction IMediaEngineForMediaDeviceCaptureVideo;
+      friend interaction IMediaEngineForMediaDeviceRender;
+      friend interaction IMediaEngineForMediaDeviceRenderAudio;
+      friend interaction IMediaEngineForRTPSenderChannelAudio;
+      friend interaction IMediaEngineForRTPSenderChannelVideo;
+      friend interaction IMediaEngineForRTPReceiverChannelAudio;
+      friend interaction IMediaEngineForRTPReceiverChannelVideo;
+      friend interaction IMediaEngineForRTPDecoder;
+      friend interaction IMediaEngineForRTPDecoderAudio;
+      friend interaction IMediaEngineForRTPDecoderVideo;
+      friend interaction IMediaEngineForRTPEncoder;
+      friend interaction IMediaEngineForRTPEncoderAudio;
+      friend interaction IMediaEngineForRTPEncoderVideo;
+
+      enum States
+      {
+        State_First,
+
+        State_Pending = State_First,
+        State_WakingUp,
+        State_Ready,
+        State_GoingToSleep,
+        State_Sleeping,
+        State_ShuttingDown,
+        State_Shutdown,
+
+        State_Last = State_Shutdown,
+      };
+
+      static const char *toString(States state);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::MediaDeviceObjectID, MediaDeviceObjectID);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::PromiseWithDeviceList, PromiseWithDeviceList);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevicesTypes::DeviceList, DeviceList);
+      ZS_DECLARE_TYPEDEF_PTR(std::list<String>, StringList);
+
+      struct PendingForMediaDeviceCapture
+      {
+        MediaDeviceObjectID repaceExistingDeviceObjectID_ {};
+        Kinds kind_ { IMediaStreamTrackTypes::Kind_Audio};
+        MediaDeviceCapturePromisePtr promise_;
+        TrackConstraintsPtr constraints_;
+        IMediaDeviceCaptureDelegatePtr delegate_;
+      };
+
+      struct PendingForMediaDeviceRenderInfo
+      {
+        MediaDeviceObjectID repaceExistingDeviceObjectID_{};
+        MediaDeviceRenderPromisePtr promise_;
+        TrackConstraintsPtr constraints_;
+        IMediaDeviceRenderDelegatePtr delegate_;
+      };
+
+      ZS_DECLARE_TYPEDEF_PTR(std::list<PendingForMediaDeviceCapture>, PendingForMediaDeviceCaptureList);
+      ZS_DECLARE_TYPEDEF_PTR(std::list<PendingForMediaDeviceRenderInfo>, PendingForMediaDeviceRenderList);
+
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderAudioPtr>, PromiseWithRTPEncoderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderVideoPtr>, PromiseWithRTPEncoderVideo);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderAudioPtr>, PromiseWithRTPDecoderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderVideoPtr>, PromiseWithRTPDecoderVideo);
+
+      struct PendingForRTPDecodeAudio
+      {
+        PromiseWithRTPDecoderAudioPtr promise_;
+        ParametersPtr parameters_;
+        IRTPDecoderDelegatePtr delegate_;
+      };
+
+      struct PendingForRTPDecodeVideo
+      {
+        PromiseWithRTPDecoderVideoPtr promise_;
+        ParametersPtr parameters_;
+        IRTPDecoderDelegatePtr delegate_;
+      };
+
+      struct PendingForRTPEncodeAudio
+      {
+        PromiseWithRTPEncoderAudioPtr promise_;
+        ParametersPtr parameters_;
+        IRTPEncoderDelegatePtr delegate_;
+      };
+
+      struct PendingForRTPEncodeVideo
+      {
+        PromiseWithRTPEncoderVideoPtr promise_;
+        ParametersPtr parameters_;
+        IRTPEncoderDelegatePtr delegate_;
+      };
+
+      ZS_DECLARE_TYPEDEF_PTR(std::list<PendingForRTPDecodeAudio>, PendingForRTPDecodeAudioList);
+      ZS_DECLARE_TYPEDEF_PTR(std::list<PendingForRTPDecodeVideo>, PendingForRTPDecodeVideoList);
+      ZS_DECLARE_TYPEDEF_PTR(std::list<PendingForRTPEncodeAudio>, PendingForRTPEncodeAudioList);
+      ZS_DECLARE_TYPEDEF_PTR(std::list<PendingForRTPEncodeVideo>, PendingForRTPEncodeVideoList);
+
+      ZS_DECLARE_TYPEDEF_PTR(ortc::services::IHTTP, UseHTTP);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevices, UseMediaDevices);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceCaptureForMediaEngine, UseMediaDeviceCapture);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceCaptureAudioForMediaEngine, UseMediaDeviceCaptureAudio);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceCaptureVideoForMediaEngine, UseMediaDeviceCaptureVideo);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceRenderForMediaEngine, UseMediaDeviceRender);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceRenderAudioForMediaEngine, UseMediaDeviceRenderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPForMediaEngine, UseRTP);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPEncoderForMediaEngine, UseRTPEncoder);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPEncoderAudioForMediaEngine, UseRTPEncoderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPEncoderVideoForMediaEngine, UseRTPEncoderVideo);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPDecoderForMediaEngine, UseRTPDecoder);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPDecoderAudioForMediaEngine, UseRTPDecoderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPDecoderVideoForMediaEngine, UseRTPDecoderVideo);
+
+      typedef String DeviceID;
+      typedef std::map<DeviceID, UseMediaDeviceCapturePtr> DeviceCaptureMap;
+      typedef std::map<DeviceID, UseMediaDeviceRenderPtr> DeviceRenderMap;
+
+      typedef PUID ObjectID;
+      typedef std::map<ObjectID, UseRTPDecoderPtr> RTPDecoderMap;
+      typedef std::map<ObjectID, UseRTPEncoderPtr> RTPEncoderMap;
+      
+      typedef PUID PromiseID;
+      typedef std::map<PromiseID, PromisePtr> PromiseMap;
+
+    public:
+      MediaEngine(
+                  const make_private &,
+                  IMessageQueuePtr queue
+                  );
+
+    protected:
+      MediaEngine(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create())
+      {}
+
+      void init();
+
+    public:
+      virtual ~MediaEngine();
+
+      static MediaEnginePtr singleton();
+      static MediaEnginePtr create();
+
+      static MediaEnginePtr convert(ForORTCPtr object);
+      static MediaEnginePtr convert(ForMediaDeviceCapturePtr object);
+      static MediaEnginePtr convert(ForMediaDeviceRenderPtr object);
+      static MediaEnginePtr convert(ForMediaDeviceRenderAudioPtr object);
+      static MediaEnginePtr convert(ForMediaDeviceCaptureAudioPtr object);
+      static MediaEnginePtr convert(ForMediaDeviceCaptureVideoPtr object);
+      static MediaEnginePtr convert(ForRTPPtr object);
+      static MediaEnginePtr convert(ForRTPDecodePtr object);
+      static MediaEnginePtr convert(ForRTPDecodeAudioPtr object);
+      static MediaEnginePtr convert(ForRTPDecodeVideoPtr object);
+      static MediaEnginePtr convert(ForRTPEncodePtr object);
+      static MediaEnginePtr convert(ForRTPEncodeAudioPtr object);
+      static MediaEnginePtr convert(ForRTPEncodeVideoPtr object);
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForORTC
+      #pragma mark
+
+      static void setLogLevel(Log::Level level)                   { auto engine = singleton(); if (!engine) return; engine->internalSetLogLevel(level); }
+      static void ntpServerTime(const Milliseconds &value)        { auto engine = singleton(); if (!engine) return; engine->internalNTPServerTime(value); }
+      static void startMediaTracing()                             { auto engine = singleton(); if (!engine) return; engine->internalStartMediaTracing(); }
+      static void stopMediaTracing()                              { auto engine = singleton(); if (!engine) return; engine->internalStopMediaTracing(); }
+      static bool isMediaTracing()                                { auto engine = singleton(); if (!engine) return false; return engine->internalIsMediaTracing(); }
+      static bool saveMediaTrace(String filename)                 { auto engine = singleton(); if (!engine) return false; return engine->internalSaveMediaTrace(filename); }
+      static bool saveMediaTrace(String host, int port)           { auto engine = singleton(); if (!engine) return false; return engine->internalSaveMediaTrace(host, port); }
+
+      virtual void internalSetLogLevel(Log::Level level);
+      virtual void internalNTPServerTime(const Milliseconds &value);
+      virtual void internalStartMediaTracing();
+      virtual void internalStopMediaTracing();
+      virtual bool internalIsMediaTracing();
+      virtual bool internalSaveMediaTrace(String filename);
+      virtual bool internalSaveMediaTrace(String host, int port);
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForMediaDevice
+      #pragma mark
+
+      void notifyDeviceIsIdleOrShutdownStateChanged() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForMediaDeviceCapture
+      #pragma mark
+
+      static MediaDeviceCapturePromisePtr createMediaDeviceCapture(
+                                                                   MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                   Kinds kind,
+                                                                   const TrackConstraints &constraints,
+                                                                   IMediaDeviceCaptureDelegatePtr delegate
+                                                                   )                                             { auto engine = singleton(); if (!engine) return MediaDeviceCapturePromise::createRejected(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "singleton gone"), IORTCForInternal::queueDelegate()); return engine->innerCreateMediaDeviceCapture(repaceExistingDeviceObjectID, kind, constraints, delegate); }
+
+      virtual MediaDeviceCapturePromisePtr innerCreateMediaDeviceCapture(
+                                                                         MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                         Kinds kind,
+                                                                         const TrackConstraints &constraints,
+                                                                         IMediaDeviceCaptureDelegatePtr delegate
+                                                                         );
+
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForMediaDeviceCaptureAudio
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForMediaDeviceCaptureVideo
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForMediaDeviceRender
+      #pragma mark
+
+      
+      static MediaDeviceRenderPromisePtr createMediaDeviceRender(
+                                                                 MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                 const TrackConstraints &constraints,
+                                                                 IMediaDeviceRenderDelegatePtr delegate
+                                                                 )                                             { auto engine = singleton(); if (!engine) return MediaDeviceRenderPromise::createRejected(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "singleton gone"), IORTCForInternal::queueDelegate()); return engine->innerCreateMediaDeviceRender(repaceExistingDeviceObjectID, constraints, delegate); }
+
+      virtual MediaDeviceRenderPromisePtr innerCreateMediaDeviceRender(
+                                                                       MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                       const TrackConstraints &constraints,
+                                                                       IMediaDeviceRenderDelegatePtr delegate
+                                                                       );
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForMediaDeviceRenderAudio
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForRTP
+      #pragma mark
+
+      void notifyRTPShutdownStateChanged() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForRTPDecoder
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForRTPDecoderAudio
+      #pragma mark
+
+      static PromiseWithRTPDecoderAudioPtr createRTPDecoderAudio(
+                                                                 const Parameters &parameters,
+                                                                 IRTPDecoderDelegatePtr delegate
+                                                                 )                                                { auto engine = singleton(); if (!engine) return PromiseWithRTPDecoderAudio::createRejected(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "singleton gone"), IORTCForInternal::queueDelegate()); return engine->innerCreateRTPDecoderAudio(parameters, delegate); }
+
+      virtual PromiseWithRTPDecoderAudioPtr innerCreateRTPDecoderAudio(
+                                                                       const Parameters &parameters,
+                                                                       IRTPDecoderDelegatePtr delegate
+                                                                       );
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForRTPDecoderVideo
+      #pragma mark
+
+      static PromiseWithRTPDecoderVideoPtr createRTPDecoderVideo(
+                                                                 const Parameters &parameters,
+                                                                 IRTPDecoderDelegatePtr delegate
+                                                                 )                                                { auto engine = singleton(); if (!engine) return PromiseWithRTPDecoderVideo::createRejected(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "singleton gone"), IORTCForInternal::queueDelegate()); return engine->innerCreateRTPDecoderVideo(parameters, delegate); }
+
+      virtual PromiseWithRTPDecoderVideoPtr innerCreateRTPDecoderVideo(
+                                                                       const Parameters &parameters,
+                                                                       IRTPDecoderDelegatePtr delegate
+                                                                       );
+
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForRTPEncoder
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForRTPEncoderAudio
+      #pragma mark
+
+      static PromiseWithRTPEncoderAudioPtr createRTPEncoderAudio(
+                                                                 const Parameters &parameters,
+                                                                 IRTPEncoderDelegatePtr delegate
+                                                                 )                                                { auto engine = singleton(); if (!engine) return PromiseWithRTPEncoderAudio::createRejected(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "singleton gone"), IORTCForInternal::queueDelegate()); return engine->createRTPEncoderAudio(parameters, delegate); }
+
+      virtual PromiseWithRTPEncoderAudioPtr innerCreateRTPEncoderAudio(
+                                                                       const Parameters &parameters,
+                                                                       IRTPEncoderDelegatePtr delegate
+                                                                       );
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaEngineForRTPEncoderVideo
+      #pragma mark
+
+      static PromiseWithRTPEncoderVideoPtr createRTPEncoderVideo(
+                                                                 const Parameters &parameters,
+                                                                 IRTPEncoderDelegatePtr delegate
+                                                                 )                                                { auto engine = singleton(); if (!engine) return PromiseWithRTPEncoderVideo::createRejected(ErrorAny::create(UseHTTP::HTTPStatusCode_Gone, "singleton gone"), IORTCForInternal::queueDelegate()); return engine->innerCreateRTPEncoderVideo(parameters, delegate); }
+
+      virtual PromiseWithRTPEncoderVideoPtr innerCreateRTPEncoderVideo(
+                                                                       const Parameters &parameters,
+                                                                       IRTPEncoderDelegatePtr delegate
+                                                                       );
+
+    protected:
+      
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IMediaDevicesDelegate
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      void onMediaDevicesChanged() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IWakeDelegate
+      #pragma mark
+
+      void onWake() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => ITimerDelegate
+      #pragma mark
+
+      void onTimer(ITimerPtr timer) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => IPromiseSettledDelegate
+      #pragma mark
+
+      void onPromiseSettled(PromisePtr promise) override;
+
+    protected:
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine::WebRtcTraceCallback
+      #pragma mark
+
+      class WebRtcTraceCallback : public webrtc::TraceCallback
+      {
+      public:
+        void Print(webrtc::TraceLevel level, const char* message, int length) override;
+      };
+
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine::WebRtcTraceCallback
+      #pragma mark
+
+      class WebRtcLogSink : public rtc::LogSink
+      {
+      public:
+        void OnLogMessage(const std::string& message) override;
+      };
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaEngine => webrtc::SetupEventTracer
+      #pragma mark
+
+#if defined(WINRT)
+      static const unsigned char *GetCategoryGroupEnabled(const char *categoryGroup);
+
+      static void __cdecl AddTraceEvent(
+                                        char phase,
+                                        const unsigned char *categoryGroupEnabled,
+                                        const char *name,
+                                        uint64 id,
+                                        int numArgs,
+                                        const char **argNames,
+                                        const unsigned char *argTypes,
+                                        const uint64 *argValues,
+                                        unsigned char flags
+                                        );
+#endif //defined(WINRT)
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark (internal)
+      #pragma mark
+
+#if defined(WINRT)
+      virtual void internalAddTraceEvent(
+                                         char phase,
+                                         const unsigned char *categoryGroupEnabled,
+                                         const char *name,
+                                         uint64_t id,
+                                         int numArgs,
+                                         const char **argNames,
+                                         const unsigned char *argTypes,
+                                         const uint64_t *argValues,
+                                         unsigned char flags
+                                         );
+#endif //defined(WINRT)
+
+      bool isPending() const { return State_Pending == currentState_; }
+      bool isWakingUp() const { return State_WakingUp == currentState_; }
+      bool isReady() const { return State_Ready == currentState_; }
+      bool isGoingToSleep() const { return State_GoingToSleep == currentState_; }
+      bool isSleeping() const { return State_Sleeping == currentState_; }
+      bool isShuttingDown() const { return State_ShuttingDown == currentState_; }
+      bool isShutdown() const { return State_Shutdown == currentState_; }
+
+      void cancel();
+      bool stepShutdownPendingRequests();
+      bool stepShutdownDevicesAndRTP();
+
+      void step();
+
+      bool stepPendingPromises();
+
+      bool stepRefreshDeviceList();
+
+      void stepFixState();
+
+      bool stepWakeUp1();
+      void onStepWakeUp1(PromisePtr promise);
+
+      bool stepGoingToSleep1();
+      void onStepGoingToSleep1(PromisePtr promise);
+
+      bool stepShutdownDevices();
+      bool stepShutdownRTP();
+      bool stepStartPendingDevices();
+      bool stepStartPendingRTP();
+      bool stepReady1();
+      void onReady1(PromisePtr promise);
+
+      void performAsync(std::function<void(PromisePtr)> func);
+
+      template <class Closure>
+      PromisePtr performAsyncClosure(const Closure &closure)                 { auto promise = Promise::create(); pendingPromises_[promise->getID()] = promise; postClosure([promise, closure] { closure(); promise->resolve(); }); return promise; }
+
+      template <class Closure>
+      void performAsyncClosure(PromisePtr promise, const Closure &closure)   { pendingPromises_[promise->getID()] = promise; postClosure([closure] { closure(); }); }
+
+      void setState(States state);
+      void setError(PromisePtr promise);
+      void setError(WORD errorCode, const char *inReason);
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark (data)
+      #pragma mark
+
+      AutoPUID id_;
+      MediaEngineWeakPtr thisWeak_;
+
+      MediaEnginePtr gracefulShutdownReference_;
+
+      std::unique_ptr<WebRtcTraceCallback> traceCallback_;
+      std::unique_ptr<WebRtcLogSink> logSink_;
+      //rtc::TraceLog traceLog_;
+
+      States currentState_ {State_Pending};
+      WORD lastError_ {};
+      String lastErrorReason_;
+
+      bool refreshDevicesList_ {true};
+      IMediaDevicesSubscriptionPtr devicesSubscription_;
+      PromiseWithDeviceListPtr devicesListPromise_;
+      DeviceListPtr mediaDevices_;
+
+      PendingForMediaDeviceCaptureList pendingForMediaDeviceCaptures_;
+      PendingForMediaDeviceRenderList pendingForMediaDeviceRenders_;
+
+      PendingForRTPDecodeAudioList pendingForRTPDecodeAudios_;
+      PendingForRTPDecodeVideoList pendingForRTPDecodeVideos_;
+      PendingForRTPEncodeAudioList pendingForRTPEncodeAudios_;
+      PendingForRTPEncodeVideoList pendingForRTPEncodeVideos_;
+
+      std::atomic<bool> checkForIdleDevices_ {};
+      std::atomic<bool> shuttingDownIdleDevices_ {};
+      DeviceCaptureMap captureDevices_;
+      DeviceRenderMap renderDevices_;
+
+      std::atomic<bool> checkForShutdownRTP_ {};
+      RTPEncoderMap rtpEncoders_;
+      RTPDecoderMap rtpDecoders_;
+
+      std::atomic<bool> completedWakeUp1_ {};
+
+      std::atomic<bool> completedGoingToSleep1_ {};
+
+      PromiseMap pendingPromises_;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaEngineFactory
+    #pragma mark
+
+    interaction IMediaEngineFactory
+    {
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceCapture::MediaDeviceCapturePromise, MediaDeviceCapturePromise);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceRender::MediaDeviceRenderPromise, MediaDeviceRenderPromise);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderAudio::PromiseWithRTPDecoderAudio, PromiseWithRTPDecoderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderVideo::PromiseWithRTPDecoderVideo, PromiseWithRTPDecoderVideo);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderAudio::PromiseWithRTPEncoderAudio, PromiseWithRTPEncoderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderVideo::PromiseWithRTPEncoderVideo, PromiseWithRTPEncoderVideo);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDevice::MediaDeviceObjectID, MediaDeviceObjectID);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+
+      static IMediaEngineFactory &singleton();
+
+      virtual MediaEnginePtr create();
+
+      virtual void setLogLevel(Log::Level level);
+      virtual void ntpServerTime(const Milliseconds &value);
+      virtual void startMediaTracing();
+      virtual void stopMediaTracing();
+      virtual bool isMediaTracing();
+      virtual bool saveMediaTrace(String filename);
+      virtual bool saveMediaTrace(String host, int port);
+
+      virtual MediaDeviceCapturePromisePtr createMediaDeviceCapture(
+                                                                    MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                    Kinds kind,
+                                                                    const TrackConstraints &constraints,
+                                                                    IMediaDeviceCaptureDelegatePtr delegate
+                                                                    );
+
+      virtual MediaDeviceRenderPromisePtr createMediaDeviceRender(
+                                                                  MediaDeviceObjectID repaceExistingDeviceObjectID,
+                                                                  const TrackConstraints &constraints,
+                                                                  IMediaDeviceRenderDelegatePtr delegate
+                                                                  );
+
+      virtual PromiseWithRTPDecoderAudioPtr createRTPDecoderAudio(
+                                                                  const Parameters &parameters,
+                                                                  IRTPDecoderDelegatePtr delegate
+                                                                  );
+      virtual PromiseWithRTPDecoderVideoPtr createRTPDecoderVideo(
+                                                                  const Parameters &parameters,
+                                                                  IRTPDecoderDelegatePtr delegate
+                                                                  );
+
+      virtual PromiseWithRTPEncoderAudioPtr createRTPEncoderAudio(
+                                                                  const Parameters &parameters,
+                                                                  IRTPEncoderDelegatePtr delegate
+                                                                  );
+      virtual PromiseWithRTPEncoderVideoPtr createRTPEncoderVideo(
+                                                                  const Parameters &parameters,
+                                                                  IRTPEncoderDelegatePtr delegate
+                                                                  );
+    };
+
+    class MediaEngineFactory : public IFactory<IMediaEngineFactory> {};
+  }
+}
diff --git a/ortc/internal/ortc_MediaStreamTrack.h b/ortc/internal/ortc_MediaStreamTrack.h
index 43483bb9..7327f08c 100644
--- a/ortc/internal/ortc_MediaStreamTrack.h
+++ b/ortc/internal/ortc_MediaStreamTrack.h
@@ -33,257 +33,33 @@
 
 #include <ortc/internal/types.h>
 
-#include <ortc/IMediaStreamTrack.h>
-#include <ortc/internal/ortc_RTPMediaEngine.h>
+#include <ortc/internal/ortc_IMediaDeviceCapture.h>
+#include <ortc/internal/ortc_IMediaStreamTrack.h>
+#include <ortc/internal/ortc_IMediaStreamTrackChannel.h>
+#include <ortc/internal/ortc_IMediaStreamTrackSubscriber.h>
+
+#include <ortc/IRTPTypes.h>
 
 #include <zsLib/MessageQueueAssociator.h>
 #include <zsLib/ITimer.h>
 
 #include <zsLib/WeightedMovingAverage.h>
 
-#include <webrtc/video_frame.h>
+#include <unordered_map>
 
 namespace ortc
 {
   namespace internal
   {
     ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForSettings);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSender);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSenderChannel);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSenderChannelMediaBase);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSenderChannelAudio);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSenderChannelVideo);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiver);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiverChannel);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiverChannelMediaBase);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiverChannelAudio);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiverChannelVideo);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForMediaDevices);
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderForMediaStreamTrack);
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelForMediaStreamTrack);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverForMediaStreamTrack);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelForMediaStreamTrack);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForMediaStreamTrack);
+    ZS_DECLARE_INTERACTION_PTR(IMediaEngineForMediaStreamTrack);
 
     ZS_DECLARE_INTERACTION_PROXY(IMediaStreamTrackAsyncDelegate);
-    
-    using zsLib::FLOAT;
-    using zsLib::INT;
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPSender
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPSender
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSender, ForSender)
-
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds)
-
-      virtual PUID getID() const = 0;
-
-      virtual void setSender(IRTPSenderPtr sender) = 0;
-
-      virtual Kinds kind() const = 0;
-
-      virtual void notifyAttachSenderChannel(RTPSenderChannelPtr channel) = 0;
-      virtual void notifyDetachSenderChannel(RTPSenderChannelPtr channel) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPSenderChannel
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPSenderChannel
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannel, ForSenderChannel)
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPSenderChannelMediaBase
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPSenderChannelMediaBase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelMediaBase, ForSenderChannelMediaBase)
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPSenderChannelAudio
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPSenderChannelAudio : public IMediaStreamTrackForRTPSenderChannelMediaBase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelAudio, ForSenderChannelAudio)
-
-      virtual ~IMediaStreamTrackForRTPSenderChannelAudio() {}
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPSenderChannelVideo
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPSenderChannelVideo : public IMediaStreamTrackForRTPSenderChannelMediaBase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelVideo, ForSenderChannelVideo)
-
-      virtual ~IMediaStreamTrackForRTPSenderChannelVideo() {}
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPReceiver
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPReceiver
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiver, ForReceiver)
-
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds)
-
-      static MediaStreamTrackPtr create(Kinds kind);
-
-      virtual PUID getID() const = 0;
-
-      virtual void setReceiver(IRTPReceiverPtr receiver) = 0;
-
-      virtual void notifyActiveReceiverChannel(RTPReceiverChannelPtr channel) = 0;
-
-      virtual void setH264Rendering(bool h264Rendering) = 0;
-      virtual bool isH264Rendering() = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPReceiverChannel
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPReceiverChannel
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiverChannel, ForReceiverChannel)
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPReceiverChannelMediabase
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPReceiverChannelMediabase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiverChannelMediabase, ForReceiverChannelMediaBase)
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPReceiverChannelAudio
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPReceiverChannelAudio : public IMediaStreamTrackForRTPReceiverChannelMediabase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiverChannelAudio, ForReceiverChannelAudio)
-
-      virtual ~IMediaStreamTrackForRTPReceiverChannelAudio() {}
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPReceiverChannelVideo
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPReceiverChannelVideo : public IMediaStreamTrackForRTPReceiverChannelMediabase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiverChannelVideo, ForReceiverChannelVideo)
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame);
-
-      virtual void renderVideoFrame(VideoFramePtr videoFrame) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForMediaDevices
-    #pragma mark
 
-    interaction IMediaStreamTrackForMediaDevices
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForMediaDevices, ForMediaDevices)
+    ZS_DECLARE_INTERACTION_PTR(IMediaChannelForMediaStreamTrack);
 
-      virtual ~IMediaStreamTrackForMediaDevices() {}
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IMediaStreamTrackForRTPMediaEngine
-    #pragma mark
-
-    interaction IMediaStreamTrackForRTPMediaEngine
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPMediaEngine, ForMediaEngine)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Settings, Settings)
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame)
-
-      virtual Kinds kind() const = 0;
-      virtual String id() const = 0;
-      virtual bool remote() const = 0;
-
-      virtual TrackConstraintsPtr getConstraints() const = 0;
-      virtual SettingsPtr getSettings() const = 0;
-
-      virtual void renderVideoFrame(VideoFramePtr videoFrame) = 0;
-      virtual void sendCapturedVideoFrame(VideoFramePtr videoFrame) = 0;
-    };
+    using zsLib::FLOAT;
+    using zsLib::INT;
 
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -303,10 +79,12 @@ namespace ortc
 
       virtual Kinds kind() const = 0;
       virtual String id() const = 0;
-      virtual ElementPtr toDebug() const = 0;
+      virtual void trace(
+                         const char *func = NULL,
+                         const char *message = NULL
+                         ) const = 0;
     };
 
-
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
@@ -318,8 +96,6 @@ namespace ortc
     interaction IMediaStreamTrackAsyncDelegate
     {
       ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelForMediaStreamTrack, UseReceiverChannel);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelForMediaStreamTrack, UseSenderChannel);
 
       virtual void onResolveStatsPromise(IStatsProvider::PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats) = 0;
 
@@ -327,11 +103,6 @@ namespace ortc
                                       PromisePtr promise,
                                       TrackConstraintsPtr constraints
                                       ) = 0;
-
-      virtual void onSetActiveReceiverChannel(UseReceiverChannelPtr channel) = 0;
-      
-      virtual void onAttachSenderChannel(UseSenderChannelPtr channel) = 0;
-      virtual void onDetachSenderChannel(UseSenderChannelPtr channel) = 0;
     };
 
     //-------------------------------------------------------------------------
@@ -345,18 +116,17 @@ namespace ortc
     class MediaStreamTrack : public Noop,
                              public MessageQueueAssociator,
                              public SharedRecursiveLock,
-                             public IMediaStreamTrack,
-                             public IMediaStreamTrackForRTPSender,
-                             public IMediaStreamTrackForRTPSenderChannel,
-                             public IMediaStreamTrackForRTPSenderChannelAudio,
-                             public IMediaStreamTrackForRTPSenderChannelVideo,
+                             public internal::IMediaStreamTrack,
+                             public IMediaStreamTrackForMediaStream,
+                             public IMediaStreamTrackForMediaStreamTrackChannel,
+                             public IMediaStreamTrackForMediaStreamTrackSubscriberMedia,
+                             public IMediaStreamTrackForMediaStreamTrackSubscriberRTP,
+                             public IMediaStreamTrackForMediaDevices,
+                             public IMediaStreamTrackForMediaStreamTrackSelector,
                              public IMediaStreamTrackForRTPReceiver,
                              public IMediaStreamTrackForRTPReceiverChannel,
-                             public IMediaStreamTrackForRTPReceiverChannelAudio,
-                             public IMediaStreamTrackForRTPReceiverChannelVideo,
-                             public IMediaStreamTrackForMediaDevices,
-                             public IMediaStreamTrackForRTPMediaEngine,
-                             public IMediaStreamTrackForMediaStream,
+                             public IMediaStreamTrackForRTPSender,
+                             public IMediaStreamTrackForRTPSenderChannel,
                              public IWakeDelegate,
                              public zsLib::ITimerDelegate,
                              public zsLib::IPromiseSettledDelegate,
@@ -366,45 +136,71 @@ namespace ortc
       struct make_private {};
 
     public:
-      friend interaction IMediaStreamTrack;
+      friend interaction ortc::IMediaStreamTrack;
+      friend interaction internal::IMediaStreamTrack;
       friend interaction IMediaStreamTrackFactory;
-      friend interaction IMediaStreamTrackForRTPSender;
-      friend interaction IMediaStreamTrackForRTPSenderChannel;
-      friend interaction IMediaStreamTrackForRTPSenderChannelAudio;
-      friend interaction IMediaStreamTrackForRTPSenderChannelVideo;
+      friend interaction IMediaStreamTrackForMediaStream;
+      friend interaction IMediaStreamTrackForMediaStreamTrackChannel;
+      friend interaction IMediaStreamTrackForMediaStreamTrackSubscriberMedia;
+      friend interaction IMediaStreamTrackForMediaStreamTrackSubscriberRTP;
+      friend interaction IMediaStreamTrackForMediaDevices;
+      friend interaction IMediaStreamTrackForMediaStreamTrackSelector;
       friend interaction IMediaStreamTrackForRTPReceiver;
       friend interaction IMediaStreamTrackForRTPReceiverChannel;
-      friend interaction IMediaStreamTrackForRTPReceiverChannelMediaBase;
-      friend interaction IMediaStreamTrackForRTPReceiverChannelAudio;
-      friend interaction IMediaStreamTrackForRTPReceiverChannelVideo;
-      friend interaction IMediaStreamTrackForMediaDevices;
-      friend interaction IMediaStreamTrackForRTPMediaEngine;
-      friend interaction IMediaStreamTrackForMediaStream;
+      friend interaction IMediaStreamTrackForRTPSender;
+      friend interaction IMediaStreamTrackForRTPSenderChannel;
 
-      ZS_DECLARE_CLASS_PTR(Transport)
-      friend class Transport;
-      
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderForMediaStreamTrack, UseSender)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelForMediaStreamTrack, UseSenderChannel)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverForMediaStreamTrack, UseReceiver)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelForMediaStreamTrack, UseReceiverChannel)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForMediaStreamTrack, UseMediaEngine)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineDeviceResource, UseDeviceResource)
+      enum MediaStreamTrackTypes
+      {
+        MediaStreamTrackType_First,
+
+        MediaStreamTrackType_Capture = MediaStreamTrackType_First,
+        MediaStreamTrackType_Receiver,
+        MediaStreamTrackType_Selector,
+
+        MediaStreamTrackType_Last = MediaStreamTrackType_Selector,
+      };
+
+      static const char *toString(MediaStreamTrackTypes type);
+      MediaStreamTrackTypes toMediaStreamTrackType(const char *inputStr);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForMediaStreamTrack, UseMediaEngine);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Constraints, Constraints);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Settings, Settings);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrack, UseChannel);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberForMediaStreamTrack, UseSubscriber);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberMediaForMediaStreamTrack, UseSubscriberMedia);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberRTPForMediaStreamTrack, UseSubscriberRTP);
 
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Constraints, Constraints)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Settings, Settings)
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaDeviceCapture::MediaDeviceCapturePromise, MediaDeviceCapturePromise);
 
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds)
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame)
+      typedef std::unordered_map<PUID, UseSubscriberPtr> SubscriberMap;
+      ZS_DECLARE_PTR(SubscriberMap);
+
+      typedef std::unordered_map<MediaChannelID, UseChannelPtr> ChannelMap;
+      ZS_DECLARE_PTR(ChannelMap);
 
     public:
+      struct MediaStreamTrackArguments
+      {
+        IMessageQueuePtr queue_;
+        Kinds kind_;
+        MediaStreamTrackTypes type_ {MediaStreamTrackType_First};
+        TrackConstraintsPtr constraints_;
+      };
+
       MediaStreamTrack(
                        const make_private &,
-                       IMessageQueuePtr queue,
-                       Kinds kind,
-                       bool remote,
-                       TrackConstraintsPtr constraints
+                       const MediaStreamTrackArguments &args
                        );
 
     protected:
@@ -419,26 +215,19 @@ namespace ortc
     public:
       virtual ~MediaStreamTrack();
 
-      static MediaStreamTrackPtr create(
-                                        Kinds kind,
-                                        bool remote,
-                                        TrackConstraintsPtr constraints
-                                        );
-
-      static MediaStreamTrackPtr convert(IMediaStreamTrackPtr object);
-      static MediaStreamTrackPtr convert(ForSenderPtr object);
-      static MediaStreamTrackPtr convert(ForSenderChannelPtr object);
-      static MediaStreamTrackPtr convert(ForSenderChannelMediaBasePtr object);
-      static MediaStreamTrackPtr convert(ForSenderChannelAudioPtr object);
-      static MediaStreamTrackPtr convert(ForSenderChannelVideoPtr object);
+      static MediaStreamTrackPtr convert(ortc::IMediaStreamTrackPtr object);
+      static MediaStreamTrackPtr convert(internal::IMediaStreamTrackPtr object);
+      static MediaStreamTrackPtr convert(ForMediaStreamPtr object);
+      static MediaStreamTrackPtr convert(ForMediaStreamTrackChannelPtr object);
+      static MediaStreamTrackPtr convert(ForMediaStreamTrackSubscriberPtr object);
+      static MediaStreamTrackPtr convert(ForMediaStreamTrackSubscriberMediaPtr object);
+      static MediaStreamTrackPtr convert(ForMediaStreamTrackSubscriberRTPPtr object);
+      static MediaStreamTrackPtr convert(ForMediaDevicesPtr object);
+      static MediaStreamTrackPtr convert(ForMediaStreamTrackSelectorPtr object);
       static MediaStreamTrackPtr convert(ForReceiverPtr object);
       static MediaStreamTrackPtr convert(ForReceiverChannelPtr object);
-      static MediaStreamTrackPtr convert(ForReceiverChannelMediaBasePtr object);
-      static MediaStreamTrackPtr convert(ForReceiverChannelAudioPtr object);
-      static MediaStreamTrackPtr convert(ForReceiverChannelVideoPtr object);
-      static MediaStreamTrackPtr convert(ForMediaDevicesPtr object);
-      static MediaStreamTrackPtr convert(ForMediaEnginePtr object);
-      static MediaStreamTrackPtr convert(ForMediaStreamPtr object);
+      static MediaStreamTrackPtr convert(ForSenderPtr object);
+      static MediaStreamTrackPtr convert(ForSenderChannelPtr object);
 
     protected:
       //-----------------------------------------------------------------------
@@ -446,197 +235,179 @@ namespace ortc
       #pragma mark MediaStreamTrack => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrack
+      #pragma mark MediaStreamTrack => ortc::IMediaStreamTrack
       #pragma mark
 
-      static ElementPtr toDebug(MediaStreamTrackPtr object);
+      PUID getID() const override {return id_;}
+
+      void trace(
+                 const char *func = NULL,
+                 const char *message = NULL
+                 ) const override;
 
-      virtual PUID getID() const override {return mID;}
+      IMediaStreamTrackSubscriptionPtr subscribe(IMediaStreamTrackDelegatePtr delegate) override;
 
-      virtual IMediaStreamTrackSubscriptionPtr subscribe(IMediaStreamTrackDelegatePtr delegate) override;
+      Kinds kind() const override;
+      String id() const override;
+      String deviceID() const override;
+      String label() const override;
+      bool enabled() const override;
+      void enabled(bool enabled) override;
+      bool muted() const override;
+      void muted(bool muted) override;
+      bool remote() const override;
+      States readyState() const override;
 
-      virtual Kinds kind() const override;
-      virtual String id() const override;
-      virtual String deviceID() const override;
-      virtual String label() const override;
-      virtual bool enabled() const override;
-      virtual void enabled(bool enabled) override;
-      virtual bool muted() const override;
-      virtual void muted(bool muted) override;
-      virtual bool remote() const override;
-      virtual States readyState() const override;
+      ortc::IMediaStreamTrackPtr clone() const override;
 
-      virtual IMediaStreamTrackPtr clone() const override;
+      void stop() override;
 
-      virtual void stop() override;
+      CapabilitiesPtr getCapabilities() const override;
+      TrackConstraintsPtr getConstraints() const override;
+      SettingsPtr getSettings() const override;
 
-      virtual CapabilitiesPtr getCapabilities() const override;
-      virtual TrackConstraintsPtr getConstraints() const override;
-      virtual SettingsPtr getSettings() const override;
+      PromisePtr applyConstraints(const TrackConstraints &constraints) override;
 
-      virtual PromisePtr applyConstraints(const TrackConstraints &constraints) override;
+      IMediaStreamTrackMediaSubscriptionPtr subscribeMedia(IMediaStreamTrackSyncMediaDelegatePtr delegate) override;
 
-      virtual void setVideoRenderCallback(IMediaStreamTrackRenderCallbackPtr callback) override;
-      virtual void setH264Rendering(bool h264Rendering) override;
-      virtual bool isH264Rendering() override;
+      IMediaStreamTrackMediaSubscriptionPtr subscribeMedia(IMediaStreamTrackAsyncMediaDelegatePtr delegate) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForSettings
+      #pragma mark MediaStreamTrack => internal::IMediaStreamTrack
       #pragma mark
+      
+      virtual IMediaStreamTrackRTPSubscriptionPtr subscribeRTP(
+                                                               const Parameters &rtpEncodingParams,
+                                                               IMediaStreamTrackRTPDelegatePtr delegate
+                                                               ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSender
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForSettings
       #pragma mark
 
-      // (duplicate) virtual PUID getID() const = 0;
-
-      // (duplicate) virtual Kinds kind() const = 0;
-
-      virtual void setSender(IRTPSenderPtr sender) override;
-
-      virtual void notifyAttachSenderChannel(RTPSenderChannelPtr channel) override;
-      virtual void notifyDetachSenderChannel(RTPSenderChannelPtr channel) override;
-
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSenderChannel
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStream
       #pragma mark
 
-      // (duplicate) virtual PUID getID() const = 0;
+      bool isEnded() const override;
+      // (duplicate) virtual Kinds kind() const = 0;
+      // (duplicate) virtual String id() const = 0;
+      // (duplicate) virtual ElementPtr toDebug() const = 0;
 
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSenderChannelMediaBase
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStreamTrackChannel
       #pragma mark
 
-      // (duplicate) virtual PUID getID() const = 0;
-
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSenderChannelAudio
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStreamTrackSubscriber
       #pragma mark
 
+      void notifySubscriberCancelled(UseSubscriberPtr subscriber) override;
+
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSenderChannelVideo
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStreamTrackSubscriberMedia
       #pragma mark
 
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiver
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStreamTrackSubscriberRTP
       #pragma mark
 
-      static MediaStreamTrackPtr create(Kinds kind);
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      virtual void setReceiver(IRTPReceiverPtr receiver) override;
-
-      virtual void notifyActiveReceiverChannel(RTPReceiverChannelPtr channel) override;
-
-      // (duplicate) virtual void setH264Rendering(bool h264Rendering) = 0;
-      // (duplicate) virtual bool isH264Rendering() = 0;
-
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiverChannel
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaDevices
       #pragma mark
 
       // (duplicate) virtual PUID getID() const = 0;
 
+      static ForMediaDevicesPtr createForMediaDevices(
+                                                      IMediaStreamTrackTypes::Kinds kind,
+                                                      const TrackConstraints &constraints
+                                                      );
+      
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiverChannelMediaBase
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaStreamTrackSelector
       #pragma mark
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiverChannelAudio
-      #pragma mark
+      static ForMediaDevicesPtr createForMediaStreamTrackSelector(IMediaStreamTrackTypes::Kinds kind);
 
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiverChannelVideo
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiver
       #pragma mark
 
-      virtual void renderVideoFrame(VideoFramePtr videoFrame) override;
+      static ForReceiverPtr createForReceiver(IMediaStreamTrackTypes::Kinds kind);
+
+      // (duplicate) virtual PUID getID() const = 0;
 
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaDevices
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPReceiverChannel
       #pragma mark
 
+      // (duplicate) virtual PUID getID() const = 0;
+
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForMediaEngine
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSender
       #pragma mark
-
+      
+      // (duplicate) virtual PUID getID() const = 0;
       // (duplicate) virtual Kinds kind() const = 0;
-      // (duplicate) virtual String id() const = 0;
-      // (duplicate) virtual bool remote() const = 0;
-
-      // (duplicate) virtual TrackConstraintsPtr getConstraints() const = 0;
-      // (duplicate) virtual SettingsPtr getSettings() const = 0;
-
-      // (duplicate) virtual void renderVideoFrame(const webrtc::VideoFrame& videoFrame) = 0;
-
-      virtual void sendCapturedVideoFrame(VideoFramePtr videoFrame) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
-      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPMediaEngine
+      #pragma mark MediaStreamTrack => IMediaStreamTrackForRTPSenderChannel
       #pragma mark
-
-      virtual bool isEnded() const override;
+      
+      // (duplicate) virtual PUID getID() const = 0;
       // (duplicate) virtual Kinds kind() const = 0;
-      // (duplicate) virtual String id() const = 0;
-      // (duplicate) virtual ElementPtr toDebug() const = 0;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark MediaStreamTrack => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark MediaStreamTrack => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark MediaStreamTrack => IPromiseSettledDelegate
       #pragma mark
 
-      virtual void onPromiseSettled(PromisePtr promise) override;
+      void onPromiseSettled(PromisePtr promise) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark MediaStreamTrack => IMediaStreamTrackAsyncDelegate
       #pragma mark
 
-      virtual void onResolveStatsPromise(IStatsProvider::PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats) override;
-
-      virtual void onApplyConstraints(
-                                      PromisePtr promise,
-                                      TrackConstraintsPtr constraints
-                                      ) override;
-
-      virtual void onSetActiveReceiverChannel(UseReceiverChannelPtr channel) override;
+      void onResolveStatsPromise(IStatsProvider::PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats) override;
 
-      virtual void onAttachSenderChannel(UseSenderChannelPtr channel) override;
-      virtual void onDetachSenderChannel(UseSenderChannelPtr channel) override;
+      void onApplyConstraints(
+                              PromisePtr promise,
+                              TrackConstraintsPtr constraints
+                              ) override;
 
     protected:
       //-----------------------------------------------------------------------
@@ -644,11 +415,6 @@ namespace ortc
       #pragma mark MediaStreamTrack => (internal)
       #pragma mark
 
-      Log::Params log(const char *message) const;
-      static Log::Params slog(const char *message);
-      Log::Params debug(const char *message) const;
-      virtual ElementPtr toDebug() const;
-
       bool isShuttingDown() const;
       bool isShutdown() const;
 
@@ -660,46 +426,40 @@ namespace ortc
 
       void setState(States state);
       void setError(WORD error, const char *reason = NULL);
- 
+
     protected:
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark MediaStreamTrack => (data)
       #pragma mark
 
-      AutoPUID mID;
-      MediaStreamTrackWeakPtr mThisWeak;
-      MediaStreamTrackPtr mGracefulShutdownReference;
-
-      IMediaStreamTrackDelegateSubscriptions mSubscriptions;
-
-      States mCurrentState {State_Live};
+      AutoPUID id_;
+      MediaStreamTrackWeakPtr thisWeak_;
+      MediaStreamTrackPtr gracefulShutdownReference_;
 
-      WORD mLastError {};
-      String mLastErrorReason;
+      IMediaStreamTrackDelegateSubscriptions subscriptions_;
 
-      String mTrackID;
-      Kinds mKind {Kind_First};
-      bool mRemote {false};
-      String mDeviceID;
-      bool mH264Rendering {false};
+      States currentState_ {State_First};
 
-      UseSenderWeakPtr mSender;
-      UseSenderChannelWeakPtr mSenderChannel;
-      UseReceiverWeakPtr mReceiver;
-      UseReceiverChannelWeakPtr mReceiverChannel;
+      WORD lastError_ {};
+      String lastErrorReason_;
 
-      CapabilitiesPtr mCapabilities;
-      TrackConstraintsPtr mConstraints;
-      SettingsPtr mSettings;
+      String trackId_;
+      String label_;
+      Kinds kind_ {Kind_First};
+      bool enabled_ {false};
+      bool muted_ {false};
+      MediaStreamTrackTypes type_ {MediaStreamTrackType_First};
+      String deviceId_;
 
-      PromiseWithRTPMediaEngineDeviceResourcePtr mDeviceResourceLifetimeHolderPromise;
-      UseDeviceResourcePtr mDeviceResource;
-      IMediaStreamTrackRenderCallbackPtr mVideoRendererCallback;
+      CapabilitiesPtr capabilities_;
+      TrackConstraintsPtr constraints_;
+      SettingsPtr settings_;
 
-      PromisePtr mCloseDevicePromise;
+      SubscriberMapPtr subscribers_;
+      ChannelMapPtr channels_;
 
-      ITimerPtr mStatsTimer;
+      ITimerPtr statsTimer_;
     };
 
     //-------------------------------------------------------------------------
@@ -712,16 +472,20 @@ namespace ortc
 
     interaction IMediaStreamTrackFactory
     {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints)
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::TrackConstraints, TrackConstraints);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForMediaDevices, ForMediaDevices);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiver, ForReceiver);
 
       static IMediaStreamTrackFactory &singleton();
 
-      virtual MediaStreamTrackPtr create(
-                                         IMediaStreamTrackTypes::Kinds kind,
-                                         bool remote,
-                                         TrackConstraintsPtr constraints
-                                         );
-      virtual MediaStreamTrackPtr create(IMediaStreamTrackTypes::Kinds kind);
+      virtual ForMediaDevicesPtr createForMediaDevices(
+                                                       IMediaStreamTrackTypes::Kinds kind,
+                                                       const TrackConstraints &constraints
+                                                       );
+
+      virtual ForReceiverPtr createForReceiver(IMediaStreamTrackTypes::Kinds kind);
+
     };
 
     class MediaStreamTrackFactory : public IFactory<IMediaStreamTrackFactory> {};
@@ -733,11 +497,6 @@ ZS_DECLARE_PROXY_TYPEDEF(ortc::IStatsProvider::PromiseWithStatsReportPtr, Promis
 ZS_DECLARE_PROXY_TYPEDEF(ortc::IStatsReportTypes::StatsTypeSet, StatsTypeSet)
 ZS_DECLARE_PROXY_TYPEDEF(zsLib::PromisePtr, PromisePtr)
 ZS_DECLARE_PROXY_TYPEDEF(ortc::IMediaStreamTrackTypes::TrackConstraintsPtr, TrackConstraintsPtr)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IMediaStreamTrackAsyncDelegate::UseReceiverChannelPtr, UseReceiverChannelPtr)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IMediaStreamTrackAsyncDelegate::UseSenderChannelPtr, UseSenderChannelPtr)
 ZS_DECLARE_PROXY_METHOD_2(onResolveStatsPromise, PromiseWithStatsReportPtr, StatsTypeSet)
 ZS_DECLARE_PROXY_METHOD_2(onApplyConstraints, PromisePtr, TrackConstraintsPtr)
-ZS_DECLARE_PROXY_METHOD_1(onSetActiveReceiverChannel, UseReceiverChannelPtr)
-ZS_DECLARE_PROXY_METHOD_1(onAttachSenderChannel, UseSenderChannelPtr)
-ZS_DECLARE_PROXY_METHOD_1(onDetachSenderChannel, UseSenderChannelPtr)
 ZS_DECLARE_PROXY_END()
diff --git a/ortc/internal/ortc_MediaStreamTrackChannel.h b/ortc/internal/ortc_MediaStreamTrackChannel.h
new file mode 100644
index 00000000..df80325c
--- /dev/null
+++ b/ortc/internal/ortc_MediaStreamTrackChannel.h
@@ -0,0 +1,236 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/ortc_IMediaStreamTrackChannel.h>
+#include <ortc/internal/ortc_IMediaStreamTrackSubscriber.h>
+#include <ortc/internal/ortc_IMediaStreamTrack.h>
+
+#include <ortc/internal/types.h>
+
+#include <ortc/IMediaStreamTrack.h>
+
+#include <zsLib/MessageQueueAssociator.h>
+
+#include <queue>
+
+namespace ortc
+{
+  namespace internal
+  {
+
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaStreamTrackChannel
+    #pragma mark
+
+    class MediaStreamTrackChannel : public Noop,
+                                    public MessageQueueAssociator,
+                                    public SharedRecursiveLock,
+                                    public IMediaStreamTrackChannelForMediaStreamTrack,
+                                    public IMediaStreamTrackChannelForMediaStreamTrackSubscriberMedia,
+                                    public IMediaStreamTrackChannelForMediaStreamTrackSubscriberRTP
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IMediaStreamTrackChannelForMediaStreamTrack;
+      friend interaction IMediaStreamTrackChannelForMediaStreamTrackSubscriber;
+      friend interaction IMediaStreamTrackChannelForMediaStreamTrackSubscriberMedia;
+      friend interaction IMediaStreamTrackChannelForMediaStreamTrackSubscriberRTP;
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriber, ForMediaStreamTrackSubscriber);
+
+      typedef PUID SubscriberObjectID;
+
+      typedef std::map<SubscriberObjectID, IMediaStreamTrackChannelMediaDelegatePtr> MediaDelegateMap;
+      typedef std::map<SubscriberObjectID, IMediaStreamTrackChannelRTPDelegatePtr> RTPDelegateMap;
+
+      typedef std::queue<RTPPacketPtr> RTPPacketQueue;
+      typedef std::queue<RTCPPacketPtr> RTCPPacketQueue;
+      typedef std::queue<AudioFramePtr> AudioFrameQueue;
+      typedef std::queue<VideoFramePtr> VideoFrameQueue;
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::ImmutableParameters, ImmutableParameters);
+
+      ZS_DECLARE_PTR(MediaDelegateMap);
+      ZS_DECLARE_PTR(RTPDelegateMap);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForMediaStreamTrackChannel, UseMediaStreamTrack);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberForMediaStreamTrackChannel, UseMediaStreamTrackSubscriber);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberMediaForMediaStreamTrackChannel, UseMediaStreamTrackSubscriberMedia);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberRTPForMediaStreamTrackChannel, UseMediaStreamTrackSubscriberRTP);
+
+    public:
+      MediaStreamTrackChannel(
+                              const make_private &,
+                              IMessageQueuePtr queue
+                              );
+
+      MediaStreamTrackChannel(Noop, IMessageQueuePtr queue) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create())
+      {}
+
+    protected:
+      void init();
+
+    public:
+      ~MediaStreamTrackChannel();
+
+      MediaStreamTrackChannelPtr convert(ForMediaStreamTrackPtr object);
+      MediaStreamTrackChannelPtr convert(ForMediaStreamTrackSubscriberPtr object);
+      MediaStreamTrackChannelPtr convert(ForMediaStreamTrackSubscriberMediaPtr object);
+      MediaStreamTrackChannelPtr convert(ForMediaStreamTrackSubscriberRTPPtr object);
+
+    protected:
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaChannel (for MediaStreamTrack)
+      #pragma mark
+
+      static ForMediaStreamTrackPtr create(
+                                           size_t timeIndex,
+                                           ImmutableMediaChannelTracePtr trace
+                                           );
+
+      PUID getID() const override { return id_; }
+
+      void shutdown() override;
+
+      void notifyAudioFrame(
+                            size_t timeIndex,
+                            ImmutableMediaChannelTracePtr trace,
+                            AudioFramePtr frame
+                            ) override;
+      void notifyVideoFrame(
+                            size_t timeIndex,
+                            ImmutableMediaChannelTracePtr trace,
+                            VideoFramePtr frame
+                            ) override;
+
+      void notifyRTPPacket(
+                           size_t timeIndex,
+                           ImmutableMediaChannelTracePtr trace,
+                           RTPPacketPtr packet
+                           ) override;
+      void notifyRTCPPacket(
+                            size_t timeIndex,
+                            ImmutableMediaChannelTracePtr trace,
+                            RTPPacketPtr packet
+                            ) override;
+
+      void subscribeComplete() override;
+
+      bool shouldCancel(size_t cleanOlderThanTimeIndex) override;
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaChannel (ForMediaStreamTrackSubscriber)
+      #pragma mark
+
+      virtual void notifyCancelled(SubscriberObjectID subscriberID) override;
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaChannel (ForMediaStreamTrackSubscriberMedia)
+      #pragma mark
+
+      virtual void subscribeMedia(
+                                 SubscriberObjectID subscriberID,
+                                 IMediaStreamTrackChannelMediaDelegatePtr delegate
+                                 ) override;
+
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaChannel (ForMediaStreamTrackSubscriberRTP)
+      #pragma mark
+
+      virtual void subscribeRTP(
+                                SubscriberObjectID subscriberID,
+                                ImmutableParametersPtr params,
+                                IMediaStreamTrackChannelRTPDelegatePtr delegate
+                                ) override;
+
+    protected:
+      //---------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrack::RTPSubscriber => (data)
+      #pragma mark
+
+      AutoPUID id_;
+      MediaStreamTrackChannelWeakPtr thisWeak_;
+
+      bool shutdown_{ false };
+
+      ImmutableMediaChannelTracePtr trace_;
+
+      size_t lastUsageTimeIndex_ {};
+
+      MediaDelegateMap mediaSubscribers_;
+      RTPDelegateMap rtpSubscribers_;
+
+      RTPPacketQueue rtpQueue_;
+      RTCPPacketQueue rtcpQueue_;
+      AudioFrameQueue audioFrames_;
+      VideoFrameQueue videoFrames_;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackChannelFactory
+    #pragma mark
+
+    interaction IMediaStreamTrackChannelFactory
+    {
+      static IMediaStreamTrackChannelFactory &singleton();
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrack, ForMediaStreamTrack);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+
+      virtual ForMediaStreamTrackPtr create(
+                                            size_t timeIndex,
+                                            ImmutableMediaChannelTracePtr trace
+                                            );
+    };
+
+    class MediaStreamTrackChannelFactory : public IFactory<IMediaStreamTrackChannelFactory> {};
+
+  } // namespace internal
+} // namespace ortc
diff --git a/ortc/internal/ortc_MediaStreamTrackMonitor.h b/ortc/internal/ortc_MediaStreamTrackMonitor.h
new file mode 100644
index 00000000..9239a9e3
--- /dev/null
+++ b/ortc/internal/ortc_MediaStreamTrackMonitor.h
@@ -0,0 +1,52 @@
+/*
+
+ Copyright (c) 2017, Hookflash Inc.
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+//#define ORTC_USE_ALTERNATIVE_MEDIASTREAMTRACK_MONITOR
+
+#ifdef ORTC_USE_ALTERNATIVE_MEDIASTREAMTRACK_MONITOR
+#include <ortc/internal/ortc_MediaStreamTrackMonitor_Alternative.h>
+#else
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_IMediaStreamTrackMonitor.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+  }
+}
+
+#endif //ORTC_USE_ALTERNATIVE_MEDIASTREAMTRACK_MONITOR
diff --git a/ortc/internal/ortc_MediaStreamTrackSubscriberMedia.h b/ortc/internal/ortc_MediaStreamTrackSubscriberMedia.h
new file mode 100644
index 00000000..24cbfc55
--- /dev/null
+++ b/ortc/internal/ortc_MediaStreamTrackSubscriberMedia.h
@@ -0,0 +1,268 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/ortc_IMediaStreamTrackSubscriber.h>
+#include <ortc/internal/ortc_IMediaStreamTrack.h>
+#include <ortc/internal/ortc_IMediaStreamTrackChannel.h>
+
+#include <ortc/internal/types.h>
+
+#include <ortc/IRTPTypes.h>
+
+#include <zsLib/MessageQueueAssociator.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaStreamTrackSubscriberMedia
+    #pragma mark
+
+    class MediaStreamTrackSubscriberMedia : public Noop,
+                                            public MessageQueueAssociator,
+                                            public SharedRecursiveLock,
+                                            public IMediaStreamTrackSubscriberMediaForMediaStreamTrack,
+                                            public IMediaStreamTrackSubscriberMediaForMediaStreamTrackChannel,
+                                            public IMediaStreamTrackChannelMediaDelegate
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IMediaStreamTrackSubscriberForMediaStreamTrack;
+      friend interaction IMediaStreamTrackSubscriberMediaForMediaStreamTrack;
+      friend interaction IMediaStreamTrackSubscriberForMediaStreamTrackChannel;
+      friend interaction IMediaStreamTrackSubscriberMediaForMediaStreamTrackChannel;
+
+      ZS_DECLARE_CLASS_PTR(Subscriber);
+
+
+      ZS_DECLARE_TYPEDEF_PTR(MediaStreamTrackSubscriberMedia, UseOuter);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriber, UseMediaChannelBase);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriberMedia, UseMediaChannel);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::OverconstrainedError, OverconstrainedError);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+
+    public:
+      MediaStreamTrackSubscriberMedia(
+                                      IMessageQueuePtr queue
+                                      );
+
+      MediaStreamTrackSubscriberMedia(Noop, IMessageQueuePtr queue) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create())
+      {}
+
+    protected:
+      void init();
+
+    public:
+      ~MediaStreamTrackSubscriberMedia();
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberMedia => IMediaStreamTrackSubscriberForMediaStreamTrack
+      #pragma mark
+
+      PUID getID() const override { return id_; }
+
+      void shutdown() override;
+
+      void notifyChannel(
+                         UseMediaChannelBasePtr mediaChannel,
+                         ImmutableMediaChannelTracePtr trace
+                         ) override;
+
+      void notifyTrackMute(bool isMuted) override;
+      void notifyTrackEnded() override;
+      void notifyOverConstrained(OverconstrainedErrorPtr error) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberMedia => IMediaStreamTrackSubscriberMediaForMediaStreamTrack
+      #pragma mark
+
+      static ForMediaStreamTrackPtr create(
+                                           IMediaStreamTrackMediaSubscriptionPtr &outSubscription,
+                                           IMediaStreamTrackSyncMediaDelegatePtr syncDelegate,
+                                           IMediaStreamTrackAsyncMediaDelegatePtr asyncDelegate
+                                           );
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberMedia => IMediaStreamTrackSubscriberForMediaStreamTrackChannel
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberMedia => IMediaStreamTrackSubscriberMediaForMediaStreamTrackChannel
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => IMediaStreamTrackChannelDelegate
+      #pragma mark
+
+      void notifyMediaChannelCancelled(ImmutableMediaChannelTracePtr trace) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => IMediaStreamTrackChannelMediaDelegate
+      #pragma mark
+
+
+      void notifyMediaChannelAudioFrame(
+                                        ImmutableMediaChannelTracePtr trace,
+                                        AudioFramePtr frame
+                                        ) override;
+      void notifyMediaChannelVideoFrame(
+                                        ImmutableMediaChannelTracePtr trace,
+                                        AudioFramePtr frame
+                                        ) override;
+      
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberMedia (for Subscriber)
+      #pragma mark
+
+      void notifySubscriberCancel();
+
+    public:
+
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberMedia::Subscriber
+      #pragma mark
+
+      class Subscriber : public IMediaStreamTrackMediaSubscription,
+                         public SharedRecursiveLock
+      {
+      public:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaStreamTrackSubscriberMedia::Subscriber => (for MediaSubscriber)
+        #pragma mark
+
+        static SubscriberPtr create(const SharedRecursiveLock &lock);
+
+        void shutdown();
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaStreamTrackSubscriberMedia::Subscriber => IMediaStreamTrackMediaSubscription
+        #pragma mark
+
+        virtual PUID getID() const { return id_; }
+
+        virtual void cancel();
+
+        virtual void background();
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaStreamTrackSubscriberMedia::Subscriber => (internal)
+        #pragma mark
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaStreamTrackSubscriberMedia::Subscriber => (data)
+        #pragma mark
+
+        AutoPUID id_;
+        SubscriberWeakPtr thisWeak_;
+
+        bool shutdown_ {false};
+
+        UseOuterPtr outer_;
+
+        SubscriberPtr backgroundReference_;
+      };
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberMedia => (data)
+      #pragma mark
+
+      AutoPUID id_;
+      MediaStreamTrackSubscriberMediaWeakPtr thisWeak_;
+
+      bool shutdown_{ false };
+
+      SubscriberWeakPtr subscriber_;
+
+      IMediaStreamTrackSyncMediaDelegatePtr syncDelegate_;
+      IMediaStreamTrackAsyncMediaDelegatePtr asyncDelegate_;
+    };
+
+    
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackSubscriberMediaFactory
+    #pragma mark
+
+    interaction IMediaStreamTrackSubscriberMediaFactory
+    {
+      static IMediaStreamTrackSubscriberMediaFactory &singleton();
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberMediaForMediaStreamTrack, ForMediaStreamTrack);
+
+      static ForMediaStreamTrackPtr create(
+                                           IMediaStreamTrackMediaSubscriptionPtr &outSubscription,
+                                           IMediaStreamTrackSyncMediaDelegatePtr syncDelegate,
+                                           IMediaStreamTrackAsyncMediaDelegatePtr asyncDelegate
+                                           );    
+    };
+
+    class MediaStreamTrackSubscriberMediaFactory : public IFactory<IMediaStreamTrackSubscriberMediaFactory> {};
+
+  } // namespace internal
+} // namespace ortc
diff --git a/ortc/internal/ortc_MediaStreamTrackSubscriberRTP.h b/ortc/internal/ortc_MediaStreamTrackSubscriberRTP.h
new file mode 100644
index 00000000..c78c8aea
--- /dev/null
+++ b/ortc/internal/ortc_MediaStreamTrackSubscriberRTP.h
@@ -0,0 +1,283 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/ortc_IMediaStreamTrackSubscriber.h>
+#include <ortc/internal/ortc_IMediaStreamTrack.h>
+#include <ortc/internal/ortc_IMediaStreamTrackChannel.h>
+
+#include <ortc/internal/types.h>
+
+#include <ortc/IRTPTypes.h>
+
+#include <zsLib/MessageQueueAssociator.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark MediaStreamTrackSubscriberRTP
+    #pragma mark
+
+    class MediaStreamTrackSubscriberRTP : public Noop,
+                                          public MessageQueueAssociator,
+                                          public SharedRecursiveLock,
+                                          public IMediaStreamTrackSubscriberRTPForMediaStreamTrack,
+                                          public IMediaStreamTrackSubscriberRTPForMediaStreamTrackChannel,
+                                          public IMediaStreamTrackChannelMediaDelegate,
+                                          public IMediaStreamTrackChannelRTPDelegate
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IMediaStreamTrackSubscriberForMediaStreamTrack;
+      friend interaction IMediaStreamTrackSubscriberRTPForMediaStreamTrack;
+      friend interaction IMediaStreamTrackSubscriberForMediaStreamTrackChannel;
+      friend interaction IMediaStreamTrackSubscriberRTPForMediaStreamTrackChannel;
+
+      ZS_DECLARE_CLASS_PTR(Subscriber);
+
+      ZS_DECLARE_TYPEDEF_PTR(MediaStreamTrackSubscriberRTP, UseOuter);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriber, UseMediaChannelBase);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackChannelForMediaStreamTrackSubscriberRTP, UseMediaChannel);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::OverconstrainedError, OverconstrainedError);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+
+    public:
+      MediaStreamTrackSubscriberRTP(
+                                    IMessageQueuePtr queue
+                                    );
+
+      MediaStreamTrackSubscriberRTP(Noop, IMessageQueuePtr queue) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create())
+      {}
+
+    protected:
+      void init();
+
+    public:
+      ~MediaStreamTrackSubscriberRTP();
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => IMediaStreamTrackSubscriberForMediaStreamTrack
+      #pragma mark
+
+      PUID getID() const override { return id_; }
+
+      void shutdown() override;
+
+      void notifyChannel(
+                         UseMediaChannelBasePtr mediaChannel,
+                         ImmutableMediaChannelTracePtr trace
+                         ) override;
+
+      void notifyTrackMute(bool isMuted) override;
+      void notifyTrackEnded() override;
+      void notifyOverConstrained(OverconstrainedErrorPtr error) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => IMediaStreamTrackSubscriberRTPForMediaStreamTrack
+      #pragma mark
+
+      static ForMediaStreamTrackPtr create(
+                                           IMediaStreamTrackMediaSubscriptionPtr &outSubscription,
+                                           IMediaStreamTrackRTPDelegatePtr delegate
+                                           );
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => IMediaStreamTrackSubscriberForMediaStreamTrackChannel
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => IMediaStreamTrackSubscriberRTPForMediaStreamTrackChannel
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => IMediaStreamTrackChannelDelegate
+      #pragma mark
+
+      void notifyMediaChannelCancelled(ImmutableMediaChannelTracePtr trace) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => IMediaStreamTrackChannelMediaDelegate
+      #pragma mark
+
+
+      void notifyMediaChannelAudioFrame(
+                                        ImmutableMediaChannelTracePtr trace,
+                                        AudioFramePtr frame
+                                        ) override;
+      void notifyMediaChannelVideoFrame(
+                                        ImmutableMediaChannelTracePtr trace,
+                                        AudioFramePtr frame
+                                        ) override;
+
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => IMediaStreamTrackChannelRTPDelegate
+      #pragma mark
+
+      
+      void notifyMediaChannelRTPPacket(
+                                       ImmutableMediaChannelTracePtr trace,
+                                       RTPPacketPtr packet
+                                       ) override;
+      void notifyMediaChannelRTCPPacket(
+                                        ImmutableMediaChannelTracePtr trace,
+                                        RTPPacketPtr packet
+                                        ) override;
+
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => (for Subscriber)
+      #pragma mark
+
+      void notifySubscriberCancel();
+
+    public:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP::Subscriber
+      #pragma mark
+
+      class Subscriber : public IMediaStreamTrackMediaSubscription,
+                         public SharedRecursiveLock
+      {
+      public:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaStreamTrackSubscriberRTP::Subscriber => (for MediaSubscriber)
+        #pragma mark
+
+        static SubscriberPtr create(const SharedRecursiveLock &lock);
+
+        void shutdown();
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaStreamTrackSubscriberRTP::Subscriber => IMediaStreamTrackMediaSubscription
+        #pragma mark
+
+        virtual PUID getID() const { return id_; }
+
+        virtual void cancel();
+
+        virtual void background();
+
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaStreamTrackSubscriberRTP::Subscriber => (internal)
+        #pragma mark
+
+      protected:
+        //---------------------------------------------------------------------
+        #pragma mark
+        #pragma mark MediaStreamTrackSubscriberRTP::Subscriber => (data)
+        #pragma mark
+
+        AutoPUID id_;
+        SubscriberWeakPtr thisWeak_;
+
+        bool shutdown_ {false};
+
+        UseOuterPtr outer_;
+
+        SubscriberPtr backgroundReference_;
+      };
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark MediaStreamTrackSubscriberRTP => (data)
+      #pragma mark
+
+      AutoPUID id_;
+      MediaStreamTrackSubscriberRTPWeakPtr thisWeak_;
+
+      bool shutdown_{ false };
+
+      SubscriberWeakPtr subscriber_;
+
+      IMediaStreamTrackRTPDelegatePtr delegate_;
+
+      ParametersPtr parameters_;
+    };
+
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IMediaStreamTrackSubscriberRTPFactory
+    #pragma mark
+
+    interaction IMediaStreamTrackSubscriberRTPFactory
+    {
+      static IMediaStreamTrackSubscriberRTPFactory &singleton();
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackSubscriberRTPForMediaStreamTrack, ForMediaStreamTrack);
+
+      static ForMediaStreamTrackPtr create(
+                                           IMediaStreamTrackMediaSubscriptionPtr &outSubscription,
+                                           IMediaStreamTrackRTPDelegatePtr delegate
+                                           );    
+    };
+
+    class MediaStreamTrackSubscriberRTPFactory : public IFactory<IMediaStreamTrackSubscriberRTPFactory> {};
+
+
+  } // namespace internal
+} // namespace ortc
diff --git a/ortc/internal/ortc_ORTC.h b/ortc/internal/ortc_ORTC.h
index bd7e3b71..4e8bb2e5 100644
--- a/ortc/internal/ortc_ORTC.h
+++ b/ortc/internal/ortc_ORTC.h
@@ -34,15 +34,21 @@
 #include <ortc/internal/types.h>
 #include <ortc/IORTC.h>
 
-#define ORTC_QUEUE_MAIN_THREAD_NAME "org.ortc.ortcLibMainThread"
-#define ORTC_QUEUE_PIPELINE_THREAD_NAME "org.ortc.ortcLibPipeline"
-#define ORTC_QUEUE_BLOCKING_MEDIA_STARTUP_THREAD_NAME "org.ortc.ortcLibBlockingMedia"
-#define ORTC_QUEUE_CERTIFICATE_GENERATION_NAME "org.ortc.ortcLibCertificateGeneration"
-#define ORTC_QUEUE_PACKET_THREAD_NAME "org.ortc.ortcLibPacketThread."
-#define ORTC_QUEUE_TOTAL_PACKET_THREADS 4
-
-#define ORTC_QUEUE_THREAD_MAIN_PRIORITY  "ortc/ortc-thread-main-priority"
-#define ORTC_QUEUE_THREAD_PIPELINE_PRIORITY  "ortc/ortc-thread-pipeline-priority"
+#define ORTC_QUEUE_MAIN_THREAD_NAME "org.ortc.ortcLib.MainThread"
+#define ORTC_QUEUE_PIPELINE_THREAD_NAME "org.ortc.ortcLib.Pipeline"
+#define ORTC_QUEUE_BLOCKING_MEDIA_STARTUP_THREAD_NAME "org.ortc.ortcLib.BlockingMedia"
+#define ORTC_QUEUE_CERTIFICATE_GENERATION_NAME "org.ortc.ortcLib.CertificateGeneration"
+#define ORTC_QUEUE_MEDIA_DEVICE_THREAD_NAME "org.ortc.ortcLib.MediaDeviceThread."
+#define ORTC_QUEUE_RTP_THREAD_NAME "org.ortc.ortcLib.RTP."
+#define ORTC_QUEUE_TOTAL_MEDIA_DEVICE_THREADS 4
+#define ORTC_QUEUE_TOTAL_RTP_THREADS 4
+
+#define ORTC_SETTING_ORTC_QUEUE_MAIN_THREAD_NAME "ortc/ortc/" ORTC_QUEUE_MAIN_THREAD_NAME
+#define ORTC_SETTING_ORTC_QUEUE_PIPELINE_THREAD_NAME "ortc/ortc/" ORTC_QUEUE_PIPELINE_THREAD_NAME
+#define ORTC_SETTING_ORTC_QUEUE_BLOCKING_MEDIA_STARTUP_THREAD_NAME "ortc/ortc/" ORTC_QUEUE_BLOCKING_MEDIA_STARTUP_THREAD_NAME
+#define ORTC_SETTING_ORTC_QUEUE_CERTIFICATE_GENERATION_NAME "ortc/ortc/" ORTC_QUEUE_CERTIFICATE_GENERATION_NAME
+#define ORTC_SETTING_ORTC_QUEUE_MEDIA_DEVICE_THREAD_NAME "ortc/ortc/" ORTC_QUEUE_MEDIA_DEVICE_THREAD_NAME
+#define ORTC_SETTING_ORTC_QUEUE_RTP_THREAD_NAME "ortc/ortc/" ORTC_QUEUE_RTP_THREAD_NAME
 
 namespace ortc
 {
@@ -64,8 +70,9 @@ namespace ortc
       static IMessageQueuePtr queueDelegate();
       static IMessageQueuePtr queueORTC();
       static IMessageQueuePtr queueORTCPipeline();
-      static IMessageQueuePtr queuePacket();
       static IMessageQueuePtr queueBlockingMediaStartStopThread();
+      static IMessageQueuePtr queueMediaDevices();
+      static IMessageQueuePtr queueRTP();
       static IMessageQueuePtr queueCertificateGeneration();
 
       static Optional<Log::Level> webrtcLogLevel();
@@ -113,9 +120,9 @@ namespace ortc
       virtual PUID getID() const {return mID;}
 
       virtual void setup(IMessageQueuePtr defaultDelegateMessageQueue);
-#ifdef WINRT
+#ifdef WINUWP
       virtual void setup(Windows::UI::Core::CoreDispatcher ^dispatcher);
-#endif //WINRT
+#endif //WINUWP
 
       virtual Milliseconds ntpServerTime() const;
       virtual void ntpServerTime(const Milliseconds &value);
@@ -138,8 +145,9 @@ namespace ortc
       virtual void overrideQueueDelegate(IMessageQueuePtr queue);
       virtual IMessageQueuePtr queueDelegate() const;
       virtual IMessageQueuePtr queueORTC() const;
+      virtual IMessageQueuePtr queueMediaDevices() const;
+      virtual IMessageQueuePtr queueRTP() const;
       virtual IMessageQueuePtr queueORTCPipeline() const;
-      virtual IMessageQueuePtr queuePacket() const;
       virtual IMessageQueuePtr queueBlockingMediaStartStopThread() const;
       virtual IMessageQueuePtr queueCertificateGeneration() const;
 
@@ -153,6 +161,8 @@ namespace ortc
       Log::Params log(const char *message) const;
       static Log::Params slog(const char *message);
 
+      void internalSetup();
+
     protected:
       //---------------------------------------------------------------------
       #pragma mark
@@ -167,8 +177,10 @@ namespace ortc
       mutable IMessageQueuePtr mBlockingMediaStartStopThread;
       mutable IMessageQueuePtr mCertificateGeneration;
 
-      mutable IMessageQueuePtr mPacketQueues[ORTC_QUEUE_TOTAL_PACKET_THREADS];
-      mutable size_t mNextPacketQueueThread {};
+      mutable IMessageQueuePtr mMediaDeviceQueues[ORTC_QUEUE_TOTAL_MEDIA_DEVICE_THREADS];
+      mutable IMessageQueuePtr mRTPQueues[ORTC_QUEUE_TOTAL_RTP_THREADS];
+      mutable size_t mNextMediaQueueThread {};
+      mutable size_t mNextRTPQueueThread {};
 
       Milliseconds mNTPServerTime {};
 
diff --git a/ortc/internal/ortc_RTCPPacket.h b/ortc/internal/ortc_RTCPPacket.h
deleted file mode 100644
index 7fd5ba8e..00000000
--- a/ortc/internal/ortc_RTCPPacket.h
+++ /dev/null
@@ -1,1594 +0,0 @@
-/*
-
- Copyright (c) 2014, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#pragma once
-
-#include <ortc/internal/types.h>
-
-#include <ortc/IICETypes.h>
-
-namespace ortc
-{
-  namespace internal
-  {
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTCPPacket
-    #pragma mark
-
-    class RTCPPacket
-    {
-    protected:
-      struct make_private {};
-
-    public:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::Report
-      #pragma mark
-
-      struct Report
-      {
-        Report *next() const            {return mNext;}
-
-        const BYTE *ptr() const         {return mPtr;}
-        size_t size() const             {return mSize;}
-
-        BYTE version() const            {return mVersion;}
-        size_t padding() const          {return static_cast<size_t>(mPadding);}
-        BYTE reportSpecific() const     {return mReportSpecific;}
-
-        BYTE pt() const                 {return mPT;}
-        static const char *ptToString(BYTE pt);
-        const char *ptToString() const  {return ptToString(mPT);}
-
-      public:
-        Report *mNext {};
-
-        const BYTE *mPtr {};
-        size_t mSize {};
-
-        BYTE mVersion {};
-        BYTE mPadding {};
-        BYTE mReportSpecific {};
-
-        BYTE mPT {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::SenderReceiverCommonReport
-      #pragma mark
-
-      struct SenderReceiverCommonReport : public Report
-      {
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::SenderReceiverCommonReport::ReportBlock
-        #pragma mark
-
-        struct ReportBlock
-        {
-          ReportBlock *next() const                           {return mNext;}
-
-          DWORD ssrc() const                                  {return mSSRC;}
-          BYTE fractionLost() const                           {return mFractionLost;}
-          DWORD cumulativeNumberOfPacketsLost() const         {return mCumulativeNumberOfPacketsLost;}
-          DWORD extendedHighestSequenceNumberReceived() const {return mExtendedHighestSequenceNumberReceived;}
-          DWORD interarrivalJitter() const                    {return mInterarrivalJitter;}
-          DWORD lsr() const                                   {return mLSR;}
-          DWORD dlsr() const                                  {return mDLSR;}
-
-        public:
-          ReportBlock *mNext {};
-
-          DWORD mSSRC {};
-          BYTE mFractionLost {};
-          DWORD mCumulativeNumberOfPacketsLost {};
-          DWORD mExtendedHighestSequenceNumberReceived {};
-          DWORD mInterarrivalJitter {};
-          DWORD mLSR {};  // last SR timestamp
-          DWORD mDLSR {}; // delay since last SR
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::SenderReceiverCommonReport (public)
-        #pragma mark
-
-        size_t rc() const                       {return static_cast<size_t>(mReportSpecific);}
-        DWORD ssrcOfSender() const              {return mSSRCOfSender;}
-
-        ReportBlock *firstReportBlock() const   {return mFirstReportBlock;}
-
-        const BYTE *extension() const           {return mExtension;}
-        size_t extensionSize() const            {return mExtensionSize;}
-
-      public:
-        DWORD mSSRCOfSender {};
-
-        const BYTE *mExtension {};
-        size_t mExtensionSize {};
-
-        ReportBlock *mFirstReportBlock {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::SenderReport
-      #pragma mark
-
-      struct SenderReport : public SenderReceiverCommonReport
-      {
-        // https://tools.ietf.org/html/rfc3550#section-6.4.1
-
-        static const BYTE kPayloadType {200};
-
-        SenderReport *nextSenderReport() const  {return mNextSenderReport;}
-
-        DWORD ntpTimestampMS() const            {return mNTPTimestampMS;}
-        DWORD ntpTimestampLS() const            {return mNTPTimestampLS;}
-        Time ntpTimestamp() const;
-        DWORD rtpTimestamp() const              {return mRTPTimestamp;}
-        DWORD senderPacketCount() const         {return mSenderPacketCount;}
-        DWORD senderOctetCount() const          {return mSenderOctetCount;}
-
-      public:
-        SenderReport *mNextSenderReport {};
-
-        DWORD mNTPTimestampMS {};
-        DWORD mNTPTimestampLS {};
-        DWORD mRTPTimestamp {};
-        DWORD mSenderPacketCount {};
-        DWORD mSenderOctetCount {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::ReceiverReport
-      #pragma mark
-
-      struct ReceiverReport : public SenderReceiverCommonReport
-      {
-        // https://tools.ietf.org/html/rfc3550#section-6.4.2
-
-        static const BYTE kPayloadType {201};
-
-        ReceiverReport *nextReceiverReport() const  {return mNextReceiverReport;}
-
-        DWORD ssrcOfPacketSender() const            {return mSSRCOfSender;}
-
-      public:
-        ReceiverReport *mNextReceiverReport {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::SDES
-      #pragma mark
-
-      struct SDES : public Report
-      {
-        // https://tools.ietf.org/html/rfc3550#section-6.5
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::SDES::Chunk
-        #pragma mark
-
-        struct Chunk
-        {
-          static const BYTE kEndOfItemsType = 0;
-
-          struct StringItem
-          {
-            BYTE type() const                 {return mType;}
-            size_t length() const             {return mLength;}
-            const char *value() const         {return mValue;}
-
-            static const char *typeToString(BYTE type);
-            const char *typeToString() const  {return typeToString(mType);}
-
-          public:
-            StringItem *mNext {};
-
-            BYTE mType {};
-            size_t mLength {};
-            const char *mValue {};
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::CName
-          #pragma mark
-
-          struct CName : public StringItem
-          {
-            // https://tools.ietf.org/html/rfc3550#section-6.5.1
-
-            static const BYTE kItemType = 1;
-
-            CName *next() const                               {return static_cast<CName *>(mNext);}
-
-            const char *userAndDomainName() const             {return value();}
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::Name
-          #pragma mark
-
-          struct Name : public StringItem
-          {
-            // https://tools.ietf.org/html/rfc3550#section-6.5.2
-
-            static const BYTE kItemType = 2;
-
-            Name *next() const                                {return static_cast<Name *>(mNext);}
-
-            const char *commonName() const                    {return value();}
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::Email
-          #pragma mark
-
-          struct Email : public StringItem
-          {
-            // https://tools.ietf.org/html/rfc3550#section-6.5.3
-
-            static const BYTE kItemType = 3;
-
-            Email *next() const                               {return static_cast<Email *>(mNext);}
-
-            const char *emailAddress() const                  {return value();}
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::Phone
-          #pragma mark
-
-          struct Phone : public StringItem
-          {
-            // https://tools.ietf.org/html/rfc3550#section-6.5.4
-
-            static const BYTE kItemType = 4;
-
-            Phone *next() const                               {return static_cast<Phone *>(mNext);}
-
-            const char *phoneNumber() const                   {return value();}
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::Loc
-          #pragma mark
-
-          struct Loc : public StringItem
-          {
-            // https://tools.ietf.org/html/rfc3550#section-6.5.5
-
-            static const BYTE kItemType = 5;
-
-            Loc *next() const                                 {return static_cast<Loc *>(mNext);}
-
-            const char *geographicLocation() const            {return value();}
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::Tool
-          #pragma mark
-
-          struct Tool : public StringItem
-          {
-            // https://tools.ietf.org/html/rfc3550#section-6.5.6
-
-            static const BYTE kItemType = 6;
-
-            Tool *next() const                                {return static_cast<Tool *>(mNext);}
-
-            const char *nameVersion() const                   {return value();}
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::Note
-          #pragma mark
-
-          struct Note : public StringItem
-          {
-            // https://tools.ietf.org/html/rfc3550#section-6.5.7
-
-            static const BYTE kItemType = 7;
-
-            Note *next() const                                {return static_cast<Note *>(mNext);}
-
-            const char *note() const                          {return value();}
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::Priv
-          #pragma mark
-
-          struct Priv : public StringItem
-          {
-            // https://tools.ietf.org/html/rfc3550#section-6.5.8
-
-            static const BYTE kItemType = 8;
-
-            Priv *next() const                                {return static_cast<Priv *>(mNext);}
-
-            size_t prefixLength() const                       {return mPrefixLength;}
-            const char *prefix() const                        {return mPrefix;}
-
-          public:
-            size_t mPrefixLength {};
-            const char *mPrefix {};
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::Unknown
-          #pragma mark
-
-          struct Unknown : public StringItem
-          {
-            Unknown *next() const                             {return static_cast<Unknown *>(mNext);}
-
-            const BYTE *ptr() const                           {return reinterpret_cast<const BYTE *>(value());}
-            size_t size() const                               {return length();}
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::Mid
-          #pragma mark
-
-          struct Mid : public StringItem
-          {
-            // https://tools.ietf.org/html/draft-ietf-mmusic-sdp-bundle-negotiation-23#section-14.2
-            static const BYTE kItemType = 12;  // TBD
-
-            Mid *next() const                                {return static_cast<Mid *>(mNext);}
-
-            const char *mid() const                          {return value();}
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk::Rid
-          #pragma mark
-
-          struct Rid : public StringItem
-          {
-            // https://tools.ietf.org/html/draft-roach-avtext-rid-02#section-4.1
-            static const BYTE kItemType = 13;  // TBD
-
-            Rid *next() const                                {return static_cast<Rid *>(mNext);}
-
-            const char *rid() const                          {return value();}
-          };
-
-          //-------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTCPPacket::SDES::Chunk
-          #pragma mark
-
-          Chunk *next() const                                 {return mNext;}
-
-          DWORD ssrc() const                                  {return mSSRC;}
-
-          size_t count() const                                {return mCount;}
-
-          CName *firstCName() const                           {return mFirstCName;}
-          Name *firstName() const                             {return mFirstName;}
-          Email *firstEmail() const                           {return mFirstEmail;}
-          Phone *firstPhone() const                           {return mFirstPhone;}
-          Loc *firstLoc() const                               {return mFirstLoc;}
-          Tool *firstTool() const                             {return mFirstTool;}
-          Note *firstNote() const                             {return mFirstNote;}
-          Priv *firstPriv() const                             {return mFirstPriv;}
-          Mid *firstMid() const                               {return mFirstMid;}
-          Rid *firstRid() const                               {return mFirstRid;}
-          Unknown *firstUnknown() const                       {return mFirstUnknown;}
-
-          size_t cNameCount() const                           {return mCNameCount;}
-          size_t nameCount() const                            {return mNameCount;}
-          size_t emailCount() const                           {return mEmailCount;}
-          size_t phoneCount() const                           {return mPhoneCount;}
-          size_t locCount() const                             {return mLocCount;}
-          size_t toolCount() const                            {return mToolCount;}
-          size_t noteCount() const                            {return mNoteCount;}
-          size_t privCount() const                            {return mPrivCount;}
-          size_t midCount() const                             {return mMidCount;}
-          size_t ridCount() const                             {return mRidCount;}
-          size_t unknownCount() const                         {return mUnknownCount;}
-
-          CName *cNameAtIndex(size_t index) const;
-          Name *nameAtIndex(size_t index) const;
-          Email *emailAtIndex(size_t index) const;
-          Phone *phoneAtIndex(size_t index) const;
-          Loc *locAtIndex(size_t index) const;
-          Tool *toolAtIndex(size_t index) const;
-          Note *noteAtIndex(size_t index) const;
-          Priv *privAtIndex(size_t index) const;
-          Mid *midAtIndex(size_t index) const;
-          Rid *ridAtIndex(size_t index) const;
-          Unknown *unknownAtIndex(size_t index) const;
-
-        public:
-          Chunk *mNext {};
-
-          DWORD mSSRC {};
-
-          size_t mCount {};
-
-          size_t mCNameCount {};
-          size_t mNameCount {};
-          size_t mEmailCount {};
-          size_t mPhoneCount {};
-          size_t mLocCount {};
-          size_t mToolCount {};
-          size_t mNoteCount {};
-          size_t mPrivCount {};
-          size_t mMidCount {};
-          size_t mRidCount {};
-          size_t mUnknownCount {};
-
-          CName *mFirstCName {};
-          Name *mFirstName {};
-          Email *mFirstEmail {};
-          Phone *mFirstPhone {};
-          Loc *mFirstLoc {};
-          Tool *mFirstTool {};
-          Note *mFirstNote {};
-          Priv *mFirstPriv {};
-          Mid *mFirstMid {};
-          Rid *mFirstRid {};
-          Unknown *mFirstUnknown {};
-        };
-
-        static const BYTE kPayloadType {202};
-
-        SDES *nextSDES() const                  {return mNextSDES;}
-
-        size_t sc() const                       {return static_cast<size_t>(mReportSpecific);}
-
-        Chunk *firstChunk() const               {return mFirstChunk;}
-
-      public:
-        SDES *mNextSDES {};
-
-        Chunk *mFirstChunk {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::Bye
-      #pragma mark
-
-      struct Bye : public Report
-      {
-        // https://tools.ietf.org/html/rfc3550#section-6.6
-
-        static const BYTE kPayloadType {203};
-
-        Bye *nextBye() const                    {return mNextBye;}
-
-        size_t sc() const                       {return static_cast<size_t>(mReportSpecific);}
-
-        DWORD ssrc(size_t index) const;
-
-        const char *reasonForLeaving() const    {return mReasonForLeaving;}
-
-      public:
-        Bye *mNextBye {};
-
-        const char *mReasonForLeaving {};
-
-        DWORD *mSSRCs {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::App
-      #pragma mark
-
-      struct App : public Report
-      {
-        // https://tools.ietf.org/html/rfc3550#section-6.7
-
-        static const BYTE kPayloadType {204};
-
-        App *nextApp() const                    {return mNextApp;}
-
-        BYTE subtype() const                    {return mReportSpecific;}
-
-        DWORD ssrc() const                      {return mSSRC;}
-        const char *name() const                {return &(mName[0]);}
-
-        const BYTE *data() const                {return mData;}
-        size_t dataSize() const                 {return mDataSize;}
-
-      public:
-        App *mNextApp {};
-
-        DWORD mSSRC {};
-        char mName[sizeof(DWORD)+1] {};
-
-        const BYTE *mData {};
-        size_t mDataSize {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::FeedbackMessage
-      #pragma mark
-
-      struct FeedbackMessage : public Report
-      {
-        // https://tools.ietf.org/html/rfc4585#section-6.1
-
-        BYTE fmt() const                                        {return mReportSpecific;}
-
-        DWORD ssrcOfPacketSender() const                        {return mSSRCOfPacketSender;}
-        DWORD ssrcOfMediaSource() const                         {return mSSRCOfMediaSource;}
-
-        const BYTE *fci() const                                 {return mFCI;}
-        size_t fciSize() const                                  {return mFCISize;}
-
-        static const char *fmtToString(BYTE pt, BYTE fmt, DWORD subFmt = 0);
-        const char *fmtToString() const;
-
-      public:
-        DWORD mSSRCOfPacketSender {};
-        DWORD mSSRCOfMediaSource {};
-
-        const BYTE *mFCI {};
-        size_t mFCISize {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::TransportLayerFeedbackMessage
-      #pragma mark
-
-      struct TransportLayerFeedbackMessage : public FeedbackMessage
-      {
-        // https://tools.ietf.org/html/rfc4585#section-6.2
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::TransportLayerFeedbackMessage::GenericNACK
-        #pragma mark
-
-        struct GenericNACK
-        {
-          // https://tools.ietf.org/html/rfc4585#section-6.2.1
-
-          static const BYTE kFmt {1};
-
-          WORD pid() const                                      {return mPID;}
-          WORD blp() const                                      {return mBLP;}
-
-        public:
-          WORD mPID {};
-          WORD mBLP {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::TransportLayerFeedbackMessage::TMMBRCommon
-        #pragma mark
-
-        struct TMMBRCommon
-        {
-          DWORD ssrc() const                                    {return mSSRC;}
-
-          BYTE mxTBRExp() const                                 {return mMxTBRExp;}
-          DWORD mxTBRMantissa() const                           {return mMxTBRMantissa;}
-          WORD measuredOverhead() const                         {return mMeasuredOverhead;}
-
-        public:
-          DWORD mSSRC {};
-
-          BYTE mMxTBRExp {};
-          DWORD mMxTBRMantissa {};
-          WORD mMeasuredOverhead {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::TransportLayerFeedbackMessage::TMMBR
-        #pragma mark
-
-        struct TMMBR : public TMMBRCommon
-        {
-          // http://tools.ietf.org/html/rfc5104#section-4.2.1.1
-
-          static const BYTE kFmt {3};
-
-        public:
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::TransportLayerFeedbackMessage::TMMBN
-        #pragma mark
-
-        struct TMMBN : public TMMBRCommon
-        {
-          // http://tools.ietf.org/html/rfc5104#section-4.2.2.1
-
-          static const BYTE kFmt {4};
-
-        public:
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::TransportLayerFeedbackMessage (public)
-        #pragma mark
-
-        static const BYTE kPayloadType {205};
-
-        TransportLayerFeedbackMessage *nextTransportLayerFeedbackMessage() const  {return mNextTransportLayerFeedbackMessage;}
-
-        size_t genericNACKCount() const                         {return mGenericNACKCount;}
-        GenericNACK *genericNACKAtIndex(size_t index) const;
-
-        size_t tmmbrCount() const                               {return mTMMBRCount;}
-        TMMBR *tmmbrAtIndex(size_t index) const;
-
-        size_t tmmbnCount() const                               {return mTMMBNCount;}
-        TMMBN *tmmbnAtIndex(size_t index) const;
-
-        TransportLayerFeedbackMessage *unknown() const          {return mUnknown;}
-
-      public:
-        TransportLayerFeedbackMessage *mNextTransportLayerFeedbackMessage {};
-
-        size_t mGenericNACKCount {};
-        GenericNACK *mFirstGenericNACK {};
-
-        size_t mTMMBRCount {};
-        TMMBR *mFirstTMMBR {};
-
-        size_t mTMMBNCount {};
-        TMMBN *mFirstTMMBN {};
-
-        TransportLayerFeedbackMessage *mUnknown {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage
-      #pragma mark
-
-      struct PayloadSpecificFeedbackMessage : public FeedbackMessage
-      {
-        // https://tools.ietf.org/html/rfc4585#section-6.3
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::PLI
-        #pragma mark
-
-        struct PLI
-        {
-          // https://tools.ietf.org/html/rfc4585#section-6.3.1
-
-          static const BYTE kFmt {1};
-        public:
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::SLI
-        #pragma mark
-
-        struct SLI
-        {
-          // https://tools.ietf.org/html/rfc4585#section-6.3.2
-
-          static const BYTE kFmt {2};
-
-          WORD first() const                        {return mFirst;}
-          WORD number() const                       {return mNumber;}
-          BYTE pictureID() const                    {return mPictureID;}
-
-        public:
-          WORD mFirst {};
-          WORD mNumber {};
-          BYTE mPictureID {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::RPSI
-        #pragma mark
-
-        struct RPSI
-        {
-          // https://tools.ietf.org/html/rfc4585#section-6.3.3
-
-          static const BYTE kFmt {3};
-
-          BYTE zeroBit() const                          {return mZeroBit;}
-          BYTE payloadType() const                      {return mPayloadType;}
-
-          const BYTE *nativeRPSIBitString() const       {return mNativeRPSIBitString;}
-          size_t nativeRPSIBitStringSizeInBits() const  {return mNativeRPSIBitStringSizeInBits;}
-
-        public:
-          BYTE mZeroBit {};
-          BYTE mPayloadType {};
-
-          const BYTE *mNativeRPSIBitString {};
-          size_t mNativeRPSIBitStringSizeInBits {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::FIR
-        #pragma mark
-
-        struct CodecControlCommon
-        {
-          DWORD ssrc() const                        {return mSSRC;}
-          BYTE seqNr() const                        {return mSeqNr;}
-          DWORD reserved() const                    {return mReserved;}
-
-        public:
-          DWORD mSSRC {};
-          BYTE mSeqNr {};
-          DWORD mReserved {};
-          DWORD mControlSpecific {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::FIR
-        #pragma mark
-
-        struct FIR : public CodecControlCommon
-        {
-          // http://tools.ietf.org/html/rfc5104#section-4.3.1.1
-
-          static const BYTE kFmt {4};
-
-        public:
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::TSTR
-        #pragma mark
-
-        struct TSTR : public CodecControlCommon
-        {
-          // http://tools.ietf.org/html/rfc5104#section-4.3.2.1
-
-          static const BYTE kFmt {5};
-
-          BYTE index() const                        {return static_cast<BYTE>(mControlSpecific);}
-
-        public:
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::TSTN
-        #pragma mark
-
-        struct TSTN : public CodecControlCommon
-        {
-          // http://tools.ietf.org/html/rfc5104#section-4.3.3.1
-
-          static const BYTE kFmt {6};
-
-          BYTE index() const                        {return static_cast<BYTE>(mControlSpecific);}
-
-        public:
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::VBCM
-        #pragma mark
-
-        struct VBCM : public CodecControlCommon
-        {
-          // http://tools.ietf.org/html/rfc5104#section-4.3.4.1
-
-          static const BYTE kFmt {7};
-
-          BYTE zeroBit() const;
-          BYTE payloadType() const;
-
-          const BYTE *vbcmOctetString() const     {return mVBCMOctetString;}
-          size_t vbcmOctetStringSize() const;
-
-        public:
-          const BYTE *mVBCMOctetString {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::AFB
-        #pragma mark
-
-        struct AFB
-        {
-          // https://tools.ietf.org/html/rfc4585#section-6.4
-
-          static const BYTE kFmt {15};
-
-          const BYTE *data() const                  {return mData;}
-          size_t dataSize() const                   {return mDataSize;}
-
-        public:
-          const BYTE *mData {};
-          size_t mDataSize {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage::REMB
-        #pragma mark
-
-        struct REMB
-        {
-          // https://tools.ietf.org/html/draft-alvestrand-rmcat-remb-03#section-2.2
-
-          static const BYTE kFmt {15};
-
-          size_t numSSRC() const                    {return static_cast<size_t>(mNumSSRC);}
-          BYTE brExp() const                        {return mBRExp;}
-          DWORD brMantissa() const                  {return mBRMantissa;}
-
-          DWORD ssrcAtIndex(size_t index) const;
-
-        public:
-          BYTE mNumSSRC {};
-          BYTE mBRExp {};
-          DWORD mBRMantissa {};
-          DWORD *mSSRCs {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::PayloadSpecificFeedbackMessage (public)
-        #pragma mark
-
-        static const BYTE kPayloadType {206};
-
-        PayloadSpecificFeedbackMessage *nextPayloadSpecificFeedbackMessage() const  {return mNextPayloadSpecificFeedbackMessage;}
-
-        size_t sliCount() const                         {return mSLICount;}
-        size_t firCount() const                         {return mFIRCount;}
-        size_t tstrCount() const                        {return mTSTRCount;}
-        size_t tstnCount() const                        {return mTSTNCount;}
-        size_t vbcmCount() const                        {return mVBCMCount;}
-
-        PLI *pli() const;
-        SLI *sliAtIndex(size_t index) const;
-        RPSI *rpsi() const;
-        FIR *firAtIndex(size_t index) const;
-        TSTR *tstrAtIndex(size_t index) const;
-        TSTN *tstnAtIndex(size_t index) const;
-        VBCM *vbcmAtIndex(size_t index) const;
-        AFB *afb() const;
-        REMB *remb() const;
-        PayloadSpecificFeedbackMessage *unknown() const {return mUnknown;}
-
-      public:
-        PayloadSpecificFeedbackMessage *mNextPayloadSpecificFeedbackMessage {};
-
-        PLI mPLI {};
-        size_t mSLICount {};
-        SLI *mFirstSLI {};
-        RPSI mRPSI {};
-        size_t mFIRCount {};
-        FIR *mFirstFIR {};
-        size_t mTSTRCount {};
-        TSTR *mFirstTSTR {};
-        size_t mTSTNCount {};
-        TSTN *mFirstTSTN {};
-        size_t mVBCMCount {};
-        VBCM *mFirstVBCM {};
-        AFB mAFB {};
-        bool mHasREMB {false};
-        REMB mREMB {};
-
-        PayloadSpecificFeedbackMessage *mUnknown {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::XR
-      #pragma mark
-
-      struct XR : public Report
-      {
-        // https://tools.ietf.org/html/rfc3611#section-2
-        // https://tools.ietf.org/html/rfc3611#section-3
-
-        typedef WORD RLEChunk;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::ReportBlock
-        #pragma mark
-
-        struct ReportBlock
-        {
-          ReportBlock *next() const                           {return mNext;}
-
-          BYTE blockType() const                              {return mBlockType;}
-          BYTE typeSpecific() const                           {return mTypeSpecific;}
-
-          const BYTE *typeSpecificContents() const            {return mTypeSpecificContents;}
-          size_t typeSpecificContentSize() const              {return mTypeSpecificContentSize;}
-
-          static const char *blockTypeToString(BYTE blockType);
-          const char *blockTypeToString() const               {return blockTypeToString(mBlockType);}
-
-        public:
-          ReportBlock *mNext {};
-
-          BYTE mBlockType {};
-          BYTE mTypeSpecific {};
-
-          const BYTE *mTypeSpecificContents {};
-          size_t mTypeSpecificContentSize {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::ReportBlockRange
-        #pragma mark
-
-        struct ReportBlockRange : public ReportBlock
-        {
-          BYTE reserved() const;
-          BYTE thinning() const;
-
-          DWORD ssrcOfSource() const                          {return mSSRCOfSource;}
-          WORD beginSeq() const                               {return mBeginSeq;}
-          WORD endSeq() const                                 {return mEndSeq;}
-
-        public:
-          DWORD mSSRCOfSource {};
-          WORD mBeginSeq {};
-          WORD mEndSeq {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::RLEReportBlock
-        #pragma mark
-
-        struct RLEReportBlock : public ReportBlockRange
-        {
-          size_t chunkCount() const                           {return mChunkCount;}
-          RLEChunk chunkAtIndex(size_t index) const;
-
-        public:
-          size_t mChunkCount {};
-          RLEChunk *mChunks {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::LossRLEReportBlock
-        #pragma mark
-
-        struct LossRLEReportBlock : public RLEReportBlock
-        {
-          // https://tools.ietf.org/html/rfc3611#section-4.1
-
-          static const BYTE kBlockType {1};
-
-          LossRLEReportBlock *nextLossRLE() const             {return mNextLossRLE;}
-
-        public:
-          LossRLEReportBlock *mNextLossRLE {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::DuplicateRLEReportBlock
-        #pragma mark
-
-        struct DuplicateRLEReportBlock : public RLEReportBlock
-        {
-          // https://tools.ietf.org/html/rfc3611#section-4.2
-
-          static const BYTE kBlockType {2};
-
-          DuplicateRLEReportBlock *nextDuplicateRLE() const {return mNextDuplicateRLE;}
-
-        public:
-          DuplicateRLEReportBlock *mNextDuplicateRLE {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::PacketReceiptTimesReportBlock
-        #pragma mark
-
-        struct PacketReceiptTimesReportBlock : public ReportBlockRange
-        {
-          // https://tools.ietf.org/html/rfc3611#section-4.3
-
-          static const BYTE kBlockType {3};
-
-          PacketReceiptTimesReportBlock *nextPacketReceiptTimesReportBlock() const  {return mNextPacketReceiptTimesReportBlock;}
-
-          size_t receiptTimeCount() const                                           {return mReceiptTimeCount;}
-          DWORD receiptTimeAtIndex(size_t index) const;
-
-        public:
-          PacketReceiptTimesReportBlock *mNextPacketReceiptTimesReportBlock {};
-
-          size_t mReceiptTimeCount {};
-          DWORD *mReceiptTimes {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::ReceiverReferenceTimeReportBlock
-        #pragma mark
-
-        struct ReceiverReferenceTimeReportBlock : public ReportBlock
-        {
-          // https://tools.ietf.org/html/rfc3611#section-4.4
-
-          static const BYTE kBlockType {4};
-
-          ReceiverReferenceTimeReportBlock *nextReceiverReferenceTimeReportBlock() const  {return mNextReceiverReferenceTimeReportBlock;}
-
-          DWORD ntpTimestampMS() const          {return mNTPTimestampMS;}
-          DWORD ntpTimestampLS() const          {return mNTPTimestampLS;}
-          Time ntpTimestamp() const;
-
-        public:
-          ReceiverReferenceTimeReportBlock *mNextReceiverReferenceTimeReportBlock {};
-
-          DWORD mNTPTimestampMS {};
-          DWORD mNTPTimestampLS {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::DLRRReportBlock
-        #pragma mark
-
-        struct DLRRReportBlock : public ReportBlock
-        {
-          // https://tools.ietf.org/html/rfc3611#section-4.5
-
-          static const BYTE kBlockType {5};
-
-          struct SubBlock
-          {
-            DWORD ssrc() const  {return mSSRC;}
-            DWORD lrr() const   {return mLRR;}
-            DWORD dlrr() const  {return mDLRR;}
-
-            DWORD mSSRC {};
-            DWORD mLRR {};
-            DWORD mDLRR {};
-          };
-
-          DLRRReportBlock *nextDLRRReportBlock() const {return mNextDLRRReportBlock;}
-
-          size_t subBlockCount() const {return mSubBlockCount;}
-          SubBlock *subBlockAtIndex(size_t index) const;
-
-        public:
-          DLRRReportBlock *mNextDLRRReportBlock {};
-
-          size_t mSubBlockCount {};
-          SubBlock *mSubBlocks {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::StatisticsSummaryReportBlock
-        #pragma mark
-
-        struct StatisticsSummaryReportBlock : public ReportBlockRange
-        {
-          // https://tools.ietf.org/html/rfc3611#section-4.6
-
-          static const BYTE kBlockType {6};
-
-          StatisticsSummaryReportBlock *nextStatisticsSummaryReportBlock() const {return mNextStatisticsSummaryReportBlock;}
-
-          bool lossReportFlag() const;
-          bool duplicateReportFlag() const;
-          bool jitterFlag() const;
-          bool ttlFlag() const;
-          bool hopLimitFlag() const;
-
-          DWORD lostPackets() const             {return mLostPackets;}
-          DWORD dupPackets() const              {return mDupPackets;}
-
-          DWORD minJitter() const               {return mMinJitter;}
-          DWORD maxJitter() const               {return mMaxJitter;}
-          DWORD meanJitter() const              {return mMeanJitter;}
-          DWORD devJitter() const               {return mDevJitter;}
-
-          BYTE minTTL() const                   {return mMinTTLOrHL;}
-          BYTE maxTTL() const                   {return mMaxTTLOrHL;}
-          BYTE meanTTL() const                  {return mMeanTTLOrHL;}
-          BYTE devTTL() const                   {return mDevTTLOrHL;}
-
-          BYTE minHopLimit() const              {return mMinTTLOrHL;}
-          BYTE maxHopLimit() const              {return mMaxTTLOrHL;}
-          BYTE meanHopLimit() const             {return mMeanTTLOrHL;}
-          BYTE devHopLimit() const              {return mDevTTLOrHL;}
-
-        public:
-          StatisticsSummaryReportBlock *mNextStatisticsSummaryReportBlock {};
-
-          DWORD mLostPackets {};
-          DWORD mDupPackets {};
-          DWORD mMinJitter {};
-          DWORD mMaxJitter {};
-          DWORD mMeanJitter {};
-          DWORD mDevJitter {};
-
-          BYTE mMinTTLOrHL {};
-          BYTE mMaxTTLOrHL {};
-          BYTE mMeanTTLOrHL {};
-          BYTE mDevTTLOrHL {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::VoIPMetricsReportBlock
-        #pragma mark
-
-        struct VoIPMetricsReportBlock : public ReportBlock
-        {
-          // https://tools.ietf.org/html/rfc3611#section-4.7
-
-          static const BYTE kBlockType {7};
-
-          VoIPMetricsReportBlock *nextVoIPMetricsReportBlock() const {return mNextVoIPMetricsReportBlock;}
-
-          DWORD ssrcOfSource() const              {return mSSRCOfSource;}
-
-          BYTE lossRate() const                   {return mLossRate;}
-          BYTE discardRate() const                {return mDiscardRate;}
-          BYTE burstDensity() const               {return mBurstDensity;}
-          BYTE gapDensity() const                 {return mGapDensity;}
-
-          WORD burstDuration() const              {return mBurstDuration;}
-          WORD gapDuration() const                {return mGapDuration;}
-
-          WORD roundTripDelay() const             {return mRoundTripDelay;}
-          WORD endSystemDelay() const             {return mEndSystemDelay;}
-
-          BYTE signalLevel() const                {return mSignalLevel;}
-          BYTE noiseLevel() const                 {return mNoiseLevel;}
-          BYTE rerl() const                       {return mRERL;}
-          BYTE Gmin() const                       {return mGmin;}
-
-          BYTE rFactor() const                    {return mRFactor;}
-          BYTE extRFactor() const                 {return mExtRFactor;}
-          BYTE mosLQ() const                      {return mMOSLQ;}
-          BYTE mosCQ() const                      {return mMOSCQ;}
-
-          BYTE rxConfig() const                   {return mRXConfig;}
-          BYTE plc() const;
-          BYTE jba() const;
-          BYTE jbRate() const;
-
-          WORD jbNominal() const                  {return mJBNominal;}
-          WORD jbMaximum() const                  {return mJBMaximum;}
-          WORD jbAbsMax() const                   {return mJBAbsMax;}
-
-        public:
-          VoIPMetricsReportBlock *mNextVoIPMetricsReportBlock {};
-
-          DWORD mSSRCOfSource {};
-
-          BYTE mLossRate {};
-          BYTE mDiscardRate {};
-          BYTE mBurstDensity {};
-          BYTE mGapDensity {};
-
-          WORD mBurstDuration {};
-          WORD mGapDuration {};
-
-          WORD mRoundTripDelay {};
-          WORD mEndSystemDelay {};
-
-          BYTE mSignalLevel {};
-          BYTE mNoiseLevel {};
-          BYTE mRERL {};
-          BYTE mGmin {};
-
-          BYTE mRFactor {};
-          BYTE mExtRFactor {};
-          BYTE mMOSLQ {};
-          BYTE mMOSCQ {};
-
-          BYTE mRXConfig {};
-          BYTE mReservedVoIP {};
-
-          WORD mJBNominal {};
-          WORD mJBMaximum {};
-          WORD mJBAbsMax {};
-        };
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::UnknownReportBlock
-        #pragma mark
-
-        struct UnknownReportBlock : public ReportBlock
-        {
-          UnknownReportBlock *nextUnknownReportBlock() const {return mNextUnknownReportBlock;}
-
-        public:
-          UnknownReportBlock *mNextUnknownReportBlock {};
-        };
-
-        //-------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::RunLength
-        #pragma mark
-
-        struct RunLength
-        {
-          // https://tools.ietf.org/html/rfc3611#section-4.1.1
-
-          RunLength(RLEChunk chunk);
-
-          BYTE runType() const {return mRunType;}
-          size_t runLength() const {return static_cast<size_t>(mRunLength);}
-
-        public:
-          BYTE mRunType {};   // Zero indicates a run of 0s.  One indicates a run of 1s.
-          WORD mRunLength {}; // A value between 1 and 16,383.
-        };
-
-        //-------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR::BitVector
-        #pragma mark
-
-        struct BitVector
-        {
-          // https://tools.ietf.org/html/rfc3611#section-4.1.2
-
-          BitVector(RLEChunk chunk);
-
-          BYTE bitAtIndex(size_t index) const;  // Zero indicates loss.
-
-        public:
-          WORD mBitVector {};
-        };
-
-        //-------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTCPPacket::XR
-        #pragma mark
-
-        static const BYTE kPayloadType {207};
-
-        XR *nextXR() const                                                              {return mNextXR;}
-
-        BYTE reserved() const                                                           {return mReportSpecific;}
-
-        DWORD ssrc() const                                                              {return mSSRC;}
-
-        ReportBlock *firstReportBlock() const                                           {return mFirstReportBlock;}
-
-        LossRLEReportBlock *firstLossRLEReportBlock() const                             {return mFirstLossRLEReportBlock;}
-        DuplicateRLEReportBlock *firstDuplicateRLEReportBlock() const                   {return mFirstDuplicateRLEReportBlock;}
-        PacketReceiptTimesReportBlock *firstPacketReceiptTimesReportBlock() const       {return mFirstPacketReceiptTimesReportBlock;}
-        ReceiverReferenceTimeReportBlock *firstReceiverReferenceTimeReportBlock() const {return mFirstReceiverReferenceTimeReportBlock;}
-        DLRRReportBlock *firstDLRRReportBlock() const                                   {return mFirstDLRRReportBlock;}
-        StatisticsSummaryReportBlock *firstStatisticsSummaryReportBlock() const         {return mFirstStatisticsSummaryReportBlock;}
-        VoIPMetricsReportBlock *firstVoIPMetricsReportBlock() const                     {return mFirstVoIPMetricsReportBlock;}
-        UnknownReportBlock *firstUnknownReportBlock() const                             {return mFirstUnknownReportBlock;}
-
-        size_t reportBlockCount() const                                                 {return mReportBlockCount;}
-
-        size_t lossRLEReportBlockCount() const                                          {return mLossRLEReportBlockCount;}
-        size_t duplicateRLEReportBlockCount() const                                     {return mDuplicateRLEReportBlockCount;}
-        size_t packetReceiptTimesReportBlockCount() const                               {return mPacketReceiptTimesReportBlockCount;}
-        size_t receiverReferenceTimeReportBlockCount() const                            {return mReceiverReferenceTimeReportBlockCount;}
-        size_t dlrrReportBlockCount() const                                             {return mDLRRReportBlockCount;}
-        size_t statisticsSummaryReportBlockCount() const                                {return mStatisticsSummaryReportBlockCount;}
-        size_t voIPMetricsReportBlockCount() const                                      {return mVoIPMetricsReportBlockCount;}
-        size_t unknownReportBlockCount() const                                          {return mUnknownReportBlockCount;}
-
-        LossRLEReportBlock *lossRLEReportBlockAtIndex(size_t index) const;
-        DuplicateRLEReportBlock *duplicateRLEReportBlockAtIndex(size_t index) const;
-        PacketReceiptTimesReportBlock *packetReceiptTimesReportBlockAtIndex(size_t index) const;
-        ReceiverReferenceTimeReportBlock *receiverReferenceTimeReportBlockAtIndex(size_t index) const;
-        DLRRReportBlock *dlrrReportBlockAtIndex(size_t index) const;
-        StatisticsSummaryReportBlock *statisticsSummaryReportBlockAtIndex(size_t index) const;
-        VoIPMetricsReportBlock *voIPMetricsReportBlockAtIndex(size_t index) const;
-        UnknownReportBlock *unknownReportBlockAtIndex(size_t index) const;
-
-        static bool isRunLengthChunk(RLEChunk chunk);
-        static bool isBitVectorChunk(RLEChunk chunk);
-
-        static RunLength runLength(RLEChunk chunk)                                      {return RunLength(chunk);}
-        static BitVector bitVector(RLEChunk chunk)                                      {return BitVector(chunk);}
-
-      public:
-        XR *mNextXR {};
-
-        DWORD mSSRC {};
-
-        size_t mReportBlockCount {};
-
-        size_t mLossRLEReportBlockCount {};
-        size_t mDuplicateRLEReportBlockCount {};
-        size_t mPacketReceiptTimesReportBlockCount {};
-        size_t mReceiverReferenceTimeReportBlockCount {};
-        size_t mDLRRReportBlockCount {};
-        size_t mStatisticsSummaryReportBlockCount {};
-        size_t mVoIPMetricsReportBlockCount {};
-        size_t mUnknownReportBlockCount {};
-
-        ReportBlock *mFirstReportBlock {};
-
-        LossRLEReportBlock *mFirstLossRLEReportBlock {};
-        DuplicateRLEReportBlock *mFirstDuplicateRLEReportBlock {};
-        PacketReceiptTimesReportBlock *mFirstPacketReceiptTimesReportBlock {};
-        ReceiverReferenceTimeReportBlock *mFirstReceiverReferenceTimeReportBlock {};
-        DLRRReportBlock *mFirstDLRRReportBlock {};
-        StatisticsSummaryReportBlock *mFirstStatisticsSummaryReportBlock {};
-        VoIPMetricsReportBlock *mFirstVoIPMetricsReportBlock {};
-        UnknownReportBlock *mFirstUnknownReportBlock {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTCPPacket::UnknownReport
-      #pragma mark
-
-      struct UnknownReport : public Report
-      {
-        UnknownReport *nextUnknown() const          {return mNextUnknown;}
-
-      public:
-        UnknownReport *mNextUnknown {};
-      };
-
-    public:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark (public)
-      #pragma mark
-
-      RTCPPacket(const make_private &);
-      ~RTCPPacket();
-
-      static RTCPPacketPtr create(const BYTE *buffer, size_t bufferLengthInBytes);
-      static RTCPPacketPtr create(const SecureByteBlock &buffer);
-      static RTCPPacketPtr create(SecureByteBlockPtr buffer);  // NOTE: ownership of buffer is taken
-      static RTCPPacketPtr create(const Report *first);
-      static SecureByteBlockPtr generateFrom(const Report *first);
-
-      const BYTE *ptr() const;
-      size_t size() const;
-      SecureByteBlockPtr buffer() const;
-
-      Report *first() const                                                       {return mFirst;}
-
-      SenderReport *firstSenderReport() const                                     {return mFirstSenderReport;}
-      ReceiverReport *firstReceiverReport() const                                 {return mFirstReceiverReport;}
-      SDES *firstSDES() const                                                     {return mFirstSDES;}
-      Bye *firstBye() const                                                       {return mFirstBye;}
-      App *firstApp() const                                                       {return mFirstApp;}
-      TransportLayerFeedbackMessage *firstTransportLayerFeedbackMessage() const   {return mFirstTransportLayerFeedbackMessage;}
-      PayloadSpecificFeedbackMessage *firstPayloadSpecificFeedbackMessage() const {return mFirstPayloadSpecificFeedbackMessage;}
-      XR *firstXR() const                                                         {return mFirstXR;}
-      UnknownReport *firstUnknownReport() const                                   {return mFirstUnknownReport;}
-
-      size_t count() const                                                        {return mCount;}
-
-      size_t senderReportCount() const                                            {return mSenderReportCount;}
-      size_t receiverReportCount() const                                          {return mReceiverReportCount;}
-      size_t sdesCount() const                                                    {return mSDESCount;}
-      size_t byeCount() const                                                     {return mByeCount;}
-      size_t appCount() const                                                     {return mAppCount;}
-      size_t transportLayerFeedbackMessageCount() const                           {return mTransportLayerFeedbackMessageCount;}
-      size_t payloadSpecificFeedbackMessage() const                               {return mPayloadSpecificFeedbackMessageCount;}
-      size_t xrCount() const                                                      {return mXRCount;}
-      size_t unknownReportCount() const                                           {return mUnknownReportCount;}
-      
-      SenderReport *senderReportAtIndex(size_t index) const;
-      ReceiverReport *receiverReportAtIndex(size_t index) const;
-      SDES *sdesAtIndex(size_t index) const;
-      Bye *byeAtIndex(size_t index) const;
-      App *appAtIndex(size_t index) const;
-      TransportLayerFeedbackMessage *transportLayerFeedbackReportAtIndex(size_t index) const;
-      PayloadSpecificFeedbackMessage *payloadSpecificFeedbackReportAtIndex(size_t index) const;
-      XR *xrAtIndex(size_t index) const;
-      UnknownReport *unknownAtIndex(size_t index) const;
-
-      ElementPtr toDebug() const;
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark (internal)
-      #pragma mark
-
-      static Log::Params slog(const char *message);
-      Log::Params log(const char *message) const;
-      Log::Params debug(const char *message) const;
-
-      bool parse();
-
-      bool getAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, BYTE pt, const BYTE *contents, size_t contentSize);
-      bool getSenderReportAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
-      bool getReceiverReportAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
-      bool getSDESAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
-      bool getByeAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
-      bool getAppAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
-      bool getTransportLayerFeedbackMessageAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
-      bool getPayloadSpecificFeedbackMessageAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
-      bool getXRAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
-      bool getUnknownReportAllocationSize(BYTE version, BYTE padding, BYTE reportSpecific, const BYTE *contents, size_t contentSize);
-
-      bool getTransportLayerFeedbackMessageGenericNACKAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-      bool getTransportLayerFeedbackMessageTMMBRAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-      bool getTransportLayerFeedbackMessageTMMBNAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-
-      bool getPayloadSpecificFeedbackMessagePLIAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-      bool getPayloadSpecificFeedbackMessageSLIAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-      bool getPayloadSpecificFeedbackMessageRPSIAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-      bool getPayloadSpecificFeedbackMessageFIRAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-      bool getPayloadSpecificFeedbackMessageTSTRAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-      bool getPayloadSpecificFeedbackMessageTSTNAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-      bool getPayloadSpecificFeedbackMessageVBCMAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-      bool getPayloadSpecificFeedbackMessageAFBAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-      bool getPayloadSpecificFeedbackMessageREMBAllocationSize(BYTE fmt, const BYTE *contents, size_t contentSize);
-
-      bool getXRLossRLEReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
-      bool getXRDuplicateRLEReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
-      bool getXRPacketReceiptTimesReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
-      bool getXRReceiverReferenceTimeReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
-      bool getXRDLRRReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
-      bool getXRStatisticsSummaryReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
-      bool getXRVoIPMetricsReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
-      bool getXRUnknownReportBlockAllocationSize(BYTE typeSpecific, const BYTE *contents, size_t contentSize);
-
-      bool parse(Report * &ioLastReport, BYTE version, BYTE padding, BYTE reportSpecific, BYTE pt, const BYTE *contents, size_t contentSize);
-      void fill(Report *report, BYTE version, BYTE padding, BYTE reportSpecific, BYTE pt, const BYTE *contents, size_t contentSize);
-
-      bool parseCommon(
-                       SenderReceiverCommonReport *report,
-                       size_t detailedHeaderSize
-                       );
-      bool parse(SenderReport *report);
-      bool parse(ReceiverReport *report);
-      bool parse(SDES *report);
-      bool parse(Bye *report);
-      bool parse(App *report);
-      bool parse(TransportLayerFeedbackMessage *report);
-      bool parse(PayloadSpecificFeedbackMessage *report);
-      bool parse(XR *report);
-      bool parse(UnknownReport *report);
-
-      void fill(FeedbackMessage *report, const BYTE *contents, size_t contentSize);
-      void fill(XR *report, XR::ReportBlock *reportBlock, XR::ReportBlock * &ioPreviousReportBlock, BYTE blockType, BYTE typeSpecific, const BYTE *contents, size_t contentSize);
-
-      bool parseGenericNACK(TransportLayerFeedbackMessage *report);
-      void fillTMMBRCommon(TransportLayerFeedbackMessage *report, TransportLayerFeedbackMessage::TMMBRCommon *common, const BYTE *pos);
-      bool parseTMMBR(TransportLayerFeedbackMessage *report);
-      bool parseTMMBN(TransportLayerFeedbackMessage *report);
-      bool parseUnknown(TransportLayerFeedbackMessage *report);
-
-      //CodecControlCommon
-      bool parsePLI(PayloadSpecificFeedbackMessage *report);
-      bool parseSLI(PayloadSpecificFeedbackMessage *report);
-      bool parseRPSI(PayloadSpecificFeedbackMessage *report);
-      void fillCodecControlCommon(PayloadSpecificFeedbackMessage *report, PayloadSpecificFeedbackMessage::CodecControlCommon *common, const BYTE *pos);
-      bool parseFIR(PayloadSpecificFeedbackMessage *report);
-      bool parseTSTR(PayloadSpecificFeedbackMessage *report);
-      bool parseTSTN(PayloadSpecificFeedbackMessage *report);
-      bool parseVBCM(PayloadSpecificFeedbackMessage *report);
-      bool parseAFB(PayloadSpecificFeedbackMessage *report);
-      bool parseREMB(PayloadSpecificFeedbackMessage *report);
-      bool parseUnknown(PayloadSpecificFeedbackMessage *report);
-
-      bool parseCommonRange(XR *xr, XR::ReportBlockRange *reportBlock);
-      bool parseCommonRLE(XR *xr, XR::RLEReportBlock *reportBlock);
-      bool parse(XR *xr, XR::LossRLEReportBlock *reportBlock);
-      bool parse(XR *xr, XR::DuplicateRLEReportBlock *reportBlock);
-      bool parse(XR *xr, XR::PacketReceiptTimesReportBlock *reportBlock);
-      bool parse(XR *xr, XR::ReceiverReferenceTimeReportBlock *reportBlock);
-      bool parse(XR *xr, XR::DLRRReportBlock *reportBlock);
-      bool parse(XR *xr, XR::StatisticsSummaryReportBlock *reportBlock);
-      bool parse(XR *xr, XR::VoIPMetricsReportBlock *reportBlock);
-      bool parse(XR *xr, XR::UnknownReportBlock *reportBlock);
-
-      void *allocateBuffer(size_t size);
-
-      static size_t getPacketSize(const Report *first);
-      static void writePacket(const Report *first, BYTE * &ioPos, size_t &ioRemaining);
-
-    public:
-      SecureByteBlockPtr mBuffer;
-      SecureByteBlockPtr mAllocationBuffer;
-
-      BYTE *mAllocationPos {};
-      size_t mAllocationSize {};
-
-      Report *mFirst {};
-
-      size_t mCount {};
-
-      size_t mSenderReportCount {};
-      size_t mReceiverReportCount {};
-      size_t mSDESCount {};
-      size_t mByeCount {};
-      size_t mAppCount {};
-      size_t mTransportLayerFeedbackMessageCount {};
-      size_t mPayloadSpecificFeedbackMessageCount {};
-      size_t mXRCount {};
-      size_t mUnknownReportCount {};
-
-      SenderReport *mFirstSenderReport {};
-      ReceiverReport *mFirstReceiverReport {};
-      SDES *mFirstSDES {};
-      Bye *mFirstBye {};
-      App *mFirstApp {};
-      TransportLayerFeedbackMessage *mFirstTransportLayerFeedbackMessage {};
-      PayloadSpecificFeedbackMessage *mFirstPayloadSpecificFeedbackMessage {};
-      XR *mFirstXR {};
-      UnknownReport *mFirstUnknownReport {};
-    };
-
-  }
-}
-
diff --git a/ortc/internal/ortc_RTPDecoderAudio.h b/ortc/internal/ortc_RTPDecoderAudio.h
new file mode 100644
index 00000000..43dd32c7
--- /dev/null
+++ b/ortc/internal/ortc_RTPDecoderAudio.h
@@ -0,0 +1,293 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_IRTPDecoder.h>
+#include <ortc/internal/ortc_MediaChannelTraceHelper.h>
+
+#include <ortc/RTPPacket.h>
+#include <ortc/RTCPPacket.h>
+#include <ortc/IMediaStreamTrack.h>
+
+#include <zsLib/IWakeDelegate.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio (helpers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderAudio
+    #pragma mark
+    
+    class RTPDecoderAudio : public Any,
+                            public Noop,
+                            public MessageQueueAssociator,
+                            public SharedRecursiveLock,
+                            public IRTPDecoderAudio,
+                            public IRTPDecoderAudioForMediaEngine,
+                            public zsLib::IWakeDelegate,
+                            public zsLib::IPromiseSettledDelegate,
+                            public IRTPDecoderAysncDelegate
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IRTPDecoderAudioForMediaEngine;
+      friend interaction IRTPDecoderAysncDelegate;
+
+      typedef IRTP::RTPObjectID RTPObjectID;
+      typedef IRTP::States States;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderAudioPtr>, PromiseWithRTPDecoderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderAudio, UseMediaEngine);
+
+    public:
+      RTPDecoderAudio(
+                      const make_private &,
+                      IMessageQueuePtr queue,
+                      PromiseWithRTPDecoderAudioPtr promise,
+                      UseMediaEnginePtr mediaEngine,
+                      ParametersPtr parameters,
+                      IRTPDecoderDelegatePtr delegate
+                      );
+
+    protected:
+      RTPDecoderAudio(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create()),
+        traceHelper_(id_)
+      {}
+
+      void init();
+
+    public:
+      virtual ~RTPDecoderAudio();
+
+      static RTPDecoderAudioPtr create(
+                                       PromiseWithRTPDecoderAudioPtr promise,
+                                       UseMediaEnginePtr mediaEngine,
+                                       ParametersPtr parameters,
+                                       IRTPDecoderDelegatePtr delegate
+                                       );
+
+      static RTPDecoderAudioPtr convert(ForMediaEnginePtr object);
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => IRTP
+      #pragma mark
+
+      RTPObjectID getID() const override { return id_; }
+      void cancel() override;
+
+      States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => IRTPDecoder
+      #pragma mark
+
+      void notifyRTPPacket(
+                           ImmutableMediaChannelTracePtr trace,
+                           RTPPacketPtr packet
+                           ) override;
+      void notifyRTCPPacket(
+                            ImmutableMediaChannelTracePtr trace,
+                            RTCPPacketPtr packet
+                            ) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => IRTPDecoderAudio
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => IRTPForMediaEngine
+      #pragma mark
+
+      // (duplicate) virtual RTPObjectID getID() const = 0;
+      void shutdown() override;
+
+      // (duplciate) virtual States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => IRTPDecoderForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => IRTPDecoderAudioForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => IWakeDelegate
+      #pragma mark
+
+      void onWake() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => IPromiseSettledDelegate
+      #pragma mark
+
+      void onPromiseSettled(PromisePtr promise) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => IRTPDecoderAysncDelegate
+      #pragma mark
+      
+      void onRTPDecoderRTPPacket(
+                                 ImmutableMediaChannelTracePtr trace,
+                                 RTPPacketPtr packet
+                                 ) override;
+      void onRTPDecoderRTCPPacket(
+                                  ImmutableMediaChannelTracePtr trace,
+                                  RTCPPacketPtr packet
+                                  ) override;
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => (internal)
+      #pragma mark
+
+      bool isPending() const { return IRTP::State_Pending == currentState_; }
+      bool isReady() const { return IRTP::State_Ready == currentState_; }
+      bool isShuttingDown() const { return IRTP::State_ShuttingDown == currentState_; }
+      bool isShutdown() const { return IRTP::State_Shutdown == currentState_; }
+
+      void innerCancel();
+
+      bool stepShutdownPendingPromise();
+      bool stepShutdownCoder();
+
+      void step();
+      bool stepSetup();
+      bool stepResolve();
+
+      void setState(States state);
+      void setError(PromisePtr promise);
+      void setError(WORD error, const char *inReason);
+
+      void innerNotifyAudioFrame(
+                                 ImmutableMediaChannelTracePtr trace,
+                                 AudioFramePtr frame
+                                 );
+      void innerNotifyVideoFrame(
+                                 ImmutableMediaChannelTracePtr trace,
+                                 VideoFramePtr frame
+                                 ) {} // ignored
+
+    public:
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderAudio => (data)
+      #pragma mark
+
+      AutoPUID id_;
+      RTPDecoderAudioWeakPtr thisWeak_;
+
+      RTPDecoderAudioPtr gracefulShutdownReference_;
+
+      UseMediaEngineWeakPtr mediaEngine_;
+
+      States currentState_ {IRTP::State_Pending};
+      WORD lastError_ {};
+      String lastErrorReason_;
+
+      PromiseWithRTPDecoderAudioPtr promise_;
+      ParametersPtr parameters_;
+      IRTPDecoderDelegateWeakPtr notifyDelegate_;
+      IRTPDecoderDelegatePtr delegate_;
+
+      IRTPDecoderAysncDelegatePtr asyncThisDelegate_;
+
+      MediaChannelTraceHelper traceHelper_;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderAudioFactory
+    #pragma mark
+
+    interaction IRTPDecoderAudioFactory
+    {
+      static IRTPDecoderAudioFactory &singleton();
+
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderAudioPtr>, PromiseWithRTPDecoderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderAudio, UseMediaEngine);
+
+      virtual RTPDecoderAudioPtr create(
+                                       PromiseWithRTPDecoderAudioPtr promise,
+                                       UseMediaEnginePtr mediaEngine,
+                                       ParametersPtr parameters,
+                                       IRTPDecoderDelegatePtr delegate
+                                       );
+    };
+
+    class RTPDecoderAudioFactory : public IFactory<IRTPDecoderAudioFactory> {};
+  }
+}
+
diff --git a/ortc/internal/ortc_RTPDecoderVideo.h b/ortc/internal/ortc_RTPDecoderVideo.h
new file mode 100644
index 00000000..564eee78
--- /dev/null
+++ b/ortc/internal/ortc_RTPDecoderVideo.h
@@ -0,0 +1,292 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_MediaChannelTraceHelper.h>
+#include <ortc/internal/ortc_IRTPDecoder.h>
+
+#include <ortc/RTPPacket.h>
+#include <ortc/RTCPPacket.h>
+#include <ortc/IMediaStreamTrack.h>
+
+#include <zsLib/IWakeDelegate.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo (helpers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPDecoderVideo
+    #pragma mark
+    
+    class RTPDecoderVideo : public Any,
+                            public Noop,
+                            public MessageQueueAssociator,
+                            public SharedRecursiveLock,
+                            public IRTPDecoderVideo,
+                            public IRTPDecoderVideoForMediaEngine,
+                            public zsLib::IWakeDelegate,
+                            public zsLib::IPromiseSettledDelegate,
+                            public IRTPDecoderAysncDelegate
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IRTPDecoderVideoForMediaEngine;
+      friend interaction IRTPDecoderAysncDelegate;
+
+      typedef IRTP::RTPObjectID RTPObjectID;
+      typedef IRTP::States States;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderVideoPtr>, PromiseWithRTPDecoderVideo);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderVideo, UseMediaEngine);
+
+    public:
+      RTPDecoderVideo(
+                      const make_private &,
+                      IMessageQueuePtr queue,
+                      PromiseWithRTPDecoderVideoPtr promise,
+                      UseMediaEnginePtr mediaEngine,
+                      ParametersPtr parameters,
+                      IRTPDecoderDelegatePtr delegate
+                      );
+
+    protected:
+      RTPDecoderVideo(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create()),
+        traceHelper_(id_)
+      {}
+
+      void init();
+
+    public:
+      virtual ~RTPDecoderVideo();
+
+      static RTPDecoderVideoPtr create(
+                                       PromiseWithRTPDecoderVideoPtr promise,
+                                       UseMediaEnginePtr mediaEngine,
+                                       ParametersPtr parameters,
+                                       IRTPDecoderDelegatePtr delegate
+                                       );
+
+      static RTPDecoderVideoPtr convert(ForMediaEnginePtr object);
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => IRTP
+      #pragma mark
+
+      RTPObjectID getID() const override { return id_; }
+      void cancel() override;
+
+      States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => IRTPDecoder
+      #pragma mark
+
+      void notifyRTPPacket(
+                           ImmutableMediaChannelTracePtr trace,
+                           RTPPacketPtr packet
+                           ) override;
+      void notifyRTCPPacket(
+                            ImmutableMediaChannelTracePtr trace,
+                            RTCPPacketPtr packet
+                            ) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => IRTPDecoderVideo
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => IRTPForMediaEngine
+      #pragma mark
+
+      // (duplicate) virtual RTPObjectID getID() const = 0;
+      void shutdown() override;
+
+      // (duplciate) virtual States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => IRTPDecoderForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => IRTPDecoderVideoForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => IWakeDelegate
+      #pragma mark
+
+      void onWake() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => IPromiseSettledDelegate
+      #pragma mark
+
+      void onPromiseSettled(PromisePtr promise) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => IRTPDecoderAysncDelegate
+      #pragma mark
+      
+      void onRTPDecoderRTPPacket(
+                                 ImmutableMediaChannelTracePtr trace,
+                                 RTPPacketPtr packet
+                                 ) override;
+      void onRTPDecoderRTCPPacket(
+                                  ImmutableMediaChannelTracePtr trace,
+                                  RTCPPacketPtr packet
+                                  ) override;
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => (internal)
+      #pragma mark
+
+      bool isPending() const { return IRTP::State_Pending == currentState_; }
+      bool isReady() const { return IRTP::State_Ready == currentState_; }
+      bool isShuttingDown() const { return IRTP::State_ShuttingDown == currentState_; }
+      bool isShutdown() const { return IRTP::State_Shutdown == currentState_; }
+
+      void innerCancel();
+
+      bool stepShutdownPendingPromise();
+      bool stepShutdownCoder();
+
+      void step();
+      bool stepSetup();
+      bool stepResolve();
+
+      void setState(States state);
+      void setError(PromisePtr promise);
+      void setError(WORD error, const char *inReason);
+
+      void innerNotifyAudioFrame(
+                                 ImmutableMediaChannelTracePtr trace,
+                                 AudioFramePtr frame
+                                 ) {} // ignored
+      void innerNotifyVideoFrame(
+                                 ImmutableMediaChannelTracePtr trace,
+                                 VideoFramePtr frame
+                                 );
+
+    public:
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPDecoderVideo => (data)
+      #pragma mark
+
+      AutoPUID id_;
+      RTPDecoderVideoWeakPtr thisWeak_;
+
+      RTPDecoderVideoPtr gracefulShutdownReference_;
+
+      UseMediaEngineWeakPtr mediaEngine_;
+
+      States currentState_ {IRTP::State_Pending};
+      WORD lastError_ {};
+      String lastErrorReason_;
+
+      PromiseWithRTPDecoderVideoPtr promise_;
+      ParametersPtr parameters_;
+      IRTPDecoderDelegateWeakPtr notifyDelegate_;
+      IRTPDecoderDelegatePtr delegate_;
+
+      IRTPDecoderAysncDelegatePtr asyncThisDelegate_;
+      MediaChannelTraceHelper traceHelper_;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPDecoderVideoFactory
+    #pragma mark
+
+    interaction IRTPDecoderVideoFactory
+    {
+      static IRTPDecoderVideoFactory &singleton();
+
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPDecoderVideoPtr>, PromiseWithRTPDecoderVideo);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPDecoderVideo, UseMediaEngine);
+
+      virtual RTPDecoderVideoPtr create(
+                                       PromiseWithRTPDecoderVideoPtr promise,
+                                       UseMediaEnginePtr mediaEngine,
+                                       ParametersPtr parameters,
+                                       IRTPDecoderDelegatePtr delegate
+                                       );
+    };
+
+    class RTPDecoderVideoFactory : public IFactory<IRTPDecoderVideoFactory> {};
+  }
+}
+
diff --git a/ortc/internal/ortc_RTPEncoderAudio.h b/ortc/internal/ortc_RTPEncoderAudio.h
new file mode 100644
index 00000000..8c960677
--- /dev/null
+++ b/ortc/internal/ortc_RTPEncoderAudio.h
@@ -0,0 +1,292 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_MediaChannelTraceHelper.h>
+#include <ortc/internal/ortc_IRTPEncoder.h>
+
+#include <ortc/RTPPacket.h>
+#include <ortc/RTCPPacket.h>
+#include <ortc/IMediaStreamTrack.h>
+
+#include <zsLib/IWakeDelegate.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio (helpers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderAudio
+    #pragma mark
+    
+    class RTPEncoderAudio : public Any,
+                            public Noop,
+                            public MessageQueueAssociator,
+                            public SharedRecursiveLock,
+                            public IRTPEncoderAudio,
+                            public IRTPEncoderAudioForMediaEngine,
+                            public zsLib::IWakeDelegate,
+                            public zsLib::IPromiseSettledDelegate,
+                            public IRTPEncoderAysncDelegate
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IRTPEncoderAudioForMediaEngine;
+      friend interaction IRTPEncoderAysncDelegate;
+
+      typedef IRTP::RTPObjectID RTPObjectID;
+      typedef IRTP::States States;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderAudioPtr>, PromiseWithRTPEncoderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderAudio, UseMediaEngine);
+
+    public:
+      RTPEncoderAudio(
+                      const make_private &,
+                      IMessageQueuePtr queue,
+                      PromiseWithRTPEncoderAudioPtr promise,
+                      UseMediaEnginePtr mediaEngine,
+                      ParametersPtr parameters,
+                      IRTPEncoderDelegatePtr delegate
+                      );
+
+    protected:
+      RTPEncoderAudio(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create()),
+        traceHelper_(id_)
+      {}
+
+      void init();
+
+    public:
+      virtual ~RTPEncoderAudio();
+
+      static RTPEncoderAudioPtr create(
+                                       PromiseWithRTPEncoderAudioPtr promise,
+                                       UseMediaEnginePtr mediaEngine,
+                                       ParametersPtr parameters,
+                                       IRTPEncoderDelegatePtr delegate
+                                       );
+
+      static RTPEncoderAudioPtr convert(ForMediaEnginePtr object);
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => IRTP
+      #pragma mark
+
+      RTPObjectID getID() const override { return id_; }
+      void cancel() override;
+
+      States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => IRTPEncoder
+      #pragma mark
+
+      void notifyAudioFrame(
+                            ImmutableMediaChannelTracePtr trace,
+                            AudioFramePtr frame
+                            ) override;
+      void notifyVideoFrame(
+                            ImmutableMediaChannelTracePtr trace,
+                            VideoFramePtr frame
+                            ) override {}
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => IRTPEncoderAudio
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => IRTPForMediaEngine
+      #pragma mark
+
+      // (duplicate) virtual RTPObjectID getID() const = 0;
+      void shutdown() override;
+
+      // (duplciate) virtual States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => IRTPEncoderForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => IRTPEncoderAudioForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => IWakeDelegate
+      #pragma mark
+
+      void onWake() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => IPromiseSettledDelegate
+      #pragma mark
+
+      void onPromiseSettled(PromisePtr promise) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => IRTPEncoderAysncDelegate
+      #pragma mark
+      
+      void onRTPEncoderAudioFrame(
+                                  ImmutableMediaChannelTracePtr trace,
+                                  AudioFramePtr frame
+                                  ) override;
+      void onRTPEncoderVideoFrame(
+                                  ImmutableMediaChannelTracePtr trace,
+                                  VideoFramePtr frame
+                                  ) override {} // ignored
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => (internal)
+      #pragma mark
+
+      bool isPending() const { return IRTP::State_Pending == currentState_; }
+      bool isReady() const { return IRTP::State_Ready == currentState_; }
+      bool isShuttingDown() const { return IRTP::State_ShuttingDown == currentState_; }
+      bool isShutdown() const { return IRTP::State_Shutdown == currentState_; }
+
+      void innerCancel();
+
+      bool stepShutdownPendingPromise();
+      bool stepShutdownCoder();
+
+      void step();
+      bool stepSetup();
+      bool stepResolve();
+
+      void setState(States state);
+      void setError(PromisePtr promise);
+      void setError(WORD error, const char *inReason);
+
+      void innerNotifyRTP(
+                          ImmutableMediaChannelTracePtr trace,
+                          RTPPacketPtr packet
+                          );
+      void innerNotifyRTCP(
+                           ImmutableMediaChannelTracePtr trace,
+                           RTCPPacketPtr packet
+                           );
+
+    public:
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderAudio => (data)
+      #pragma mark
+
+      AutoPUID id_;
+      RTPEncoderAudioWeakPtr thisWeak_;
+
+      RTPEncoderAudioPtr gracefulShutdownReference_;
+
+      UseMediaEngineWeakPtr mediaEngine_;
+
+      States currentState_ {IRTP::State_Pending};
+      WORD lastError_ {};
+      String lastErrorReason_;
+
+      PromiseWithRTPEncoderAudioPtr promise_;
+      ParametersPtr parameters_;
+      IRTPEncoderDelegateWeakPtr notifyDelegate_;
+      IRTPEncoderDelegatePtr delegate_;
+
+      IRTPEncoderAysncDelegatePtr asyncThisDelegate_;
+      MediaChannelTraceHelper traceHelper_;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderAudioFactory
+    #pragma mark
+
+    interaction IRTPEncoderAudioFactory
+    {
+      static IRTPEncoderAudioFactory &singleton();
+
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderAudioPtr>, PromiseWithRTPEncoderAudio);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderAudio, UseMediaEngine);
+
+      virtual RTPEncoderAudioPtr create(
+                                       PromiseWithRTPEncoderAudioPtr promise,
+                                       UseMediaEnginePtr mediaEngine,
+                                       ParametersPtr parameters,
+                                       IRTPEncoderDelegatePtr delegate
+                                       );
+    };
+
+    class RTPEncoderAudioFactory : public IFactory<IRTPEncoderAudioFactory> {};
+  }
+}
+
diff --git a/ortc/internal/ortc_RTPEncoderVideo.h b/ortc/internal/ortc_RTPEncoderVideo.h
new file mode 100644
index 00000000..52a7981c
--- /dev/null
+++ b/ortc/internal/ortc_RTPEncoderVideo.h
@@ -0,0 +1,293 @@
+/*
+
+ Copyright (c) 2017, Optical Tone Ltd.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of the FreeBSD Project.
+ 
+ */
+
+#pragma once
+
+#include <ortc/internal/types.h>
+
+#include <ortc/internal/ortc_MediaChannelTraceHelper.h>
+#include <ortc/internal/ortc_IRTPEncoder.h>
+
+#include <ortc/RTPPacket.h>
+#include <ortc/RTCPPacket.h>
+
+#include <ortc/IMediaStreamTrack.h>
+
+#include <zsLib/IWakeDelegate.h>
+
+namespace ortc
+{
+  namespace internal
+  {
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo (helpers)
+    #pragma mark
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark RTPEncoderVideo
+    #pragma mark
+    
+    class RTPEncoderVideo : public Any,
+                            public Noop,
+                            public MessageQueueAssociator,
+                            public SharedRecursiveLock,
+                            public IRTPEncoderVideo,
+                            public IRTPEncoderVideoForMediaEngine,
+                            public zsLib::IWakeDelegate,
+                            public zsLib::IPromiseSettledDelegate,
+                            public IRTPEncoderAysncDelegate
+    {
+    protected:
+      struct make_private {};
+
+    public:
+      friend interaction IRTPEncoderVideoForMediaEngine;
+      friend interaction IRTPEncoderAysncDelegate;
+
+      typedef IRTP::RTPObjectID RTPObjectID;
+      typedef IRTP::States States;
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ImmutableMediaChannelTrace, ImmutableMediaChannelTrace);
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderVideoPtr>, PromiseWithRTPEncoderVideo);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::AudioFrame, AudioFrame);
+      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::VideoFrame, VideoFrame);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderVideo, UseMediaEngine);
+
+    public:
+      RTPEncoderVideo(
+                      const make_private &,
+                      IMessageQueuePtr queue,
+                      PromiseWithRTPEncoderVideoPtr promise,
+                      UseMediaEnginePtr mediaEngine,
+                      ParametersPtr parameters,
+                      IRTPEncoderDelegatePtr delegate
+                      );
+
+    protected:
+      RTPEncoderVideo(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
+        Noop(true),
+        MessageQueueAssociator(queue),
+        SharedRecursiveLock(SharedRecursiveLock::create()),
+        traceHelper_(id_)
+      {}
+
+      void init();
+
+    public:
+      virtual ~RTPEncoderVideo();
+
+      static RTPEncoderVideoPtr create(
+                                       PromiseWithRTPEncoderVideoPtr promise,
+                                       UseMediaEnginePtr mediaEngine,
+                                       ParametersPtr parameters,
+                                       IRTPEncoderDelegatePtr delegate
+                                       );
+
+      static RTPEncoderVideoPtr convert(ForMediaEnginePtr object);
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => IRTP
+      #pragma mark
+
+      RTPObjectID getID() const override { return id_; }
+      void cancel() override;
+
+      States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => IRTPEncoder
+      #pragma mark
+
+      void notifyAudioFrame(
+                            ImmutableMediaChannelTracePtr trace,
+                            AudioFramePtr frame
+                            ) override {}
+      void notifyVideoFrame(
+                            ImmutableMediaChannelTracePtr trace,
+                            VideoFramePtr frame
+                            ) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => IRTPEncoderVideo
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => IRTPForMediaEngine
+      #pragma mark
+
+      // (duplicate) virtual RTPObjectID getID() const = 0;
+      void shutdown() override;
+
+      // (duplciate) virtual States getState() const override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => IRTPEncoderForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => IRTPEncoderVideoForMediaEngine
+      #pragma mark
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => IWakeDelegate
+      #pragma mark
+
+      void onWake() override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => IPromiseSettledDelegate
+      #pragma mark
+
+      void onPromiseSettled(PromisePtr promise) override;
+
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => IRTPEncoderAysncDelegate
+      #pragma mark
+      
+      void onRTPEncoderAudioFrame(
+                                  ImmutableMediaChannelTracePtr trace,
+                                  AudioFramePtr frame
+                                  ) override {} // ignored
+      void onRTPEncoderVideoFrame(
+                                  ImmutableMediaChannelTracePtr trace,
+                                  VideoFramePtr frame
+                                  ) override;
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => (internal)
+      #pragma mark
+
+      bool isPending() const { return IRTP::State_Pending == currentState_; }
+      bool isReady() const { return IRTP::State_Ready == currentState_; }
+      bool isShuttingDown() const { return IRTP::State_ShuttingDown == currentState_; }
+      bool isShutdown() const { return IRTP::State_Shutdown == currentState_; }
+
+      void innerCancel();
+
+      bool stepShutdownPendingPromise();
+      bool stepShutdownCoder();
+
+      void step();
+      bool stepSetup();
+      bool stepResolve();
+
+      void setState(States state);
+      void setError(PromisePtr promise);
+      void setError(WORD error, const char *inReason);
+
+      void innerNotifyRTP(
+                          ImmutableMediaChannelTracePtr trace,
+                          RTPPacketPtr packet
+                          );
+      void innerNotifyRTCP(
+                           ImmutableMediaChannelTracePtr trace,
+                           RTCPPacketPtr packet
+                           );
+
+    public:
+
+    protected:
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark RTPEncoderVideo => (data)
+      #pragma mark
+
+      AutoPUID id_;
+      RTPEncoderVideoWeakPtr thisWeak_;
+
+      RTPEncoderVideoPtr gracefulShutdownReference_;
+
+      UseMediaEngineWeakPtr mediaEngine_;
+
+      States currentState_ {IRTP::State_Pending};
+      WORD lastError_ {};
+      String lastErrorReason_;
+
+      PromiseWithRTPEncoderVideoPtr promise_;
+      ParametersPtr parameters_;
+      IRTPEncoderDelegateWeakPtr notifyDelegate_;
+      IRTPEncoderDelegatePtr delegate_;
+
+      IRTPEncoderAysncDelegatePtr asyncThisDelegate_;
+      MediaChannelTraceHelper traceHelper_;
+    };
+
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    #pragma mark
+    #pragma mark IRTPEncoderVideoFactory
+    #pragma mark
+
+    interaction IRTPEncoderVideoFactory
+    {
+      static IRTPEncoderVideoFactory &singleton();
+
+      ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWithHolderPtr<IRTPEncoderVideoPtr>, PromiseWithRTPEncoderVideo);
+      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
+
+      ZS_DECLARE_TYPEDEF_PTR(IMediaEngineForRTPEncoderVideo, UseMediaEngine);
+
+      virtual RTPEncoderVideoPtr create(
+                                       PromiseWithRTPEncoderVideoPtr promise,
+                                       UseMediaEnginePtr mediaEngine,
+                                       ParametersPtr parameters,
+                                       IRTPEncoderDelegatePtr delegate
+                                       );
+    };
+
+    class RTPEncoderVideoFactory : public IFactory<IRTPEncoderVideoFactory> {};
+  }
+}
+
diff --git a/ortc/internal/ortc_RTPListener.h b/ortc/internal/ortc_RTPListener.h
index 9e31f094..21cc4c15 100644
--- a/ortc/internal/ortc_RTPListener.h
+++ b/ortc/internal/ortc_RTPListener.h
@@ -380,20 +380,20 @@ namespace ortc
                                     Optional<HeaderExtensionParametersList> headerExtensions
                                     );
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual IRTPListenerSubscriptionPtr subscribe(IRTPListenerDelegatePtr delegate) override;
+      IRTPListenerSubscriptionPtr subscribe(IRTPListenerDelegatePtr delegate) override;
 
-      virtual IRTPTransportPtr transport() const override;
+      IRTPTransportPtr transport() const override;
 
-      virtual void setHeaderExtensions(const HeaderExtensionParametersList &headerExtensions) override;
+      void setHeaderExtensions(const HeaderExtensionParametersList &headerExtensions) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPListener => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -406,12 +406,12 @@ namespace ortc
 
       static RTPListenerPtr create(IRTPTransportPtr transport);
 
-      virtual bool handleRTPPacket(
-                                   IICETypes::Components viaComponent,
-                                   IICETypes::Components packetType,
-                                   const BYTE *buffer,
-                                   size_t bufferLengthInBytes
-                                   ) override;
+      bool handleRTPPacket(
+                           IICETypes::Components viaComponent,
+                           IICETypes::Components packetType,
+                           const BYTE *buffer,
+                           size_t bufferLengthInBytes
+                           ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -422,23 +422,23 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual void registerReceiver(
-                                    Optional<IMediaStreamTrack::Kinds> kind,
-                                    UseReceiverPtr inReceiver,
-                                    const Parameters &inParams,
-                                    RTCPPacketList *outPacketList = NULL
-                                    ) override;
+      void registerReceiver(
+                            Optional<IMediaStreamTrack::Kinds> kind,
+                            UseReceiverPtr inReceiver,
+                            const Parameters &inParams,
+                            RTCPPacketList *outPacketList = NULL
+                            ) override;
 
-      virtual void unregisterReceiver(UseReceiver &inReceiver) override;
+      void unregisterReceiver(UseReceiver &inReceiver) override;
 
-      virtual void getPackets(RTCPPacketList &outPacketList) override;
+      void getPackets(RTCPPacketList &outPacketList) override;
 
-      virtual void notifyUnhandled(
-                                   const String &muxID,
-                                   const String &rid,
-                                   IRTPTypes::SSRCType ssrc,
-                                   IRTPTypes::PayloadType payloadType
-                                   ) override;
+      void notifyUnhandled(
+                           const String &muxID,
+                           const String &rid,
+                           IRTPTypes::SSRCType ssrc,
+                           IRTPTypes::PayloadType payloadType
+                           ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -449,38 +449,38 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual void registerSender(
-                                  UseSenderPtr inSender,
-                                  const Parameters &inParams,
-                                  RTCPPacketList &outPacketList
-                                  ) override;
+      void registerSender(
+                          UseSenderPtr inSender,
+                          const Parameters &inParams,
+                          RTCPPacketList &outPacketList
+                          ) override;
 
-      virtual void unregisterSender(UseSender &inReceiver) override;
+      void unregisterSender(UseSender &inReceiver) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPListener => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPListener => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPListener => IRTPListenerAsyncDelegate
       #pragma mark
 
-      virtual void onDeliverPacket(
-                                   IICETypes::Components viaComponent,
-                                   UseRTPReceiverPtr receiver,
-                                   RTPPacketPtr packet
-                                   ) override;
+      void onDeliverPacket(
+                           IICETypes::Components viaComponent,
+                           UseRTPReceiverPtr receiver,
+                           RTPPacketPtr packet
+                           ) override;
 
     public:
 
@@ -676,7 +676,7 @@ namespace ortc
 ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPListenerAsyncDelegate)
 ZS_DECLARE_PROXY_TYPEDEF(ortc::IICETypes::Components, Components)
 ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPListenerAsyncDelegate::UseRTPReceiverPtr, UseRTPReceiverPtr)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::RTPPacketPtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::RTPPacketPtr, RTPPacketPtr)
 ZS_DECLARE_PROXY_METHOD_3(onDeliverPacket, Components, UseRTPReceiverPtr, RTPPacketPtr)
 ZS_DECLARE_PROXY_END()
 
diff --git a/ortc/internal/ortc_RTPMediaEngine.h b/ortc/internal/ortc_RTPMediaEngine.h
deleted file mode 100644
index b6340de0..00000000
--- a/ortc/internal/ortc_RTPMediaEngine.h
+++ /dev/null
@@ -1,2045 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#pragma once
-
-#include <ortc/internal/types.h>
-#include <ortc/internal/ortc_ISecureTransport.h>
-
-#include <ortc/IICETransport.h>
-#include <ortc/IDTMFSender.h>
-#include <ortc/IDTLSTransport.h>
-#include <ortc/IRTPTypes.h>
-#include <ortc/IMediaStreamTrack.h>
-#include <ortc/IStatsProvider.h>
-
-#include <zsLib/IWakeDelegate.h>
-#include <zsLib/MessageQueueAssociator.h>
-#include <zsLib/ITimer.h>
-
-#include "webrtc/base/scoped_ptr.h"
-#include <webrtc/base/logging.h>
-#include <webrtc/system_wrappers/include/trace.h>
-#include <webrtc/base/tracelog.h>
-#include <webrtc/audio/audio_send_stream.h>
-#include <webrtc/audio/audio_receive_stream.h>
-#include <webrtc/video/video_send_stream.h>
-#include <webrtc/video/video_receive_stream.h>
-#include <webrtc/video/call_stats.h>
-#include <webrtc/modules/congestion_controller/include/congestion_controller.h>
-#include <webrtc/modules/utility/include/process_thread.h>
-#include <webrtc/voice_engine/include/voe_base.h>
-#include <webrtc/video/vie_remb.h>
-//#define ORTC_SETTING_SCTP_TRANSPORT_MAX_MESSAGE_SIZE "ortc/sctp/max-message-size"
-
-namespace ortc
-{
-  namespace internal
-  {
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineRegistration);
-
-    // resource based interfaces
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineDeviceResource);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineChannelResource);
-    ZS_DECLARE_INTERACTION_PROXY(IRTPMediaEngineDeviceResourceAsyncDelegate);
-    ZS_DECLARE_INTERACTION_PTR(IDeviceResourceForRTPMediaEngine);
-    ZS_DECLARE_INTERACTION_PROXY(IRTPMediaEngineChannelResourceAsyncDelegate);
-    ZS_DECLARE_INTERACTION_PTR(IChannelResourceForRTPMediaEngine);
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForORTC);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForSettings);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForSingleton);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForRTPReceiverChannel);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForRTPReceiverChannelMediaBase);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForRTPReceiverChannelAudio);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForRTPReceiverChannelVideo);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForRTPSenderChannel);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForRTPSenderChannelMediaBase);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForRTPSenderChannelAudio);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForRTPSenderChannelVideo);
-    ZS_DECLARE_INTERACTION_PTR(IRTPMediaEngineForMediaStreamTrack);
-
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPMediaEngine);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelMediaBaseForRTPMediaEngine);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelAudioForRTPMediaEngine);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelVideoForRTPMediaEngine);
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelMediaBaseForRTPMediaEngine);
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelAudioForRTPMediaEngine);
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelVideoForRTPMediaEngine);
-
-    ZS_DECLARE_INTERACTION_PROXY(IRTPMediaEngineAsyncDelegate);
-    ZS_DECLARE_INTERACTION_PROXY(IRTPMediaEngineHandlePacketAsyncDelegate);
-
-    ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWith<RTPMediaEngine>, PromiseWithRTPMediaEngine);
-    ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWith<IRTPMediaEngineDeviceResource>, PromiseWithRTPMediaEngineDeviceResource);
-    ZS_DECLARE_TYPEDEF_PTR(zsLib::PromiseWith<IRTPMediaEngineChannelResource>, PromiseWithRTPMediaEngineChannelResource);
-    
-    ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrack::TrackConstraints, TrackConstraints);
-    ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrack::Settings, TrackSettings);
-    ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark VoiceEngineDeleter
-    #pragma mark
-
-    struct VoiceEngineDeleter {
-      VoiceEngineDeleter() {}
-      inline void operator()(webrtc::VoiceEngine* ptr) const {
-        webrtc::VoiceEngine::Delete(ptr);
-      }
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineRegistration
-    #pragma mark
-
-    interaction IRTPMediaEngineRegistration : public Any
-    {
-      template <typename data_type>
-      std::shared_ptr<data_type> engine() const {return ZS_DYNAMIC_PTR_CAST(data_type, getRTPEngine());}
-
-      virtual RTPMediaEnginePtr getRTPEngine() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineDeviceResource
-    #pragma mark
-
-    interaction IRTPMediaEngineDeviceResource : public Any
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame);
-
-      virtual PUID getID() const = 0;
-      virtual String getDeviceID() const = 0;
-
-      virtual PromisePtr shutdown() = 0;
-
-      virtual void stop() = 0;
-
-      virtual void updateConstraints(PromisePtr promise, TrackConstraintsPtr constraints) = 0;
-
-      virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) = 0;
-
-      virtual void setVideoRenderCallback(IMediaStreamTrackRenderCallbackPtr callback) = 0;
-
-      virtual void renderVideoFrame(VideoFramePtr videoFrame) = 0;
-
-      virtual void setFrameCount() = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineChannelResource
-    #pragma mark
-
-    interaction IRTPMediaEngineChannelResource : public Any
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-
-      virtual PUID getID() const = 0;
-
-      virtual PromisePtr shutdown() = 0;
-
-      virtual void notifyTransportState(ISecureTransportTypes::States state) = 0;
-
-      virtual void notifyUpdate(ParametersPtr params) = 0;
-
-      virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineDeviceResourceAsyncDelegate
-    #pragma mark
-
-    interaction IRTPMediaEngineDeviceResourceAsyncDelegate
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrack::TrackConstraints, TrackConstraints);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame);
-
-      virtual void onUpdateConstraints(PromisePtr promise, TrackConstraintsPtr constraints) = 0;
-      virtual void onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats) = 0;
-      virtual void onCapturedVideoFrame(VideoFramePtr frame) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IDeviceResourceForRTPMediaEngine
-    #pragma mark
-
-    interaction IDeviceResourceForRTPMediaEngine
-    {
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineChannelResourceAsyncDelegate
-    #pragma mark
-
-    interaction IRTPMediaEngineChannelResourceAsyncDelegate
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-
-      virtual void onSecureTransportState(ISecureTransport::States state) = 0;
-      virtual void onUpdate(ParametersPtr params) = 0;
-      virtual void onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats) = 0;
-      virtual void onSendDTMFTone() = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IChannelResourceForRTPMediaEngine
-    #pragma mark
-
-    interaction IChannelResourceForRTPMediaEngine
-    {
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineAudioReceiverChannelResource
-    #pragma mark
-
-    interaction IRTPMediaEngineAudioReceiverChannelResource : public IRTPMediaEngineChannelResource
-    {
-      virtual bool handlePacket(const RTPPacket &packet) = 0;
-      virtual bool handlePacket(const RTCPPacket &packet) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineAudioSenderChannelResource
-    #pragma mark
-
-    interaction IRTPMediaEngineAudioSenderChannelResource : public IRTPMediaEngineChannelResource
-    {
-      virtual bool handlePacket(const RTCPPacket &packet) = 0;
-
-      virtual void insertDTMF(
-                              const char *tones,
-                              Milliseconds duration,
-                              Milliseconds interToneGap
-                              ) = 0;
-
-      virtual String toneBuffer() const = 0;
-      virtual Milliseconds duration() const = 0;
-      virtual Milliseconds interToneGap() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineVideoReceiverChannelResource
-    #pragma mark
-
-    interaction IRTPMediaEngineVideoReceiverChannelResource : public IRTPMediaEngineChannelResource
-    {
-      virtual bool handlePacket(const RTPPacket &packet) = 0;
-      virtual bool handlePacket(const RTCPPacket &packet) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineVideoSenderChannelResource
-    #pragma mark
-
-    interaction IRTPMediaEngineVideoSenderChannelResource : public IRTPMediaEngineChannelResource
-    {
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame);
-
-      virtual bool handlePacket(const RTCPPacket &packet) = 0;
-      virtual void sendVideoFrame(VideoFramePtr videoFrame) = 0;
-    };
-
-    //-----------------------------------------------------------------------
-    //-----------------------------------------------------------------------
-    //-----------------------------------------------------------------------
-    //-----------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForORTC
-    #pragma mark
-
-    interaction IRTPMediaEngineForORTC
-    {
-      static void setLogLevel(Log::Level level);
-      static void ntpServerTime(const Milliseconds &value);
-      static void startMediaTracing();
-      static void stopMediaTracing();
-      static bool isMediaTracing();
-      static bool saveMediaTrace(String filename);
-      static bool saveMediaTrace(String host, int port);
-      static bool isMRPInstalled();
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForSettings
-    #pragma mark
-
-    interaction IRTPMediaEngineForSettings
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForSettings, ForSettings)
-
-      static void applyDefaults();
-
-      virtual ~IRTPMediaEngineForSettings() {}
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForSingleton
-    #pragma mark
-
-    interaction IRTPMediaEngineForSingleton
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForSingleton, ForSingleton)
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForRTPReceiverChannel
-    #pragma mark
-
-    interaction IRTPMediaEngineForRTPReceiverChannel
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPReceiverChannel, ForRTPReceiverChannel)
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForRTPReceiverChannelMediaBase
-    #pragma mark
-
-    interaction IRTPMediaEngineForRTPReceiverChannelMediaBase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPReceiverChannelMediaBase, ForRTPReceiverChannelMediaBase)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForRTPMediaEngine, UseReceiverChannelMediaBase)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPMediaEngine, UseMediaStreamTrack)
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::Transport, Transport)
-
-      ElementPtr toDebug(ForRTPReceiverChannelMediaBasePtr object);
-
-      static PromiseWithRTPMediaEnginePtr create();
-
-      static PromiseWithRTPMediaEngineChannelResourcePtr setupChannel(
-                                                                      UseReceiverChannelMediaBasePtr channel,
-                                                                      TransportPtr transport,
-                                                                      UseMediaStreamTrackPtr track,
-                                                                      ParametersPtr parameters,
-                                                                      RTPPacketPtr packet
-                                                                      );
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForRTPReceiverChannelAudio
-    #pragma mark
-
-    interaction IRTPMediaEngineForRTPReceiverChannelAudio : public IRTPMediaEngineForRTPReceiverChannelMediaBase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPReceiverChannelAudio, ForRTPReceiverChannelAudio)
- 
-      virtual ~IRTPMediaEngineForRTPReceiverChannelAudio() {}
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForRTPReceiverChannelVideo
-    #pragma mark
-
-    interaction IRTPMediaEngineForRTPReceiverChannelVideo : public IRTPMediaEngineForRTPReceiverChannelMediaBase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPReceiverChannelVideo, ForRTPReceiverChannelVideo)
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForRTPSenderChannel
-    #pragma mark
-
-    interaction IRTPMediaEngineForRTPSenderChannel
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPSenderChannel, ForRTPSenderChannel)
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForRTPSenderChannelMediaBase
-    #pragma mark
-
-    interaction IRTPMediaEngineForRTPSenderChannelMediaBase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPSenderChannelMediaBase, ForRTPSenderChannelMediaBase);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelMediaBaseForRTPMediaEngine, UseSenderChannelMediaBase);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPMediaEngine, UseMediaStreamTrack);
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::Transport, Transport);
-
-      ElementPtr toDebug(ForRTPSenderChannelMediaBasePtr object);
-
-      static PromiseWithRTPMediaEnginePtr create();
-
-      static PromiseWithRTPMediaEngineChannelResourcePtr setupChannel(
-                                                                      UseSenderChannelMediaBasePtr channel,
-                                                                      TransportPtr transport,
-                                                                      UseMediaStreamTrackPtr track,
-                                                                      ParametersPtr parameters,
-                                                                      IDTMFSenderDelegatePtr dtmfDelegate
-                                                                      );
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForRTPSenderChannelAudio
-    #pragma mark
-
-    interaction IRTPMediaEngineForRTPSenderChannelAudio : public IRTPMediaEngineForRTPSenderChannelMediaBase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPSenderChannelAudio, ForRTPSenderChannelAudio)
-
-      virtual ~IRTPMediaEngineForRTPSenderChannelAudio() {}
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForRTPSenderChannelVideo
-    #pragma mark
-
-    interaction IRTPMediaEngineForRTPSenderChannelVideo : public IRTPMediaEngineForRTPSenderChannelMediaBase
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPSenderChannelVideo, ForRTPSenderChannelVideo)
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForMediaStreamTrack
-    #pragma mark
-
-    interaction IRTPMediaEngineForMediaStreamTrack
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForMediaStreamTrack, ForMediaStreamTrack)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPMediaEngine, UseMediaStreamTrack)
-
-      ElementPtr toDebug(ForMediaStreamTrackPtr object);
-
-      static PromiseWithRTPMediaEnginePtr create();
-
-      static PromiseWithRTPMediaEngineDeviceResourcePtr setupDevice(UseMediaStreamTrackPtr track);
-
-      virtual ~IRTPMediaEngineForMediaStreamTrack() {}
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForDeviceResource
-    #pragma mark
-
-    interaction IRTPMediaEngineForDeviceResource
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForDeviceResource, ForDeviceResource)
-
-      virtual void notifyResourceGone(IDeviceResourceForRTPMediaEngine &resource) = 0;
-
-      virtual webrtc::VoiceEngine *getVoiceEngine() = 0;
-      virtual const SharedRecursiveLock &getSharedLock() const = 0;
-      virtual IMessageQueuePtr getMessageQueue() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineForChannelResource
-    #pragma mark
-
-    interaction IRTPMediaEngineForChannelResource
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForChannelResource, ForChannelResource)
-
-      virtual void notifyResourceGone(IChannelResourceForRTPMediaEngine &resource) = 0;
-
-      virtual webrtc::VoiceEngine *getVoiceEngine() = 0;
-      virtual rtc::scoped_refptr<webrtc::AudioState> getAudioState() = 0;
-      virtual const SharedRecursiveLock &getSharedLock() const = 0;
-      virtual IMessageQueuePtr getMessageQueue() const = 0;
-    };
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineAsyncDelegate
-    #pragma mark
-
-    interaction IRTPMediaEngineAsyncDelegate
-    {
-      ZS_DECLARE_STRUCT_PTR(SetupSenderChannel);
-      ZS_DECLARE_STRUCT_PTR(SetupReceiverChannel);
-      ZS_DECLARE_STRUCT_PTR(SetupDevice);
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForRTPMediaEngine, UseReceiverChannelMediaBase);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelMediaBaseForRTPMediaEngine, UseSenderChannelMediaBase);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPMediaEngine, UseMediaStreamTrack);
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::Transport, Transport);
-
-      struct SetupResource
-      {
-        IRTPMediaEngineRegistrationPtr mRegistration;
-      };
-
-      struct SetupChannel : public SetupResource
-      {
-        PromiseWithRTPMediaEngineChannelResourcePtr mPromise;
-        TransportPtr mTransport;
-        UseMediaStreamTrackPtr mTrack;
-        ParametersPtr mParameters;
-      };
-
-      struct SetupSenderChannel : public SetupChannel
-      {
-        UseSenderChannelMediaBasePtr mChannel;
-        IDTMFSenderDelegatePtr mDTMFDelegate;
-      };
-
-      struct SetupReceiverChannel : public SetupChannel
-      {
-        UseReceiverChannelMediaBasePtr mChannel;
-        RTPPacketPtr mPacket;
-      };
-
-      struct SetupDevice : public SetupResource
-      {
-        PromiseWithRTPMediaEngineDeviceResourcePtr mPromise;
-        UseMediaStreamTrackPtr mTrack;
-      };
-
-      virtual void onSetupSenderChannel(SetupSenderChannelPtr channel) = 0;
-      virtual void onSetupReceiverChannel(SetupReceiverChannelPtr channel) = 0;
-      virtual void onSetupDevice(SetupDevicePtr device) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineHandlePacketAsyncDelegate
-    #pragma mark
-
-    interaction IRTPMediaEngineHandlePacketAsyncDelegate
-    {
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame);
-
-      virtual void onHandleRTPPacket(DWORD timestamp, SecureByteBlockPtr buffer) = 0;
-      virtual void onHandleRTCPPacket(SecureByteBlockPtr buffer) = 0;
-      virtual void onSendVideoFrame(VideoFramePtr videoFrame) = 0;
-    };
-    
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPMediaEngine
-    #pragma mark
-    
-    class RTPMediaEngine : public Any,
-                           public Noop,
-                           public MessageQueueAssociator,
-                           public SharedRecursiveLock,
-                           public IRTPMediaEngineForORTC,
-                           public IRTPMediaEngineForSettings,
-                           public IRTPMediaEngineForSingleton,
-                           public IRTPMediaEngineForRTPReceiverChannel,
-                           public IRTPMediaEngineForRTPReceiverChannelAudio,
-                           public IRTPMediaEngineForRTPReceiverChannelVideo,
-                           public IRTPMediaEngineForRTPSenderChannel,
-                           public IRTPMediaEngineForRTPSenderChannelAudio,
-                           public IRTPMediaEngineForRTPSenderChannelVideo,
-                           public IRTPMediaEngineForMediaStreamTrack,
-                           public IRTPMediaEngineForDeviceResource,
-                           public IRTPMediaEngineForChannelResource,
-                           public IWakeDelegate,
-                           public zsLib::ITimerDelegate,
-                           public IRTPMediaEngineAsyncDelegate
-    {
-    protected:
-      struct make_private {};
-
-    public:
-      friend class RTPMediaEngineRegistration;
-
-      friend interaction IRTPMediaEngine;
-      friend interaction IRTPMediaEngineFactory;
-      friend interaction IRTPMediaEngineForORTC;
-      friend interaction IRTPMediaEngineForSettings;
-      friend interaction IRTPMediaEngineForSingleton;
-      friend interaction IRTPMediaEngineForRTPReceiverChannel;
-      friend interaction IRTPMediaEngineForRTPReceiverChannelMediaBase;
-      friend interaction IRTPMediaEngineForRTPReceiverChannelAudio;
-      friend interaction IRTPMediaEngineForRTPReceiverChannelVideo;
-      friend interaction IRTPMediaEngineForRTPSenderChannel;
-      friend interaction IRTPMediaEngineForRTPSenderChannelMediaBase;
-      friend interaction IRTPMediaEngineForRTPSenderChannelAudio;
-      friend interaction IRTPMediaEngineForRTPSenderChannelVideo;
-      friend interaction IRTPMediaEngineForMediaStreamTrack;
-      friend interaction IRTPMediaEngineForDeviceResource;
-      friend interaction IRTPMediaEngineForChannelResource;
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForRTPMediaEngine, UseReceiverChannelMediaBase);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelMediaBaseForRTPMediaEngine, UseSenderChannelMediaBase);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPMediaEngine, UseMediaStreamTrack);
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::Transport, Transport);
-
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ConstraintSet, ConstraintSet);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ConstrainLongRange, ConstrainLongRange);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::ConstrainDoubleRange, ConstrainDoubleRange);
-
-      ZS_DECLARE_CLASS_PTR(BaseResource);
-      ZS_DECLARE_CLASS_PTR(DeviceResource);
-      ZS_DECLARE_CLASS_PTR(ChannelResource);
-      ZS_DECLARE_CLASS_PTR(AudioReceiverChannelResource);
-      ZS_DECLARE_CLASS_PTR(AudioSenderChannelResource);
-      ZS_DECLARE_CLASS_PTR(VideoReceiverChannelResource);
-      ZS_DECLARE_CLASS_PTR(VideoSenderChannelResource);
-
-      struct VideoCaptureCapabilityWithDistance
-      {
-        webrtc::VideoCaptureCapability mCapability;
-        FLOAT mDistance;
-      };
-
-      enum States
-      {
-        State_Pending,
-        State_Ready,
-        State_ShuttingDown,
-        State_Shutdown,
-      };
-      static const char *toString(States state);
-
-      ZS_DECLARE_TYPEDEF_PTR(std::list<PromiseWithRTPMediaEnginePtr>, PromiseWithRTPMediaEngineList)
-
-      typedef std::map<PUID, DeviceResourceWeakPtr> DeviceResourceWeakMap;
-      typedef std::list<DeviceResourcePtr> DeviceResourceList;
-      typedef std::map<PUID, ChannelResourceWeakPtr> ChannelResourceWeakMap;
-      typedef std::list<ChannelResourcePtr> ChannelResourceList;
-
-    public:
-      RTPMediaEngine(
-                     const make_private &,
-                     IMessageQueuePtr queue,
-                     IRTPMediaEngineRegistrationPtr registration
-                     );
-
-    protected:
-      RTPMediaEngine(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
-        Noop(true),
-        MessageQueueAssociator(queue),
-        SharedRecursiveLock(SharedRecursiveLock::create())
-      {}
-
-      void init();
-
-    public:
-      virtual ~RTPMediaEngine();
-
-      static RTPMediaEnginePtr convert(ForSettingsPtr object);
-      static RTPMediaEnginePtr convert(ForRTPReceiverChannelPtr object);
-      static RTPMediaEnginePtr convert(ForRTPReceiverChannelMediaBasePtr object);
-      static RTPMediaEnginePtr convert(ForRTPReceiverChannelAudioPtr object);
-      static RTPMediaEnginePtr convert(ForRTPReceiverChannelVideoPtr object);
-      static RTPMediaEnginePtr convert(ForRTPSenderChannelMediaBasePtr object);
-      static RTPMediaEnginePtr convert(ForRTPSenderChannelAudioPtr object);
-      static RTPMediaEnginePtr convert(ForRTPSenderChannelVideoPtr object);
-      static RTPMediaEnginePtr convert(ForMediaStreamTrackPtr object);
-      static RTPMediaEnginePtr convert(ForDeviceResourcePtr object);
-      static RTPMediaEnginePtr convert(ForChannelResourcePtr object);
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => RTPMediaEngineRegistration
-      #pragma mark
-
-      static PromiseWithRTPMediaEnginePtr createEnginePromise();
-
-      static RTPMediaEnginePtr create(IRTPMediaEngineRegistrationPtr registration);
-
-      void notify(PromiseWithRTPMediaEnginePtr promise);
-
-      void shutdown();
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForORTC
-      #pragma mark
-
-      static void ntpServerTime(const Milliseconds &value);
-      static void setLogLevel(Log::Level level);
-      static void startMediaTracing();
-      static void stopMediaTracing();
-      static bool isMediaTracing();
-      static bool saveMediaTrace(String filename);
-      static bool saveMediaTrace(String host, int port);
-      static bool isMRPInstalled();
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPReceiverChannel
-      #pragma mark
-
-      virtual PUID getID() const override {return mID;}
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPReceiverChannelMediaBase
-      #pragma mark
-
-      PromiseWithRTPMediaEngineChannelResourcePtr setupChannel(
-                                                               UseReceiverChannelMediaBasePtr channel,
-                                                               TransportPtr transport,
-                                                               UseMediaStreamTrackPtr track,
-                                                               ParametersPtr parameters,
-                                                               RTPPacketPtr packet
-                                                               );
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPReceiverChannelAudio
-      #pragma mark
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPReceiverChannelVideo
-      #pragma mark
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPSenderChannel
-      #pragma mark
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPSenderChannelMediaBase
-      #pragma mark
-
-      PromiseWithRTPMediaEngineChannelResourcePtr setupChannel(
-                                                               UseSenderChannelMediaBasePtr channel,
-                                                               TransportPtr transport,
-                                                               UseMediaStreamTrackPtr track,
-                                                               ParametersPtr parameters,
-                                                               IDTMFSenderDelegatePtr dtmfDelegate
-                                                               );
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPSenderChannelAudio
-      #pragma mark
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForRTPSenderChannelVideo
-      #pragma mark
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForMediaStreamTrack
-      #pragma mark
-
-      PromiseWithRTPMediaEngineDeviceResourcePtr setupDevice(UseMediaStreamTrackPtr track);
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForDeviceResource
-      #pragma mark
-
-      virtual void notifyResourceGone(IDeviceResourceForRTPMediaEngine &resource) override;
-
-      virtual webrtc::VoiceEngine *getVoiceEngine() override;
-
-      virtual const SharedRecursiveLock &getSharedLock() const override { return *this; }
-      virtual IMessageQueuePtr getMessageQueue() const override { return getAssociatedMessageQueue(); }
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineForChannelResource
-      #pragma mark
-
-      virtual void notifyResourceGone(IChannelResourceForRTPMediaEngine &resource) override;
-
-      // (duplicate) virtual webrtc::VoiceEngine *getVoiceEngine() = 0;
-
-      virtual rtc::scoped_refptr<webrtc::AudioState> getAudioState() override;
-
-      // (duplicate) virtual const SharedRecursiveLock &getSharedLock() const = 0;
-      // (duplicate) virtual IMessageQueuePtr getMessageQueue() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IWakeDelegate
-      #pragma mark
-
-      virtual void onWake() override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => ITimerDelegate
-      #pragma mark
-
-      virtual void onTimer(ITimerPtr timer) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => IRTPMediaEngineAsyncDelegate
-      #pragma mark
-
-      virtual void onSetupSenderChannel(SetupSenderChannelPtr setup) override;
-      virtual void onSetupReceiverChannel(SetupReceiverChannelPtr setup) override;
-      virtual void onSetupDevice(SetupDevicePtr setup) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => (friend DeviceResource)
-      #pragma mark
-
-      void shutdownDeviceResource(DeviceResourcePtr deviceResource);
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => webrtc::SetupEventTracer
-      #pragma mark
-
-#if defined(WINRT)
-      static const unsigned char *GetCategoryGroupEnabled(const char *categoryGroup);
-
-      static void __cdecl AddTraceEvent(
-                                        char phase,
-                                        const unsigned char *categoryGroupEnabled,
-                                        const char *name,
-                                        uint64 id,
-                                        int numArgs,
-                                        const char **argNames,
-                                        const unsigned char *argTypes,
-                                        const uint64 *argValues,
-                                        unsigned char flags
-                                        );
-#endif
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => (friend ChannelResource)
-      #pragma mark
-
-      void shutdownChannelResource(ChannelResourcePtr channelResource);
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => (internal)
-      #pragma mark
-
-      Log::Params log(const char *message) const;
-      Log::Params debug(const char *message) const;
-      virtual ElementPtr toDebug() const;
-
-      virtual void internalSetLogLevel(Log::Level level);
-      virtual void internalStartMediaTracing();
-      virtual void internalStopMediaTracing();
-      virtual bool internalIsMediaTracing();
-      virtual bool internalSaveMediaTrace(String filename);
-      virtual bool internalSaveMediaTrace(String host, int port);
-      virtual void internalAddTraceEvent(
-                                         char phase,
-                                         const unsigned char *categoryGroupEnabled,
-                                         const char *name,
-                                         uint64_t id,
-                                         int numArgs,
-                                         const char **argNames,
-                                         const unsigned char *argTypes,
-                                         const uint64_t *argValues,
-                                         unsigned char flags
-                                         );
-      virtual bool internalIsMRPInstalled();
-
-      bool isReady() const;
-      bool isShuttingDown() const;
-      bool isShutdown() const;
-
-      void step();
-      bool stepSetup();
-      bool stepSetupDevices();
-      bool stepCloseDevices();
-      bool stepSetupChannels();
-      bool stepCloseChannels();
-
-      void cancel();
-      void stepCancel();
-
-      void setState(States state);
-      void setError(WORD error, const char *reason = NULL);
-
-    public:
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine::WebRtcTraceCallback
-      #pragma mark
-
-      class WebRtcTraceCallback : public webrtc::TraceCallback
-      {
-      public:
-        virtual void Print(webrtc::TraceLevel level, const char* message, int length) override;
-      };
-
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine::WebRtcTraceCallback
-      #pragma mark
-
-      class WebRtcLogSink : public rtc::LogSink
-      {
-      public:
-        virtual void OnLogMessage(const std::string& message) override;
-      };
-
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine::BaseResource
-      #pragma mark
-
-      class BaseResource : public Any,
-                           public SharedRecursiveLock,
-                           public MessageQueueAssociator
-      {
-      protected:
-        struct make_private {};
-
-      public:
-        typedef std::list<PromiseWeakPtr> PendingPromiseList;
-
-        ZS_DECLARE_STRUCT_PTR(LifetimeHolder);
-
-        struct LifetimeHolder : public Any
-        {
-          BaseResourcePtr mResource;
-
-          LifetimeHolder(BaseResourcePtr resource) : mResource(resource) {}
-          virtual ~LifetimeHolder() { if (!mResource) return; mResource->lifetimeHolderGone(); }
-        };
-
-      public:
-        BaseResource(
-                     const make_private &,
-                     IRTPMediaEngineRegistrationPtr registration,
-                     RTPMediaEnginePtr engine
-                     );
-        virtual ~BaseResource();
-
-        void notifyPromisesResolve();
-        void notifyPromisesReject();
-
-        //std::shared_ptr<Promise> createPromise() { return internalSetupPromise(Promise::create(delegateQueue())); }
-
-        //template <typename data_type>
-        //static std::shared_ptr<PromiseWith<data_type> > createPromise() {return ZS_DYNAMIC_PTR_CAST(PromiseWith<data_type>, internalSetupPromise(PromiseWith<data_type>::create(delegateQueue())));}
-
-        void registerPromise(PromisePtr promise) {internalSetupPromise(promise);}
-
-        template <typename self_type>
-        std::shared_ptr<self_type> getThis() const {return ZS_DYNAMIC_PTR_CAST(self_type, mThisWeak.lock());}
-
-        template <typename engine_interface>
-        std::shared_ptr<engine_interface> getEngine() const {return mMediaEngine.lock();}
-
-        virtual void lifetimeHolderGone() {}
-
-      protected:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::BaseResource => (internal)
-        #pragma mark
-
-        static IMessageQueuePtr delegateQueue();
-        PromisePtr internalSetupPromise(PromisePtr promise);
-        void internalFixState();
-
-      protected:
-        AutoPUID mID;
-        BaseResourceWeakPtr mThisWeak;
-
-        bool mNotifiedReady {false};
-        bool mNotifiedRejected {false};
-        PendingPromiseList mPendingPromises;
-
-        IRTPMediaEngineRegistrationPtr mRegistration;
-        RTPMediaEngineWeakPtr mMediaEngine;
-      };
-
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine::DeviceResource
-      #pragma mark
-
-      class DeviceResource : public IRTPMediaEngineDeviceResource,
-                             public BaseResource,
-                             public IDeviceResourceForRTPMediaEngine,
-                             public IRTPMediaEngineDeviceResourceAsyncDelegate
-      {
-      public:
-        ZS_DECLARE_CLASS_PTR(VideoCaptureTransport)
-        friend class VideoCaptureTransport;
-
-        typedef std::list<PromisePtr> PromiseList;
-
-        ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackTypes::Kinds, Kinds)
-        ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame);
-
-        ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForDeviceResource, UseEngine)
-        ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-        ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet);
-
-        struct AutoIncrementLock
-        {
-          AutoIncrementLock(std::atomic<size_t> &accessFromNonLockedMethods) : mAccessFromNonLockedMethods(accessFromNonLockedMethods) { ++mAccessFromNonLockedMethods; }
-          ~AutoIncrementLock() { --mAccessFromNonLockedMethods; }
-
-          std::atomic<size_t> &mAccessFromNonLockedMethods;
-        };
-
-      public:
-        DeviceResource(
-                       const make_private &priv,
-                       IRTPMediaEngineRegistrationPtr registration,
-                       UseMediaStreamTrackPtr track
-                       );
-        virtual ~DeviceResource();
-
-        static DeviceResourcePtr create(
-                                        IRTPMediaEngineRegistrationPtr registration,
-                                        UseMediaStreamTrackPtr track
-                                        );
-
-        virtual void lifetimeHolderGone() override;
-
-      protected:
-        void init();
-
-      public:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::DeviceResource => IRTPMediaEngineDeviceResource
-        #pragma mark
-
-        virtual PUID getID() const override { return mID; }
-        virtual String getDeviceID() const override;
-        virtual PromisePtr shutdown() override;
-        virtual void stop() override;
-        virtual void updateConstraints(PromisePtr promise, TrackConstraintsPtr constraints) override;
-        virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override;
-
-        virtual void setVideoRenderCallback(IMediaStreamTrackRenderCallbackPtr callback) override;
-
-        virtual void renderVideoFrame(VideoFramePtr videoFrame) override;
-
-        virtual void setFrameCount() override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::DeviceResource => IRTPMediaEngineDeviceResourceAsyncDelegate
-        #pragma mark
-
-        virtual void onUpdateConstraints(PromisePtr promise, TrackConstraintsPtr constraints) override;
-
-        virtual void onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats) override;
-
-        virtual void onCapturedVideoFrame(VideoFramePtr frame) override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::DeviceResource => (friend RTPMediaEngine)
-        #pragma mark
-
-        virtual void stepSetup();
-        virtual void stepShutdown();
-
-      protected:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::DeviceResource => (internal friend derived)
-        #pragma mark
-
-        bool isShuttingDown() const { return mShuttingDown; }
-        bool isShutdown() const { return mShutdown; }
-        void notifyPromisesShutdown();
-
-      public:
-        //-----------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::DeviceResource => friend VideoCaptureTransport
-        #pragma mark
-
-        virtual void OnIncomingCapturedFrame(const int32_t id, const webrtc::VideoFrame& videoFrame);
-
-        virtual void OnCaptureDelayChanged(const int32_t id, const int32_t delay);
-
-        //-----------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::DeviceResource::VideoCaptureTransport
-        #pragma mark
-
-        class VideoCaptureTransport : public webrtc::VideoCaptureDataCallback
-        {
-          struct make_private {};
-
-        protected:
-          void init();
-
-        public:
-          VideoCaptureTransport(
-                                const make_private &,
-                                DeviceResourcePtr outer
-                                );
-
-          ~VideoCaptureTransport();
-
-          static VideoCaptureTransportPtr create(DeviceResourcePtr outer);
-
-        public:
-          //---------------------------------------------------------------------
-          #pragma mark
-          #pragma mark RTPMediaEngine::DeviceResource::Transport => webrtc::VideoCaptureDataCallback
-          #pragma mark
-
-          virtual void OnIncomingCapturedFrame(const int32_t id, const webrtc::VideoFrame& videoFrame) override;
-
-          virtual void OnCaptureDelayChanged(const int32_t id, const int32_t delay) override;
-
-        private:
-          VideoCaptureTransportWeakPtr mThisWeak;
-          DeviceResourceWeakPtr mOuter;
-        };
-
-      protected:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::DeviceResource => (internal)
-        #pragma mark
-
-        PromisePtr getShutdownPromise();
-
-        int getAudioDeviceIndex(webrtc::VoiceEngine *voiceEngine, String deviceID);
-
-        FLOAT calculateSizeDistance(
-                                    ConstrainLongRange width,
-                                    ConstrainLongRange height,
-                                    webrtc::VideoCaptureCapability capability
-                                    );
-        FLOAT calculateFrameRateDistance(
-                                         ConstrainDoubleRange frameRate,
-                                         webrtc::VideoCaptureCapability capability
-                                         );
-        FLOAT calculateAspectRatioDistance(
-                                           ConstrainDoubleRange aspectRatio,
-                                           webrtc::VideoCaptureCapability capability
-                                           );
-        FLOAT calculateFormatDistance(webrtc::VideoCaptureCapability capability);
-
-      protected:
-        String mDeviceID;
-
-        bool mShuttingDown {false};
-        bool mShutdown {false};
-        PromiseList mShutdownPromises;
-
-        IMessageQueuePtr mHandleDataQueue;
-        std::atomic<size_t> mAccessFromNonLockedMethods {};
-        std::atomic<bool> mDenyNonLockedAccess {};
-
-        UseMediaStreamTrackWeakPtr mTrack;
-
-        VideoCaptureTransportPtr mTransport;  // keep lifetime of webrtc callback separate from this object
-
-        webrtc::VideoCaptureModule* mVideoCaptureModule {NULL};
-        webrtc::VideoRenderCallback* mVideoRendererCallback {NULL};
-        IMediaStreamTrackRenderCallbackPtr mVideoRenderCallbackReferenceHolder;
-
-        std::atomic<ULONG> mFramesSent {};
-        std::atomic<ULONG> mFramesReceived {};
-        WeightedMovingAverageUsingTotalDouble mAverageFramesSent;
-        WeightedMovingAverageUsingTotalDouble mAverageFramesReceived;
-      };
-
-      
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine::ChannelResource
-      #pragma mark
-
-      class ChannelResource : public BaseResource,
-                              public IRTPMediaEngineHandlePacketAsyncDelegate,
-                              public IChannelResourceForRTPMediaEngine,
-                              public IRTPMediaEngineChannelResourceAsyncDelegate
-      {
-      public:
-        typedef std::list<PromisePtr> PromiseList;
-
-        ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForChannelResource, UseEngine);
-        ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-        ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet);
-
-        struct AutoIncrementLock
-        {
-          AutoIncrementLock(std::atomic<size_t> &accessFromNonLockedMethods) : mAccessFromNonLockedMethods(accessFromNonLockedMethods) { ++mAccessFromNonLockedMethods; }
-          ~AutoIncrementLock() { --mAccessFromNonLockedMethods; }
-
-          std::atomic<size_t> &mAccessFromNonLockedMethods;
-        };
-
-      public:
-        ChannelResource(
-                        const make_private &priv,
-                        IRTPMediaEngineRegistrationPtr registration
-                        );
-
-        virtual ~ChannelResource();
-
-        virtual void lifetimeHolderGone() override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::ChannelResource => IRTPMediaEngineChannelResource
-        #pragma mark
-
-        virtual PUID getID() const override { return mID; }
-        virtual PromisePtr shutdown();
-        virtual void notifyTransportState(ISecureTransportTypes::States state);
-        virtual void notifyUpdate(ParametersPtr params);
-        virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats);
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::ChannelResource => IRTPMediaEngineChannelResourceAsyncDelegate
-        #pragma mark
-
-        virtual void onSendDTMFTone() override { }
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::ChannelResource => (friend RTPMediaEngine)
-        #pragma mark
-
-        virtual void stepSetup() = 0;
-        virtual void stepShutdown() = 0;
-
-      protected:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::ChannelResource => (internal friend derived)
-        #pragma mark
-
-        bool isShuttingDown() const {return mShuttingDown;}
-        bool isShutdown() const {return mShutdown;}
-        void notifyPromisesShutdown();
-
-      protected:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::ChannelResource => (internal)
-        #pragma mark
-
-        PromisePtr getShutdownPromise();
-
-      protected:
-        String mCodecPayloadName;
-        BYTE mCodecPayloadType {0};
-        UINT mCurrentTargetBitrate {0};
-
-        rtc::scoped_ptr<webrtc::ProcessThread> mModuleProcessThread;
-        rtc::scoped_ptr<webrtc::ProcessThread> mPacerThread;
-        webrtc::Clock *mClock;
-        webrtc::VieRemb mRemb;
-        rtc::scoped_ptr<webrtc::CallStats> mCallStats;
-        rtc::scoped_ptr<webrtc::CongestionController> mCongestionController;
-        rtc::scoped_ptr<webrtc::BitrateAllocator> mBitrateAllocator;
-
-        bool mShuttingDown {false};
-        bool mShutdown {false};
-        PromiseList mShutdownPromises;
-
-        IMessageQueuePtr mHandlePacketQueue;
-        std::atomic<size_t> mAccessFromNonLockedMethods {};
-        std::atomic<bool> mDenyNonLockedAccess {};
-      };
-
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine::AudioReceiverChannelResource
-      #pragma mark
-
-      class AudioReceiverChannelResource : public IRTPMediaEngineAudioReceiverChannelResource,
-                                           public ChannelResource,
-                                           public webrtc::BitrateObserver
-      {
-      public:
-        friend class RTPMediaEngine;
-
-        ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-        ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-
-      public:
-        AudioReceiverChannelResource(
-                                     const make_private &,
-                                     IRTPMediaEngineRegistrationPtr registration,
-                                     TransportPtr transport,
-                                     UseMediaStreamTrackPtr track,
-                                     ParametersPtr parameters,
-                                     RTPPacketPtr packet
-                                     );
-        virtual ~AudioReceiverChannelResource();
-
-        static AudioReceiverChannelResourcePtr create(
-                                                      IRTPMediaEngineRegistrationPtr registration,
-                                                      TransportPtr transport,
-                                                      UseMediaStreamTrackPtr track,
-                                                      ParametersPtr parameters,
-                                                      RTPPacketPtr packet
-                                                      );
-
-      protected:
-        void init();
-
-      public:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioReceiverChannelResource => IRTPMediaEngineChannelResource
-        #pragma mark
-
-        virtual PUID getID() const override {return ChannelResource::getID();}
-
-        virtual PromisePtr shutdown() override {return ChannelResource::shutdown();}
-
-        virtual void notifyTransportState(ISecureTransportTypes::States state) override { return ChannelResource::notifyTransportState(state); }
-
-        virtual void notifyUpdate(ParametersPtr params) override { return ChannelResource::notifyUpdate(params); }
-
-        virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override { return ChannelResource::requestStats(promise, stats); }
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioReceiverChannelResource => IRTPMediaEngineChannelResourceAsyncDelegate
-        #pragma mark
-
-        virtual void onSecureTransportState(ISecureTransport::States state) override;
-
-        virtual void onUpdate(ParametersPtr params) override;
-
-        virtual void onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats) override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioReceiverChannelResource => IRTPMediaEngineAudioReceiverChannelResource
-        #pragma mark
-
-        virtual bool handlePacket(const RTPPacket &packet) override;
-        virtual bool handlePacket(const RTCPPacket &packet) override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioReceiverChannelResource => IRTPMediaEngineHandlePacketAsyncDelegate
-        #pragma mark
-
-        virtual void onHandleRTPPacket(DWORD timestamp, SecureByteBlockPtr buffer) override;
-        virtual void onHandleRTCPPacket(SecureByteBlockPtr buffer) override;
-        virtual void onSendVideoFrame(VideoFramePtr videoFrame) override {}
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioReceiverChannelResource => webrtc::BitrateObserver
-        #pragma mark
-
-        virtual void OnNetworkChanged(uint32_t targetBitrateBps, uint8_t fractionLoss, int64_t rttMs) override;
-
-      protected:
-        //-----------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioReceiverChannelResource => friend RTPMediaEngine
-        #pragma mark
-
-        virtual void stepSetup() override;
-        virtual void stepShutdown() override;
-
-        //-----------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioReceiverChannelResource => (internal)
-        #pragma mark
-
-        int getChannel() const;
-        webrtc::CodecInst getAudioCodec(
-                                        webrtc::VoiceEngine *voiceEngine,
-                                        String payloadName
-                                        );
-
-      protected:
-        int mChannel {};
-
-        TransportPtr mTransport;
-        std::atomic<ISecureTransport::States> mTransportState { ISecureTransport::State_Pending };
-
-        UseMediaStreamTrackWeakPtr mTrack;
-
-        ParametersPtr mParameters;
-
-        RTPPacketPtr mInitPacket;
-
-        rtc::scoped_ptr<webrtc::AudioReceiveStream> mReceiveStream;
-
-        int mDTMFPayloadType{ 0 };
-      };
-
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine::AudioSenderChannelResource
-      #pragma mark
-
-      class AudioSenderChannelResource : public IRTPMediaEngineAudioSenderChannelResource,
-                                         public ChannelResource,
-                                         public zsLib::ITimerDelegate,
-                                         public webrtc::BitrateObserver
-      {
-      public:
-        friend class RTPMediaEngine;
-
-        ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-        ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-
-        const int dtmfTwoSecondsDelayCode = -1;
-        const int dtmfTwoSecondInMs = 2000;
-        const char dtmfValidTones[22] = ",0123456789*#ABCDabcd";
-        const char dtmfTonesTable[18] = ",0123456789*#ABCD";
-
-      public:
-        AudioSenderChannelResource(
-                                   const make_private &,
-                                   IRTPMediaEngineRegistrationPtr registration,
-                                   TransportPtr transport,
-                                   UseMediaStreamTrackPtr track,
-                                   ParametersPtr parameters,
-                                   IDTMFSenderDelegatePtr dtmfDelegate
-                                   );
-        virtual ~AudioSenderChannelResource();
-
-        static AudioSenderChannelResourcePtr create(
-                                                    IRTPMediaEngineRegistrationPtr registration,
-                                                    TransportPtr transport,
-                                                    UseMediaStreamTrackPtr track,
-                                                    ParametersPtr parameters,
-                                                    IDTMFSenderDelegatePtr dtmfDelegate
-                                                    );
-
-      protected:
-        void init();
-
-      public:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioSenderChannelResource => IRTPMediaEngineChannelResource
-        #pragma mark
-
-        virtual PUID getID() const override {return ChannelResource::getID();}
-
-        virtual PromisePtr shutdown() override {return ChannelResource::shutdown();}
-
-        virtual void notifyTransportState(ISecureTransportTypes::States state) override { return ChannelResource::notifyTransportState(state); }
-
-        virtual void notifyUpdate(ParametersPtr params) override { return ChannelResource::notifyUpdate(params); }
-
-        virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override { return ChannelResource::requestStats(promise, stats); }
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioSenderChannelResource => IRTPMediaEngineChannelResourceAsyncDelegate
-        #pragma mark
-
-        virtual void onSecureTransportState(ISecureTransport::States state) override;
-
-        virtual void onUpdate(ParametersPtr params) override;
-
-        virtual void onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats) override;
-
-        virtual void onSendDTMFTone() override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioSenderChannelResource => IRTPMediaEngineAudioSenderChannelResource
-        #pragma mark
-
-        virtual bool handlePacket(const RTCPPacket &packet) override;
-
-        virtual void insertDTMF(
-                                const char *tones,
-                                Milliseconds duration,
-                                Milliseconds interToneGap
-                                ) override;
-
-        virtual String toneBuffer() const override;
-        virtual Milliseconds duration() const override;
-        virtual Milliseconds interToneGap() const override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioSenderChannelResource => IRTPMediaEngineHandlePacketAsyncDelegate
-        #pragma mark
-
-        virtual void onHandleRTPPacket(DWORD timestamp, SecureByteBlockPtr buffer) override {}
-        virtual void onHandleRTCPPacket(SecureByteBlockPtr buffer) override;
-        virtual void onSendVideoFrame(VideoFramePtr videoFrame) override {}
-
-        //-----------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioSenderChannelResource => ITimerDelegate
-        #pragma mark
-
-        virtual void onTimer(ITimerPtr timer) override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioSenderChannelResource => webrtc::BitrateObserver
-        #pragma mark
-
-        virtual void OnNetworkChanged(uint32_t targetBitrateBps, uint8_t fractionLoss, int64_t rttMs) override;
-
-      protected:
-        //-----------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioSenderChannelResource => friend RTPMediaEngine
-        #pragma mark
-
-        virtual void stepSetup() override;
-        virtual void stepShutdown() override;
-
-        //-----------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::AudioSenderChannelResource => (internal)
-        #pragma mark
-
-        webrtc::CodecInst getAudioCodec(
-                                        webrtc::VoiceEngine *voiceEngine,
-                                        String payloadName
-                                        );
-
-        void notifyToneEvent(const char *tone);
-
-      protected:
-        int mChannel{};
-
-        TransportPtr mTransport;
-        std::atomic<ISecureTransport::States> mTransportState { ISecureTransport::State_Pending };
-
-        UseMediaStreamTrackWeakPtr mTrack;
-
-        ParametersPtr mParameters;
-
-        String mSendCodecPayloadName;
-        BYTE mSendCodecPayloadType {0};
-
-        rtc::scoped_ptr<webrtc::AudioSendStream> mSendStream;
-
-        int mDTMFPayloadType {0};
-        IDTMFSenderDelegatePtr mDTMFSenderDelegate;
-        ITimerPtr mDTMFTimer;
-        String mDTMFTones;
-        Milliseconds mDTMFDuration;
-        Milliseconds mDTMFInterToneGap;
-      };
-
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine::VideoReceiverChannelResource
-      #pragma mark
-
-      class VideoReceiverChannelResource : public IRTPMediaEngineVideoReceiverChannelResource,
-                                           public ChannelResource,
-                                           public webrtc::BitrateObserver
-      {
-      public:
-        friend class RTPMediaEngine;
-
-        ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-        ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-
-        class ReceiverVideoRenderer : public webrtc::VideoRenderer
-        {
-        public:
-          void setMediaStreamTrack(UseMediaStreamTrackPtr videoTrack);
-
-          virtual void RenderFrame(
-                                   const webrtc::VideoFrame &videoFrame,
-                                   int timeToRenderMs
-                                   ) override;
-
-          virtual bool IsTextureSupported() const override;
-
-        private:
-          UseMediaStreamTrackWeakPtr mVideoTrack;
-        };
-
-      public:
-        VideoReceiverChannelResource(
-                                     const make_private &,
-                                     IRTPMediaEngineRegistrationPtr registration,
-                                     TransportPtr transport,
-                                     UseMediaStreamTrackPtr track,
-                                     ParametersPtr parameters,
-                                     RTPPacketPtr packet
-                                     );
-        virtual ~VideoReceiverChannelResource();
-
-        static VideoReceiverChannelResourcePtr create(
-                                                      IRTPMediaEngineRegistrationPtr registration,
-                                                      TransportPtr transport,
-                                                      UseMediaStreamTrackPtr track,
-                                                      ParametersPtr parameters,
-                                                      RTPPacketPtr packet
-                                                      );
-
-      protected:
-        void init();
-
-      public:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoReceiverChannelResource => IRTPMediaEngineChannelResource
-        #pragma mark
-
-        virtual PUID getID() const override {return ChannelResource::getID();}
-
-        virtual PromisePtr shutdown() override {return ChannelResource::shutdown();}
-
-        virtual void notifyTransportState(ISecureTransportTypes::States state) override { return ChannelResource::notifyTransportState(state); }
-
-        virtual void notifyUpdate(ParametersPtr params) override { return ChannelResource::notifyUpdate(params); }
-
-        virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override { return ChannelResource::requestStats(promise, stats); }
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoReceiverChannelResource => IRTPMediaEngineChannelResourceAsyncDelegate
-        #pragma mark
-
-        virtual void onSecureTransportState(ISecureTransport::States state) override;
-
-        virtual void onUpdate(ParametersPtr params) override;
-
-        virtual void onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats) override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoReceiverChannelResource => IRTPMediaEngineVideoReceiverChannelResource
-        #pragma mark
-
-        virtual bool handlePacket(const RTPPacket &packet) override;
-        virtual bool handlePacket(const RTCPPacket &packet) override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoReceiverChannelResource => IRTPMediaEngineHandlePacketAsyncDelegate
-        #pragma mark
-
-        virtual void onHandleRTPPacket(DWORD timestamp, SecureByteBlockPtr buffer) override;
-        virtual void onHandleRTCPPacket(SecureByteBlockPtr buffer) override;
-        virtual void onSendVideoFrame(VideoFramePtr videoFrame) override {}
-
-        //-----------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoReceiverChannelResource => friend RTPMediaEngine
-        #pragma mark
-
-        virtual void stepSetup() override;
-        virtual void stepShutdown() override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoReceiverChannelResource => webrtc::BitrateObserver
-        #pragma mark
-
-        virtual void OnNetworkChanged(uint32_t targetBitrateBps, uint8_t fractionLoss, int64_t rttMs) override;
-
-      protected:
-        TransportPtr mTransport;
-        std::atomic<ISecureTransport::States> mTransportState { ISecureTransport::State_Pending };
-
-        UseMediaStreamTrackWeakPtr mTrack;
-
-        ParametersPtr mParameters;
-
-        RTPPacketPtr mInitPacket;
-
-        String mReceiveCodecPayloadName;
-        BYTE mReceiveCodecPayloadType;
-
-        rtc::scoped_ptr<webrtc::VideoReceiveStream> mReceiveStream;
-        ReceiverVideoRenderer mReceiverVideoRenderer;
-      };
-
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine::VideoSenderChannelResource
-      #pragma mark
-
-      class VideoSenderChannelResource : public IRTPMediaEngineVideoSenderChannelResource,
-                                         public ChannelResource,
-                                         public webrtc::BitrateObserver
-      {
-      public:
-        friend class RTPMediaEngine;
-
-        ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-        ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-        ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame);
-
-        union VideoEncoderSettings {
-          webrtc::VideoCodecVP8 mVp8;
-          webrtc::VideoCodecVP9 mVp9;
-          webrtc::VideoCodecH264 mH264;
-        };
-
-      public:
-        VideoSenderChannelResource(
-                                   const make_private &,
-                                   IRTPMediaEngineRegistrationPtr registration,
-                                   TransportPtr transport,
-                                   UseMediaStreamTrackPtr track,
-                                   ParametersPtr parameters
-                                   );
-        virtual ~VideoSenderChannelResource();
-
-        static VideoSenderChannelResourcePtr create(
-                                                    IRTPMediaEngineRegistrationPtr registration,
-                                                    TransportPtr transport,
-                                                    UseMediaStreamTrackPtr track,
-                                                    ParametersPtr parameters
-                                                    );
-
-      protected:
-        void init();
-
-      public:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoSenderChannelResource => IRTPMediaEngineChannelResource
-        #pragma mark
-
-        virtual PUID getID() const override {return ChannelResource::getID();}
-
-        virtual PromisePtr shutdown() override {return ChannelResource::shutdown();}
-
-        virtual void notifyTransportState(ISecureTransportTypes::States state) override { return ChannelResource::notifyTransportState(state); }
-
-        virtual void notifyUpdate(ParametersPtr params) override { return ChannelResource::notifyUpdate(params); }
-
-        virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override { return ChannelResource::requestStats(promise, stats); }
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoSenderChannelResource => IRTPMediaEngineChannelResourceAsyncDelegate
-        #pragma mark
-
-        virtual void onSecureTransportState(ISecureTransport::States state) override;
-
-        virtual void onUpdate(ParametersPtr params) override;
-
-        virtual void onProvideStats(PromiseWithStatsReportPtr promise, IStatsReportTypes::StatsTypeSet stats) override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoSenderChannelResource => IRTPMediaEngineVideoSenderChannelResource
-        #pragma mark
-
-        virtual bool handlePacket(const RTCPPacket &packet) override;
-        virtual void sendVideoFrame(VideoFramePtr videoFrame) override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoSenderChannelResource => IRTPMediaEngineHandlePacketAsyncDelegate
-        #pragma mark
-
-        virtual void onHandleRTPPacket(DWORD timestamp, SecureByteBlockPtr buffer) override {}
-        virtual void onHandleRTCPPacket(SecureByteBlockPtr buffer) override;
-        virtual void onSendVideoFrame(VideoFramePtr videoFrame) override;
-
-        //-----------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoSenderChannelResource => friend RTPMediaEngine
-        #pragma mark
-
-        virtual void stepSetup() override;
-        virtual void stepShutdown() override;
-
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPMediaEngine::VideoSenderChannelResource => webrtc::BitrateObserver
-        #pragma mark
-
-        virtual void OnNetworkChanged(uint32_t targetBitrateBps, uint8_t fractionLoss, int64_t rttMs) override;
-
-      protected:
-        TransportPtr mTransport;
-        std::atomic<ISecureTransport::States> mTransportState { ISecureTransport::State_Pending };
-
-        UseMediaStreamTrackWeakPtr mTrack;
-
-        ParametersPtr mParameters;
-
-        String mSendCodecPayloadName;
-        BYTE mSendCodecPayloadType {0};
-
-        rtc::scoped_ptr<webrtc::VideoSendStream> mSendStream;
-        VideoEncoderSettings mVideoEncoderSettings;
-      };
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPMediaEngine => (data)
-      #pragma mark
-
-      AutoPUID mID;
-      RTPMediaEngineWeakPtr mThisWeak;
-      RTPMediaEnginePtr mGracefulShutdownReference;
-
-      States mCurrentState {State_Pending};
-
-      WORD mLastError {};
-      String mLastErrorReason;
-
-      IRTPMediaEngineRegistrationWeakPtr mRegistration;
-      PromiseWithRTPMediaEngineList mPendingReady;
-
-      DeviceResourceWeakMap mDeviceResources;
-      DeviceResourceList mPendingSetupDeviceResources;
-      DeviceResourceList mPendingCloseDeviceResources;
-
-      ChannelResourceWeakMap mChannelResources;
-      ChannelResourceList mPendingSetupChannelResources;
-      ChannelResourceList mPendingCloseChannelResources;
-
-      rtc::scoped_refptr<webrtc::AudioState> mAudioState;
-      rtc::scoped_ptr<webrtc::VoiceEngine, VoiceEngineDeleter> mVoiceEngine;
-
-      rtc::scoped_ptr<WebRtcTraceCallback> mTraceCallback;
-      rtc::scoped_ptr<WebRtcLogSink> mLogSink;
-      rtc::TraceLog mTraceLog;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPMediaEngineFactory
-    #pragma mark
-
-    interaction IRTPMediaEngineFactory
-    {
-      static IRTPMediaEngineFactory &singleton();
-
-      virtual RTPMediaEnginePtr create(IRTPMediaEngineRegistrationPtr registration);
-    };
-
-    class RTPMediaEngineFactory : public IFactory<IRTPMediaEngineFactory> {};
-  }
-}
-
-ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPMediaEngineDeviceResourceAsyncDelegate)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::IStatsProviderTypes::PromiseWithStatsReportPtr, PromiseWithStatsReportPtr)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-ZS_DECLARE_PROXY_METHOD_2(onUpdateConstraints, PromisePtr, TrackConstraintsPtr)
-ZS_DECLARE_PROXY_METHOD_2(onProvideStats, PromiseWithStatsReportPtr, StatsTypeSet)
-ZS_DECLARE_PROXY_METHOD_1(onCapturedVideoFrame, VideoFramePtr)
-ZS_DECLARE_PROXY_END()
-
-ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPMediaEngineChannelResourceAsyncDelegate)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::ISecureTransport::States, States)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::IStatsProviderTypes::PromiseWithStatsReportPtr, PromiseWithStatsReportPtr)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-ZS_DECLARE_PROXY_METHOD_1(onSecureTransportState, States)
-ZS_DECLARE_PROXY_METHOD_1(onUpdate, ParametersPtr)
-ZS_DECLARE_PROXY_METHOD_2(onProvideStats, PromiseWithStatsReportPtr, StatsTypeSet)
-ZS_DECLARE_PROXY_METHOD_0(onSendDTMFTone)
-ZS_DECLARE_PROXY_END()
-
-ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPMediaEngineAsyncDelegate)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPMediaEngineAsyncDelegate::SetupSenderChannelPtr, SetupSenderChannelPtr)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPMediaEngineAsyncDelegate::SetupReceiverChannelPtr, SetupReceiverChannelPtr)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPMediaEngineAsyncDelegate::SetupDevicePtr, SetupDevicePtr)
-ZS_DECLARE_PROXY_METHOD_1(onSetupSenderChannel, SetupSenderChannelPtr)
-ZS_DECLARE_PROXY_METHOD_1(onSetupReceiverChannel, SetupReceiverChannelPtr)
-ZS_DECLARE_PROXY_METHOD_1(onSetupDevice, SetupDevicePtr)
-ZS_DECLARE_PROXY_END()
-
-ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPMediaEngineHandlePacketAsyncDelegate)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::services::SecureByteBlockPtr, SecureByteBlockPtr)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPMediaEngineHandlePacketAsyncDelegate::VideoFramePtr, VideoFramePtr)
-ZS_DECLARE_PROXY_METHOD_2(onHandleRTPPacket, DWORD, SecureByteBlockPtr)
-ZS_DECLARE_PROXY_METHOD_1(onHandleRTCPPacket, SecureByteBlockPtr)
-ZS_DECLARE_PROXY_METHOD_1(onSendVideoFrame, VideoFramePtr)
-ZS_DECLARE_PROXY_END()
diff --git a/ortc/internal/ortc_RTPPacket.h b/ortc/internal/ortc_RTPPacket.h
deleted file mode 100644
index 9b16846f..00000000
--- a/ortc/internal/ortc_RTPPacket.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
-
- Copyright (c) 2014, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#pragma once
-
-#include <ortc/internal/types.h>
-
-#include <ortc/IICETypes.h>
-
-namespace ortc
-{
-  namespace internal
-  {
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPPacket
-    #pragma mark
-
-    class RTPPacket
-    {
-    protected:
-      struct make_private {};
-
-    public:
-      struct HeaderExtension;
-      struct VideoOrientationHeaderExtension;
-      struct VideoOrientation6HeaderExtension;
-
-    public:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPPacket::CreationParams
-      #pragma mark
-
-      struct CreationParams
-      {
-        BYTE mVersion {2};
-        size_t mPadding {};
-        bool mM {};
-        BYTE mPT {};
-        WORD mSequenceNumber {};
-        DWORD mTimestamp {};
-        DWORD mSSRC {};
-
-        size_t mCC {};
-        DWORD *mCSRCList {};
-
-        const BYTE *mPayload {};
-        size_t mPayloadSize {};
-
-        HeaderExtension *mFirstHeaderExtension {};
-        BYTE mHeaderExtensionAppBits {};
-
-        size_t mHeaderExtensionPrepaddedSize {};
-        const BYTE *mHeaderExtensionStopParsePos {};
-        size_t mHeaderExtensionStopParseSize {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPPacket::Extension
-      #pragma mark
-
-      struct HeaderExtension
-      {
-        // see https://tools.ietf.org/html/rfc5285
-
-        BYTE mID {};
-
-        const BYTE *mData {};
-        size_t mDataSizeInBytes {};
-        size_t mPostPaddingSize {};
-
-        HeaderExtension *mNext {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPPacket::ClientToMixerExtension
-      #pragma mark
-
-      struct ClientToMixerExtension : public HeaderExtension
-      {
-        // see https://tools.ietf.org/html/rfc6464
-
-        ClientToMixerExtension(const HeaderExtension &header);
-        ClientToMixerExtension(
-                               BYTE id,
-                               bool voiceActivity,
-                               BYTE level
-                               );
-
-        bool voiceActivity() const;
-        BYTE level() const;
-
-      public:
-        BYTE mLevelBuffer {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPPacket::MixerToClientExtension
-      #pragma mark
-
-      struct MixerToClientExtension : public HeaderExtension
-      {
-        // see https://tools.ietf.org/html/rfc6464
-
-        static const size_t kMaxLevelCount {0xF};
-
-        MixerToClientExtension(const HeaderExtension &header);
-        MixerToClientExtension(
-                               BYTE id,
-                               BYTE *levels,
-                               size_t count
-                               );
-
-        size_t levelsCount() const;
-
-        BYTE unusedBit(size_t index) const;
-        BYTE level(size_t index) const;
-
-      public:
-        BYTE mLevelBuffer[kMaxLevelCount] {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPPacket::StringHeaderExtension
-      #pragma mark
-
-      struct StringHeaderExtension : public HeaderExtension
-      {
-        static const size_t kMaxStringLength {0xFF};
-
-        StringHeaderExtension(const HeaderExtension &header);
-        StringHeaderExtension(
-                              BYTE id,
-                              const char *str
-                              );
-
-        const char *str() const;
-
-        ElementPtr toDebug() const;
-
-      public:
-        BYTE mStringBuffer[kMaxStringLength+sizeof(char)] {};
-      };
-      
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPPacket::NumberHeaderExtension
-      #pragma mark
-
-      struct NumberHeaderExtension : public HeaderExtension
-      {
-        static const size_t kMaxNumberByteLength {0xFF};
-
-        NumberHeaderExtension(const HeaderExtension &header);
-        NumberHeaderExtension(
-                              BYTE id,
-                              const BYTE *number,
-                              size_t lengthInBytes
-                              );
-        NumberHeaderExtension(
-                              BYTE id,
-                              const char *valueInBase10
-                              );
-
-        const BYTE *number() const;
-        size_t length() const;
-
-        String str() const;
-
-        ElementPtr toDebug() const;
-
-      public:
-        BYTE mNumberBuffer[kMaxNumberByteLength] {};
-      };
-      
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPPacket::MidHeaderExtension
-      #pragma mark
-
-      struct MidHeaderExtension : public StringHeaderExtension
-      {
-        // https://tools.ietf.org/html/draft-ietf-mmusic-sdp-bundle-negotiation-23#section-14.3
-
-        static const size_t kMaxMidLength = kMaxStringLength;
-
-        MidHeaderExtension(const HeaderExtension &header) : StringHeaderExtension(header) {}
-        MidHeaderExtension(
-                         BYTE id,
-                         const char *mid
-                         ) :                              StringHeaderExtension(id, mid) {}
-
-        const char *mid() const {return str();}
-
-        ElementPtr toDebug() const;
-
-      public:
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPPacket::RidHeaderExtension
-      #pragma mark
-
-      struct RidHeaderExtension : public StringHeaderExtension
-      {
-        // https://tools.ietf.org/html/draft-pthatcher-mmusic-rid-00
-
-        static const size_t kMaxMidLength = kMaxStringLength;
-
-        RidHeaderExtension(const HeaderExtension &header) : StringHeaderExtension(header) {}
-        RidHeaderExtension(
-                           BYTE id,
-                           const char *rid
-                           ) :                              StringHeaderExtension(id, rid) {}
-
-        const char *rid() const {return str();}
-
-        ElementPtr toDebug() const;
-
-      public:
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPPacket::VideoOrientationHeaderExtension
-      #pragma mark
-
-      struct VideoOrientationHeaderExtension : public HeaderExtension
-      {
-        struct Clockwise {};
-        struct CounterClockwise {};
-
-        VideoOrientationHeaderExtension(const HeaderExtension &header);
-        VideoOrientationHeaderExtension(const VideoOrientation6HeaderExtension &);
-        VideoOrientationHeaderExtension(
-                                        const Clockwise &,
-                                        bool frontFacingCamera, // true = front facing, false = backfacing
-                                        bool flip, // horizontal left-right flip (mirro)
-                                        UINT orientation
-                                        );
-        VideoOrientationHeaderExtension(
-                                        const CounterClockwise &,
-                                        bool frontFacingCamera, // true = front facing, false = backfacing
-                                        bool flip, // horizontal left-right flip (mirro)
-                                        UINT orientation
-                                        );
-
-        bool frontFacing() const;
-        bool backFacing() const;
-        bool flip() const;
-        UINT degreesClockwise() const;
-        UINT degreesCounterClockwise() const;
-
-        ElementPtr toDebug() const;
-
-      public:
-        BYTE mEncoded[1] {};
-      };
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPPacket::VideoOrientationHeaderExtension
-      #pragma mark
-
-      struct VideoOrientation6HeaderExtension : public VideoOrientationHeaderExtension
-      {
-        VideoOrientation6HeaderExtension(const HeaderExtension &header);
-        VideoOrientation6HeaderExtension(
-                                         const Clockwise &,
-                                         bool frontFacingCamera, // true = front facing, false = backfacing
-                                         bool flip, // horizontal left-right flip (mirro)
-                                         UINT orientation
-                                         );
-        VideoOrientation6HeaderExtension(
-                                         const CounterClockwise &,
-                                         bool frontFacingCamera, // true = front facing, false = backfacing
-                                         bool flip, // horizontal left-right flip (mirro)
-                                         UINT orientation
-                                         );
-
-        UINT degreesClockwise() const;
-        UINT degreesCounterClockwise() const;
-
-        ElementPtr toDebug() const;
-
-      public:
-      };
-
-    public:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark (public)
-      #pragma mark
-
-      RTPPacket(const make_private &);
-      ~RTPPacket();
-
-      static RTPPacketPtr create(const RTPPacket &packet);
-      static RTPPacketPtr create(const CreationParams &params);
-      static RTPPacketPtr create(const BYTE *buffer, size_t bufferLengthInBytes);
-      static RTPPacketPtr create(const SecureByteBlock &buffer);
-      static RTPPacketPtr create(SecureByteBlockPtr buffer);  // NOTE: ownership of buffer is taken
-
-      const BYTE *ptr() const;
-      size_t size() const;
-      SecureByteBlockPtr buffer() const;
-
-      BYTE version() const {return mVersion;}
-      size_t padding() const {return mPadding;}
-      size_t cc() const {return static_cast<size_t>(mCC);}
-      bool m() const {return mM;}
-      BYTE pt() const {return mPT;}
-      WORD sequenceNumber() const {return mSequenceNumber;}
-      DWORD timestamp() const {return mTimestamp;}
-      DWORD ssrc() const {return mSSRC;}
-
-      size_t headerSize() {return mHeaderSize;}
-      size_t headerExtensionSize() {return mHeaderExtensionSize;}
-      size_t payloadSize() {return mPayloadSize;}
-
-      DWORD getCSRC(size_t index) const;
-      const BYTE *payload() const;
-      size_t payloadSize() const {return mPayloadSize;}
-
-      size_t totalHeaderExtensions() const {return mTotalHeaderExtensions;}
-      HeaderExtension *firstHeaderExtension() const {return mHeaderExtensions;}
-      HeaderExtension *getHeaderExtensionAtIndex(size_t index) const;
-      BYTE headerExtensionAppBits() const {return mHeaderExtensionAppBits;}
-
-      size_t headerExtensionPrepaddedSize() const {return mHeaderExtensionPrepaddedSize;}
-      const BYTE *headerExtensionParseStopped() const {return mHeaderExtensionParseStoppedPos;}
-      size_t headerExtensionParseStoppedSize() const {return mHeaderExtensionParseStoppedSize;}
-
-      void changeHeaderExtensions(HeaderExtension *firstExtension);
-
-      ElementPtr toDebug() const;
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark (internal)
-      #pragma mark
-
-      static Log::Params slog(const char *message);
-      Log::Params log(const char *message) const;
-      Log::Params debug(const char *message) const;
-
-      bool parse();
-
-      void writeHeaderExtensions(
-                                 HeaderExtension *firstExtension,
-                                 bool twoByteHeader
-                                 );
-      void generate(const RTPPacket &params);
-      void generate(const CreationParams &params);
-
-    public:
-      SecureByteBlockPtr mBuffer;
-
-      BYTE mVersion {};
-      size_t mPadding {};
-      BYTE mCC {};
-      bool mM {};
-      BYTE mPT {};
-      WORD mSequenceNumber {};
-      DWORD mTimestamp {};
-      DWORD mSSRC {};
-
-      size_t mHeaderSize {};
-      size_t mHeaderExtensionSize {};
-      size_t mPayloadSize {};
-
-      size_t mTotalHeaderExtensions {};
-      HeaderExtension *mHeaderExtensions {};
-      BYTE mHeaderExtensionAppBits {};
-
-      size_t mHeaderExtensionPrepaddedSize {};
-      const BYTE *mHeaderExtensionParseStoppedPos {};
-      size_t mHeaderExtensionParseStoppedSize {};
-    };
-
-  }
-}
-
diff --git a/ortc/internal/ortc_RTPReceiver.h b/ortc/internal/ortc_RTPReceiver.h
index de3158b7..0cb8b69e 100644
--- a/ortc/internal/ortc_RTPReceiver.h
+++ b/ortc/internal/ortc_RTPReceiver.h
@@ -410,7 +410,7 @@ namespace ortc
       #pragma mark RTPReceiver => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -426,27 +426,27 @@ namespace ortc
                                    IRTCPTransportPtr rtcpTransport = IRTCPTransportPtr()
                                    );
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual IRTPReceiverSubscriptionPtr subscribe(IRTPReceiverDelegatePtr delegate) override;
+      IRTPReceiverSubscriptionPtr subscribe(IRTPReceiverDelegatePtr delegate) override;
 
-      virtual IMediaStreamTrackPtr track() const override;
-      virtual IRTPTransportPtr transport() const override;
-      virtual IRTCPTransportPtr rtcpTransport() const override;
+      ortc::IMediaStreamTrackPtr track() const override;
+      IRTPTransportPtr transport() const override;
+      IRTCPTransportPtr rtcpTransport() const override;
 
-      virtual void setTransport(
-                                IRTPTransportPtr transport,
-                                IRTCPTransportPtr rtcpTransport = IRTCPTransportPtr()
-                                ) override;
+      void setTransport(
+                        IRTPTransportPtr transport,
+                        IRTCPTransportPtr rtcpTransport = IRTCPTransportPtr()
+                        ) override;
 
       static CapabilitiesPtr getCapabilities(Optional<Kinds> kind);
 
-      virtual PromisePtr receive(const Parameters &parameters) override;
-      virtual void stop() override;
+      PromisePtr receive(const Parameters &parameters) override;
+      void stop() override;
 
-      virtual ContributingSourceList getContributingSources() const override;
+      ContributingSourceList getContributingSources() const override;
 
-      virtual void requestSendCSRC(SSRCType csrc) override;
+      void requestSendCSRC(SSRCType csrc) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -457,15 +457,15 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual bool handlePacket(
-                                IICETypes::Components viaTransport,
-                                RTPPacketPtr packet
-                                ) override;
+      bool handlePacket(
+                        IICETypes::Components viaTransport,
+                        RTPPacketPtr packet
+                        ) override;
 
-      virtual bool handlePacket(
-                                IICETypes::Components viaTransport,
-                                RTCPPacketPtr packet
-                                ) override;
+      bool handlePacket(
+                        IICETypes::Components viaTransport,
+                        RTCPPacketPtr packet
+                        ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -476,7 +476,7 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual bool sendPacket(RTCPPacketPtr packet) override;
+      bool sendPacket(RTCPPacketPtr packet) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -492,24 +492,24 @@ namespace ortc
       #pragma mark RTPReceiver => ISecureTransportDelegate
       #pragma mark
 
-      virtual void onSecureTransportStateChanged(
-                                                 ISecureTransportPtr transport,
-                                                 ISecureTransport::States state
-                                                 ) override;
+      void onSecureTransportStateChanged(
+                                         ISecureTransportPtr transport,
+                                         ISecureTransport::States state
+                                         ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPReceiver => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPReceiver => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
diff --git a/ortc/internal/ortc_RTPReceiverChannel.h b/ortc/internal/ortc_RTPReceiverChannel.h
index 2f475497..9bcd08d5 100644
--- a/ortc/internal/ortc_RTPReceiverChannel.h
+++ b/ortc/internal/ortc_RTPReceiverChannel.h
@@ -33,6 +33,7 @@
 
 #include <ortc/internal/types.h>
 #include <ortc/internal/ortc_ISecureTransport.h>
+#include <ortc/internal/ortc_IMediaStreamTrack.h>
 
 #include <ortc/IICETransport.h>
 #include <ortc/IDTLSTransport.h>
@@ -52,15 +53,8 @@ namespace ortc
   {
     ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelForRTPReceiver);
     ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelForMediaStreamTrack);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelForRTPReceiverChannelMediaBase);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelForRTPReceiverChannelAudio);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelForRTPReceiverChannelVideo);
 
     ZS_DECLARE_INTERACTION_PTR(IRTPReceiverForRTPReceiverChannel);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelMediaBaseForRTPReceiverChannel);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelAudioForRTPReceiverChannel);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelVideoForRTPReceiverChannel);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiverChannel);
 
     ZS_DECLARE_INTERACTION_PROXY(IRTPReceiverChannelAsyncDelegate);
 
@@ -236,10 +230,6 @@ namespace ortc
       ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverForRTPReceiverChannel, UseReceiver)
       ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiverChannel, UseMediaStreamTrack)
 
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForRTPReceiverChannel, UseMediaBase)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelAudioForRTPReceiverChannel, UseAudio)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelVideoForRTPReceiverChannel, UseVideo)
-
       ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
       typedef std::list<RTCPPacketPtr> RTCPPacketList;
       ZS_DECLARE_PTR(RTCPPacketList)
@@ -295,21 +285,21 @@ namespace ortc
                                           const RTCPPacketList &packets
                                           );
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual void notifyTransportState(ISecureTransportTypes::States state) override;
+      void notifyTransportState(ISecureTransportTypes::States state) override;
 
-      virtual void notifyPacket(RTPPacketPtr packet) override;
+      void notifyPacket(RTPPacketPtr packet) override;
 
-      virtual void notifyPackets(RTCPPacketListPtr packets) override;
+      void notifyPackets(RTCPPacketListPtr packets) override;
 
-      virtual void notifyUpdate(const Parameters &params) override;
+      void notifyUpdate(const Parameters &params) override;
 
-      virtual bool handlePacket(RTPPacketPtr packet) override;
+      bool handlePacket(RTPPacketPtr packet) override;
 
-      virtual bool handlePacket(RTCPPacketPtr packet) override;
+      bool handlePacket(RTCPPacketPtr packet) override;
 
-      virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override;
+      void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -320,12 +310,12 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual int32_t getAudioSamples(
-                                      const size_t numberOfSamples,
-                                      const uint8_t numberOfChannels,
-                                      void *audioSamples,
-                                      size_t& numberOfSamplesOut
-                                      ) override;
+      int32_t getAudioSamples(
+                              const size_t numberOfSamples,
+                              const uint8_t numberOfChannels,
+                              void *audioSamples,
+                              size_t& numberOfSamplesOut
+                              ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -334,7 +324,7 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual bool sendPacket(RTCPPacketPtr packet) override;
+      bool sendPacket(RTCPPacketPtr packet) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -351,27 +341,27 @@ namespace ortc
       #pragma mark RTPReceiverChannel => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPReceiverChannel => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPReceiverChannel => IRTPReceiverChannelAsyncDelegate
       #pragma mark
 
-      virtual void onSecureTransportState(ISecureTransport::States state) override;
+      void onSecureTransportState(ISecureTransport::States state) override;
 
-      virtual void onNotifyPacket(RTPPacketPtr packet) override;
+      void onNotifyPacket(RTPPacketPtr packet) override;
 
-      virtual void onNotifyPackets(RTCPPacketListPtr packets) override;
+      void onNotifyPackets(RTCPPacketListPtr packets) override;
 
-      virtual void onUpdate(ParametersPtr params) override;
+      void onUpdate(ParametersPtr params) override;
 
     protected:
       //-----------------------------------------------------------------------
@@ -419,10 +409,12 @@ namespace ortc
       Optional<IMediaStreamTrackTypes::Kinds> mKind;
       UseMediaStreamTrackPtr mTrack;
 
-      // NO lockk is needed:
+      // NO lock is needed:
+#if 0
       UseMediaBasePtr mMediaBase; // valid
       UseAudioPtr mAudio; // either
       UseVideoPtr mVideo; // or valid
+#endif //0
     };
 
     //-------------------------------------------------------------------------
@@ -455,7 +447,7 @@ namespace ortc
 ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPReceiverChannelAsyncDelegate)
 ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::ISecureTransport::States, States)
 ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPReceiverChannelAsyncDelegate::RTCPPacketListPtr, RTCPPacketListPtr)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::RTPPacketPtr, RTPPacketPtr)
+ZS_DECLARE_PROXY_TYPEDEF(ortc::RTPPacketPtr, RTPPacketPtr)
 ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::IRTPReceiverChannelAsyncDelegate::ParametersPtr, ParametersPtr)
 ZS_DECLARE_PROXY_METHOD_1(onSecureTransportState, States)
 ZS_DECLARE_PROXY_METHOD_1(onNotifyPacket, RTPPacketPtr)
diff --git a/ortc/internal/ortc_RTPReceiverChannelAudio.h b/ortc/internal/ortc_RTPReceiverChannelAudio.h
deleted file mode 100644
index 4b271e87..00000000
--- a/ortc/internal/ortc_RTPReceiverChannelAudio.h
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#pragma once
-
-#include <ortc/internal/types.h>
-#include <ortc/internal/ortc_ISecureTransport.h>
-#include <ortc/internal/ortc_RTPReceiverChannelMediaBase.h>
-#include <ortc/internal/ortc_RTPMediaEngine.h>
-
-#include <ortc/IICETransport.h>
-#include <ortc/IDTLSTransport.h>
-#include <ortc/IRTPTypes.h>
-#include <ortc/IMediaStreamTrack.h>
-
-#include <zsLib/MessageQueueAssociator.h>
-#include <zsLib/ITimer.h>
-#include <zsLib/Event.h>
-
-#include <webrtc/transport.h>
-
-#include <queue>
-
-//#define ORTC_SETTING_SCTP_TRANSPORT_MAX_MESSAGE_SIZE "ortc/sctp/max-message-size"
-
-namespace ortc
-{
-  namespace internal
-  {
-    ZS_DECLARE_USING_PTR(zsLib, Event)
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelAudioForRTPReceiverChannel);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelAudioForMediaStreamTrack);
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelAudioForRTPMediaEngine);
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelForRTPReceiverChannelAudio);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiverChannelAudio);
-
-    ZS_DECLARE_INTERACTION_PROXY(IRTPReceiverChannelAudioAsyncDelegate);
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelAudioForRTPReceiverChannel
-    #pragma mark
-
-    interaction IRTPReceiverChannelAudioForRTPReceiverChannel : public IRTPReceiverChannelMediaBaseForRTPReceiverChannel
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelAudioForRTPReceiverChannel, ForRTPReceiverChannel)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static ElementPtr toDebug(ForRTPReceiverChannelPtr object);
-
-      static RTPReceiverChannelAudioPtr create(
-                                               RTPReceiverChannelPtr receiver,
-                                               MediaStreamTrackPtr track,
-                                               const Parameters &params
-                                               );
-
-      virtual int32_t getAudioSamples(
-                                      const size_t numberOfSamples,
-                                      const uint8_t numberOfChannels,
-                                      void *audioSamples,
-                                      size_t& numberOfSamplesOut
-                                      ) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelAudioForMediaStreamTrack
-    #pragma mark
-
-    interaction IRTPReceiverChannelAudioForMediaStreamTrack : public IRTPReceiverChannelMediaBaseForMediaStreamTrack
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelAudioForMediaStreamTrack, ForMediaStreamTrack)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static ElementPtr toDebug(ForMediaStreamTrackPtr object);
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelAudioForRTPMediaEngine
-    #pragma mark
-
-    interaction IRTPReceiverChannelAudioForRTPMediaEngine : public IRTPReceiverChannelMediaBaseForRTPMediaEngine
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelAudioForRTPMediaEngine, ForRTPMediaEngine)
-
-      static ElementPtr toDebug(ForRTPMediaEnginePtr object);
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelAudioAsyncDelegate
-    #pragma mark
-
-    interaction IRTPReceiverChannelAudioAsyncDelegate
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      virtual void onReceiverChannelAudioDeliverPackets() = 0;
-      virtual void onSecureTransportState(ISecureTransport::States state) = 0;
-      virtual void onUpdate(ParametersPtr params) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelAudio
-    #pragma mark
-    
-    class RTPReceiverChannelAudio : public Noop,
-                                    public MessageQueueAssociator,
-                                    public SharedRecursiveLock,
-                                    public IRTPReceiverChannelAudioForRTPReceiverChannel,
-                                    public IRTPReceiverChannelAudioForMediaStreamTrack,
-                                    public IRTPReceiverChannelAudioForRTPMediaEngine,
-                                    public IWakeDelegate,
-                                    public zsLib::ITimerDelegate,
-                                    public zsLib::IPromiseSettledDelegate,
-                                    public IRTPReceiverChannelAudioAsyncDelegate
-    {
-    protected:
-      struct make_private {};
-
-    public:
-      friend interaction IRTPReceiverChannelAudio;
-      friend interaction IRTPReceiverChannelAudioFactory;
-      friend interaction IRTPReceiverChannelMediaBaseForRTPReceiverChannel;
-      friend interaction IRTPReceiverChannelAudioForRTPReceiverChannel;
-      friend interaction IRTPReceiverChannelMediaBaseForMediaStreamTrack;
-      friend interaction IRTPReceiverChannelAudioForMediaStreamTrack;
-      friend interaction IRTPReceiverChannelAudioForRTPMediaEngine;
-
-      ZS_DECLARE_CLASS_PTR(Transport)
-      friend class Transport;
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelForRTPReceiverChannelAudio, UseChannel)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiverChannelAudio, UseMediaStreamTrack)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPReceiverChannelAudio, UseMediaEngine)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineDeviceResource, UseDeviceResource)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineAudioReceiverChannelResource, UseChannelResource)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForRTPReceiverChannel, ForReceiverChannelFromMediaBase)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForMediaStreamTrack, ForMediaStreamTrackFromMediaBase)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-      typedef std::list<RTCPPacketPtr> RTCPPacketList;
-      ZS_DECLARE_PTR(RTCPPacketList)
-      typedef std::queue<RTPPacketPtr> RTPPacketQueue;
-      typedef std::queue<RTCPPacketPtr> RTCPPacketQueue;
-
-      enum States
-      {
-        State_Pending,
-        State_Ready,
-        State_ShuttingDown,
-        State_Shutdown,
-      };
-      static const char *toString(States state);
-
-      struct VoiceEngineDeleter {
-        VoiceEngineDeleter() {}
-        inline void operator()(webrtc::VoiceEngine* ptr) const {
-          webrtc::VoiceEngine::Delete(ptr);
-        }
-      };
-
-    public:
-      RTPReceiverChannelAudio(
-                              const make_private &,
-                              IMessageQueuePtr queue,
-                              UseChannelPtr receiverChannel,
-                              UseMediaStreamTrackPtr track,
-                              const Parameters &params
-                              );
-
-    protected:
-      RTPReceiverChannelAudio(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
-        Noop(true),
-        MessageQueueAssociator(queue),
-        SharedRecursiveLock(SharedRecursiveLock::create())
-      {}
-
-      void init();
-
-    public:
-      virtual ~RTPReceiverChannelAudio();
-
-      static RTPReceiverChannelAudioPtr convert(ForReceiverChannelFromMediaBasePtr object);
-      static RTPReceiverChannelAudioPtr convert(ForRTPReceiverChannelPtr object);
-      static RTPReceiverChannelAudioPtr convert(ForMediaStreamTrackFromMediaBasePtr object);
-      static RTPReceiverChannelAudioPtr convert(ForMediaStreamTrackPtr object);
-      static RTPReceiverChannelAudioPtr convert(ForRTPMediaEnginePtr object);
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => IRTPReceiverChannelMediaBaseForRTPReceiverChannel
-      #pragma mark
-
-      virtual PUID getID() const override {return mID;}
-
-      virtual void notifyTransportState(ISecureTransportTypes::States state) override;
-
-      virtual void notifyUpdate(ParametersPtr params) override;
-
-      virtual bool handlePacket(RTPPacketPtr packet) override;
-
-      virtual bool handlePacket(RTCPPacketPtr packet) override;
-
-      virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => IRTPReceiverChannelAudioForRTPReceiverChannel
-      #pragma mark
-
-      static RTPReceiverChannelAudioPtr create(
-                                               RTPReceiverChannelPtr receiver,
-                                               MediaStreamTrackPtr track,
-                                               const Parameters &params
-                                               );
-
-      virtual int32_t getAudioSamples(
-                                      const size_t numberOfSamples,
-                                      const uint8_t numberOfChannels,
-                                      void *audioSamples,
-                                      size_t& numberOfSamplesOut
-                                      ) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => IRTPReceiverChannelAudioForMediaStreamTrack
-      #pragma mark
-
-      // (duplicate) static ElementPtr toDebug(ForMediaStreamTrackPtr object);
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => IRTPReceiverChannelMediaBaseForRTPMediaEngine
-      #pragma mark
-
-      // (duplicate) static ElementPtr toDebug(ForRTPMediaEnginePtr object);
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => IWakeDelegate
-      #pragma mark
-
-      virtual void onWake() override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => ITimerDelegate
-      #pragma mark
-
-      virtual void onTimer(ITimerPtr timer) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => IPromiseSettledDelegate
-      #pragma mark
-
-      virtual void onPromiseSettled(PromisePtr promise) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => IRTPReceiverChannelAudioAsyncDelegate
-      #pragma mark
-
-      virtual void onReceiverChannelAudioDeliverPackets() override;
-
-      virtual void onSecureTransportState(ISecureTransport::States state) override;
-
-      virtual void onUpdate(ParametersPtr params) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => friend Transport
-      #pragma mark
-      
-      virtual bool SendRtcp(const uint8_t* packet, size_t length);
-      
-    public:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio::Transport
-      #pragma mark
-
-      class Transport : public webrtc::Transport
-      {
-        struct make_private {};
-
-      protected:
-        void init();
-        
-      public:
-        Transport(
-                  const make_private &,
-                  RTPReceiverChannelAudioPtr outer
-                  );
-        
-        ~Transport();
-        
-        static TransportPtr create(RTPReceiverChannelAudioPtr outer);
-        
-      public:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPReceiverChannelAudio::Transport => webrtc::Transport
-        #pragma mark
-
-        virtual bool SendRtp(
-                             const uint8_t* packet,
-                             size_t length,
-                             const webrtc::PacketOptions& options
-                             ) override;
-
-        virtual bool SendRtcp(const uint8_t* packet, size_t length) override;
-
-      private:
-        TransportWeakPtr mThisWeak;
-        RTPReceiverChannelAudioWeakPtr mOuter;
-      };
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => (internal)
-      #pragma mark
-
-      Log::Params log(const char *message) const;
-      Log::Params debug(const char *message) const;
-      virtual ElementPtr toDebug() const;
-
-      bool isShuttingDown() const;
-      bool isShutdown() const;
-
-      void step();
-      bool stepChannelPromise();
-      bool stepSetupChannel();
-
-      void cancel();
-
-      void setState(States state);
-      void setError(WORD error, const char *reason = NULL);
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => (data)
-      #pragma mark
-
-      AutoPUID mID;
-      RTPReceiverChannelAudioWeakPtr mThisWeak;
-      RTPReceiverChannelAudioPtr mGracefulShutdownReference;
-
-      States mCurrentState {State_Pending};
-
-      WORD mLastError {};
-      String mLastErrorReason;
-
-      UseChannelWeakPtr mReceiverChannel;
-
-      ParametersPtr mParameters;
-
-      PromiseWithRTPMediaEngineChannelResourcePtr mChannelResourceLifetimeHolderPromise;
-      UseChannelResourcePtr mChannelResource;
-
-      PromisePtr mCloseChannelPromise;
-
-      Optional<IMediaStreamTrackTypes::Kinds> mKind;
-      UseMediaStreamTrackPtr mTrack;
-
-      TransportPtr mTransport;  // allow lifetime of callback to exist separate from "this" object
-      std::atomic<ISecureTransport::States> mTransportState { ISecureTransport::State_Pending };
-
-      RTPPacketQueue mQueuedRTP;
-      RTCPPacketQueue mQueuedRTCP;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelAudioFactory
-    #pragma mark
-
-    interaction IRTPReceiverChannelAudioFactory
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static IRTPReceiverChannelAudioFactory &singleton();
-
-      virtual RTPReceiverChannelAudioPtr create(
-                                                RTPReceiverChannelPtr receiverChannel,
-                                                MediaStreamTrackPtr track,
-                                                const Parameters &params
-                                                );
-    };
-
-    class RTPReceiverChannelAudioFactory : public IFactory<IRTPReceiverChannelAudioFactory> {};
-  }
-}
-
-ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPReceiverChannelAudioAsyncDelegate)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::ISecureTransport::States, States)
-ZS_DECLARE_PROXY_METHOD_0(onReceiverChannelAudioDeliverPackets)
-ZS_DECLARE_PROXY_METHOD_1(onSecureTransportState, States)
-ZS_DECLARE_PROXY_METHOD_1(onUpdate, ParametersPtr)
-ZS_DECLARE_PROXY_END()
diff --git a/ortc/internal/ortc_RTPReceiverChannelVideo.h b/ortc/internal/ortc_RTPReceiverChannelVideo.h
deleted file mode 100644
index f458f809..00000000
--- a/ortc/internal/ortc_RTPReceiverChannelVideo.h
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#pragma once
-
-#include <ortc/internal/types.h>
-#include <ortc/internal/ortc_ISecureTransport.h>
-#include <ortc/internal/ortc_RTPReceiverChannelMediaBase.h>
-#include <ortc/internal/ortc_RTPMediaEngine.h>
-
-#include <ortc/IICETransport.h>
-#include <ortc/IDTLSTransport.h>
-#include <ortc/IRTPTypes.h>
-#include <ortc/IMediaStreamTrack.h>
-
-#include <zsLib/MessageQueueAssociator.h>
-#include <zsLib/ITimer.h>
-#include <zsLib/Event.h>
-
-#include <webrtc/transport.h>
-
-#include <queue>
-
-//#define ORTC_SETTING_SCTP_TRANSPORT_MAX_MESSAGE_SIZE "ortc/sctp/max-message-size"
-
-namespace ortc
-{
-  namespace internal
-  {
-    ZS_DECLARE_USING_PTR(zsLib, Event)
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelVideoForSettings)
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelVideoForRTPReceiverChannel)
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelVideoForMediaStreamTrack)
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelVideoForRTPMediaEngine)
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPReceiverChannelForRTPReceiverChannelVideo)
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPReceiverChannelVideo)
-
-    ZS_DECLARE_INTERACTION_PROXY(IRTPReceiverChannelVideoAsyncDelegate)
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelVideoForSettings
-    #pragma mark
-
-    interaction IRTPReceiverChannelVideoForSettings
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelVideoForSettings, ForSettings)
-
-      static void applyDefaults();
-
-      virtual ~IRTPReceiverChannelVideoForSettings() {}
-    };
-    
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelVideoForRTPReceiverChannel
-    #pragma mark
-
-    interaction IRTPReceiverChannelVideoForRTPReceiverChannel : public IRTPReceiverChannelMediaBaseForRTPReceiverChannel
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelVideoForRTPReceiverChannel, ForRTPReceiverChannel)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static ElementPtr toDebug(ForRTPReceiverChannelPtr object);
-
-      static RTPReceiverChannelVideoPtr create(
-                                               RTPReceiverChannelPtr receiver,
-                                               MediaStreamTrackPtr track,
-                                               const Parameters &params
-                                               );
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelVideoForMediaStreamTrack
-    #pragma mark
-
-    interaction IRTPReceiverChannelVideoForMediaStreamTrack : public IRTPReceiverChannelMediaBaseForMediaStreamTrack
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelVideoForMediaStreamTrack, ForMediaStreamTrack)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static ElementPtr toDebug(ForMediaStreamTrackPtr object);
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelAudioForRTPMediaEngine
-    #pragma mark
-
-    interaction IRTPReceiverChannelVideoForRTPMediaEngine : public IRTPReceiverChannelMediaBaseForRTPMediaEngine
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelVideoForRTPMediaEngine, ForRTPMediaEngine)
-
-      static ElementPtr toDebug(ForRTPMediaEnginePtr object);
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelVideoAsyncDelegate
-    #pragma mark
-
-    interaction IRTPReceiverChannelVideoAsyncDelegate
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      virtual void onReceiverChannelVideoDeliverPackets() = 0;
-      virtual void onSecureTransportState(ISecureTransport::States state) = 0;
-      virtual void onUpdate(ParametersPtr params) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPReceiverChannelVideo
-    #pragma mark
-    
-    class RTPReceiverChannelVideo : public Noop,
-                                    public MessageQueueAssociator,
-                                    public SharedRecursiveLock,
-                                    public IRTPReceiverChannelVideoForSettings,
-                                    public IRTPReceiverChannelVideoForRTPReceiverChannel,
-                                    public IRTPReceiverChannelVideoForMediaStreamTrack,
-                                    public IRTPReceiverChannelVideoForRTPMediaEngine,
-                                    public IWakeDelegate,
-                                    public zsLib::ITimerDelegate,
-                                    public zsLib::IPromiseSettledDelegate,
-                                    public IRTPReceiverChannelVideoAsyncDelegate
-    {
-    protected:
-      struct make_private {};
-
-    public:
-      friend interaction IRTPReceiverChannelVideo;
-      friend interaction IRTPReceiverChannelVideoFactory;
-      friend interaction IRTPReceiverChannelVideoForSettings;
-      friend interaction IRTPReceiverChannelMediaBaseForRTPReceiverChannel;
-      friend interaction IRTPReceiverChannelVideoForRTPReceiverChannel;
-      friend interaction IRTPReceiverChannelMediaBaseForMediaStreamTrack;
-      friend interaction IRTPReceiverChannelVideoForMediaStreamTrack;
-      friend interaction IRTPReceiverChannelVideoForRTPMediaEngine;
-
-      ZS_DECLARE_CLASS_PTR(Transport)
-      friend class Transport;
-      
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelForRTPReceiverChannelVideo, UseChannel)
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPReceiverChannelVideo, UseMediaStreamTrack)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPReceiverChannelVideo, UseMediaEngine)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineDeviceResource, UseDeviceResource)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineVideoReceiverChannelResource, UseChannelResource)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForRTPReceiverChannel, ForReceiverChannelFromMediaBase)
-      ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverChannelMediaBaseForMediaStreamTrack, ForMediaStreamTrackFromMediaBase)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-      typedef std::list<RTCPPacketPtr> RTCPPacketList;
-      ZS_DECLARE_PTR(RTCPPacketList)
-      typedef std::queue<RTPPacketPtr> RTPPacketQueue;
-      typedef std::queue<RTCPPacketPtr> RTCPPacketQueue;
-
-      enum States
-      {
-        State_Pending,
-        State_Ready,
-        State_ShuttingDown,
-        State_Shutdown,
-      };
-      static const char *toString(States state);
-
-    public:
-      RTPReceiverChannelVideo(
-                              const make_private &,
-                              IMessageQueuePtr queue,
-                              UseChannelPtr receiverChannel,
-                              UseMediaStreamTrackPtr track,
-                              const Parameters &params
-                              );
-
-    protected:
-      RTPReceiverChannelVideo(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
-        Noop(true),
-        MessageQueueAssociator(queue),
-        SharedRecursiveLock(SharedRecursiveLock::create())
-      {}
-
-      void init();
-
-    public:
-      virtual ~RTPReceiverChannelVideo();
-
-      static RTPReceiverChannelVideoPtr convert(ForSettingsPtr object);
-      static RTPReceiverChannelVideoPtr convert(ForReceiverChannelFromMediaBasePtr object);
-      static RTPReceiverChannelVideoPtr convert(ForRTPReceiverChannelPtr object);
-      static RTPReceiverChannelVideoPtr convert(ForMediaStreamTrackFromMediaBasePtr object);
-      static RTPReceiverChannelVideoPtr convert(ForMediaStreamTrackPtr object);
-      static RTPReceiverChannelVideoPtr convert(ForRTPMediaEnginePtr object);
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => IRTPReceiverChannelMediaBaseForRTPReceiverChannel
-      #pragma mark
-
-      virtual PUID getID() const override {return mID;}
-
-      virtual void notifyTransportState(ISecureTransportTypes::States state) override;
-
-      virtual void notifyUpdate(ParametersPtr params) override;
-
-      virtual bool handlePacket(RTPPacketPtr packet) override;
-
-      virtual bool handlePacket(RTCPPacketPtr packet) override;
-
-      virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => IRTPReceiverChannelVideoForRTPReceiverChannel
-      #pragma mark
-
-      static RTPReceiverChannelVideoPtr create(
-                                               RTPReceiverChannelPtr receiver,
-                                               MediaStreamTrackPtr track,
-                                               const Parameters &params
-                                               );
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => IRTPReceiverChannelVideoForMediaStreamTrack
-      #pragma mark
-
-      // (duplicate) static ElementPtr toDebug(ForMediaStreamTrackPtr object);
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => IRTPReceiverChannelMediaBaseForRTPMediaEngine
-      #pragma mark
-
-      // (duplicate) static ElementPtr toDebug(ForRTPMediaEnginePtr object);
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => IWakeDelegate
-      #pragma mark
-
-      virtual void onWake() override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => ITimerDelegate
-      #pragma mark
-
-      virtual void onTimer(ITimerPtr timer) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => IPromiseSettledDelegate
-      #pragma mark
-
-      virtual void onPromiseSettled(PromisePtr promise) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => IRTPReceiverChannelVideoAsyncDelegate
-      #pragma mark
-
-      virtual void onReceiverChannelVideoDeliverPackets() override;
-
-      virtual void onSecureTransportState(ISecureTransport::States state) override;
-
-      virtual void onUpdate(ParametersPtr params) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => friend Transport
-      #pragma mark
-
-      virtual bool SendRtcp(const uint8_t* packet, size_t length);
-      
-    public:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo::Transport
-      #pragma mark
-
-      class Transport : public webrtc::Transport
-      {
-        struct make_private {};
-
-      protected:
-        void init();
-        
-      public:
-        Transport(
-                  const make_private &,
-                  RTPReceiverChannelVideoPtr outer
-                  );
-        
-        ~Transport();
-        
-        static TransportPtr create(RTPReceiverChannelVideoPtr outer);
-        
-      public:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPReceiverChannelVideo::Transport => webrtc::Transport
-        #pragma mark
-
-        virtual bool SendRtp(
-                             const uint8_t* packet,
-                             size_t length,
-                             const webrtc::PacketOptions& options
-                             ) override;
-
-        virtual bool SendRtcp(const uint8_t* packet, size_t length) override;
-
-      private:
-        TransportWeakPtr mThisWeak;
-        RTPReceiverChannelVideoWeakPtr mOuter;
-      };
-
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => (internal)
-      #pragma mark
-
-      Log::Params log(const char *message) const;
-      Log::Params debug(const char *message) const;
-      virtual ElementPtr toDebug() const;
-
-      bool isShuttingDown() const;
-      bool isShutdown() const;
-
-      void step();
-      bool stepChannelPromise();
-      bool stepSetupChannel();
-
-      void cancel();
-
-      void setState(States state);
-      void setError(WORD error, const char *reason = NULL);
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelVideo => (data)
-      #pragma mark
-
-      AutoPUID mID;
-      RTPReceiverChannelVideoWeakPtr mThisWeak;
-      RTPReceiverChannelVideoPtr mGracefulShutdownReference;
-
-      States mCurrentState {State_Pending};
-
-      WORD mLastError {};
-      String mLastErrorReason;
-
-      UseChannelWeakPtr mReceiverChannel;
-
-      ParametersPtr mParameters;
-
-      PromiseWithRTPMediaEngineChannelResourcePtr mChannelResourceLifetimeHolderPromise;
-      UseChannelResourcePtr mChannelResource;
-
-      PromisePtr mCloseChannelPromise;
-
-      Optional<IMediaStreamTrackTypes::Kinds> mKind;
-      UseMediaStreamTrackPtr mTrack;
-
-      TransportPtr mTransport;  // allow lifetime of callback to exist separate from "this" object
-      std::atomic<ISecureTransport::States> mTransportState { ISecureTransport::State_Pending };
-
-      RTPPacketQueue mQueuedRTP;
-      RTCPPacketQueue mQueuedRTCP;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPReceiverChannelVideoFactory
-    #pragma mark
-
-    interaction IRTPReceiverChannelVideoFactory
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static IRTPReceiverChannelVideoFactory &singleton();
-
-      virtual RTPReceiverChannelVideoPtr create(
-                                                RTPReceiverChannelPtr receiverChannel,
-                                                MediaStreamTrackPtr track,
-                                                const Parameters &params
-                                                );
-    };
-
-    class RTPReceiverChannelVideoFactory : public IFactory<IRTPReceiverChannelVideoFactory> {};
-  }
-}
-
-ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPReceiverChannelVideoAsyncDelegate)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::ISecureTransport::States, States)
-ZS_DECLARE_PROXY_METHOD_0(onReceiverChannelVideoDeliverPackets)
-ZS_DECLARE_PROXY_METHOD_1(onSecureTransportState, States)
-ZS_DECLARE_PROXY_METHOD_1(onUpdate, ParametersPtr)
-ZS_DECLARE_PROXY_END()
diff --git a/ortc/internal/ortc_RTPSender.h b/ortc/internal/ortc_RTPSender.h
index 8b44bc4d..d1d32338 100644
--- a/ortc/internal/ortc_RTPSender.h
+++ b/ortc/internal/ortc_RTPSender.h
@@ -33,6 +33,7 @@
 
 #include <ortc/internal/types.h>
 #include <ortc/internal/ortc_ISecureTransport.h>
+#include <ortc/internal/ortc_IMediaStreamTrack.h>
 
 #include <ortc/IRTPSender.h>
 #include <ortc/IDTLSTransport.h>
@@ -58,7 +59,6 @@ namespace ortc
     ZS_DECLARE_INTERACTION_PTR(ISecureTransportForRTPSender);
     ZS_DECLARE_INTERACTION_PTR(IRTPListenerForRTPSender);
     ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelForRTPSender);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSender);
 
     ZS_DECLARE_INTERACTION_PROXY(IRTPSenderAsyncDelegate)
 
@@ -144,12 +144,6 @@ namespace ortc
       ZS_DECLARE_TYPEDEF_PTR(IRTPSenderForDTMFSender, ForDTMFSender)
 
       static ElementPtr toDebug(ForDTMFSenderPtr transport);
-
-      virtual PUID getID() const = 0;
-
-      virtual IDTMFSenderSubscriptionPtr subscribe(IDTMFSenderDelegatePtr delegate) override { return subscribeDTMF(delegate); }
-
-      virtual IDTMFSenderSubscriptionPtr subscribeDTMF(IDTMFSenderDelegatePtr delegate) = 0;
     };
 
     //-------------------------------------------------------------------------
@@ -294,7 +288,7 @@ namespace ortc
                 const make_private &,
                 IMessageQueuePtr queue,
                 IRTPSenderDelegatePtr delegate,
-                IMediaStreamTrackPtr track,
+                ortc::IMediaStreamTrackPtr track,
                 IRTPTransportPtr transport,
                 IRTCPTransportPtr rtcpTransport = IRTCPTransportPtr()
                 );
@@ -324,7 +318,7 @@ namespace ortc
       #pragma mark RTPSender => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -335,29 +329,29 @@ namespace ortc
 
       static RTPSenderPtr create(
                                  IRTPSenderDelegatePtr delegate,
-                                 IMediaStreamTrackPtr track,
+                                 ortc::IMediaStreamTrackPtr track,
                                  IRTPTransportPtr transport,
                                  IRTCPTransportPtr rtcpTransport = IRTCPTransportPtr()
                                  );
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual IRTPSenderSubscriptionPtr subscribe(IRTPSenderDelegatePtr delegate) override;
+      IRTPSenderSubscriptionPtr subscribe(IRTPSenderDelegatePtr delegate) override;
 
-      virtual IMediaStreamTrackPtr track() const override;
-      virtual IRTPTransportPtr transport() const override;
-      virtual IRTCPTransportPtr rtcpTransport() const override;
+      ortc::IMediaStreamTrackPtr track() const override;
+      IRTPTransportPtr transport() const override;
+      IRTCPTransportPtr rtcpTransport() const override;
 
       virtual void setTransport(
                                 IRTPTransportPtr transport,
                                 IRTCPTransportPtr rtcpTransport = IRTCPTransportPtr()
                                 ) override;
-      virtual PromisePtr setTrack(IMediaStreamTrackPtr track) override;
+      PromisePtr setTrack(ortc::IMediaStreamTrackPtr track) override;
 
       static CapabilitiesPtr getCapabilities(Optional<Kinds> kind);
 
-      virtual PromisePtr send(const Parameters &parameters) override;
-      virtual void stop() override;
+      PromisePtr send(const Parameters &parameters) override;
+      void stop() override;
 
 
       //-----------------------------------------------------------------------
@@ -383,8 +377,8 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual bool sendPacket(RTPPacketPtr packet) override;
-      virtual bool sendPacket(RTCPPacketPtr packet) override;
+      bool sendPacket(RTPPacketPtr packet) override;
+      bool sendPacket(RTCPPacketPtr packet) override;
 
       virtual void notifyConflict(
                                   UseChannelPtr channel,
@@ -392,7 +386,7 @@ namespace ortc
                                   bool selfDestruct
                                   ) override;
 
-      virtual void notifyDTMFSenderToneChanged(const char *tone) override;
+      void notifyDTMFSenderToneChanged(const char *tone) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -412,9 +406,13 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual IDTMFSenderSubscriptionPtr subscribeDTMF(IDTMFSenderDelegatePtr delegate) override;
+      //IDTMFSenderSubscriptionPtr subscribe(IDTMFSenderDelegatePtr delegate) override { return subscribeDTMF(delegate); }
+
+      //virtual IDTMFSenderSubscriptionPtr subscribeDTMF(IDTMFSenderDelegatePtr delegate) = 0;
+
+      IDTMFSenderSubscriptionPtr subscribe(IDTMFSenderDelegatePtr delegate) override;
 
-      virtual bool canInsertDTMF() const override;
+      bool canInsertDTMF() const override;
 
       virtual void insertDTMF(
                               const char *tones,
@@ -425,45 +423,45 @@ namespace ortc
                                         InvalidCharacterError
                                         ) override;
 
-      virtual IRTPSenderPtr sender() const override;
+      IRTPSenderPtr sender() const override;
 
-      virtual String toneBuffer() const override;
-      virtual Milliseconds duration() const override;
-      virtual Milliseconds interToneGap() const override;
+      String toneBuffer() const override;
+      Milliseconds duration() const override;
+      Milliseconds interToneGap() const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPReceiver => ISecureTransportDelegate
       #pragma mark
 
-      virtual void onSecureTransportStateChanged(
-                                                 ISecureTransportPtr transport,
-                                                 ISecureTransport::States state
-                                                 ) override;
+      void onSecureTransportStateChanged(
+                                         ISecureTransportPtr transport,
+                                         ISecureTransport::States state
+                                         ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPSender => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPSender => IDTMFSenderDelegate
       #pragma mark
 
-      virtual void onDTMFSenderToneChanged(
-                                           IDTMFSenderPtr sender,
-                                           String tone
-                                           ) override;
+      void onDTMFSenderToneChanged(
+                                   IDTMFSenderPtr sender,
+                                   String tone
+                                   ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPSender => IRTPSenderAsyncDelegate
       #pragma mark
 
-      virtual void onDestroyChannel(UseChannelPtr channel) override;
+      void onDestroyChannel(UseChannelPtr channel) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -564,7 +562,7 @@ namespace ortc
 
       virtual RTPSenderPtr create(
                                   IRTPSenderDelegatePtr delegate,
-                                  IMediaStreamTrackPtr track,
+                                  ortc::IMediaStreamTrackPtr track,
                                   IRTPTransportPtr transport,
                                   IRTCPTransportPtr rtcpTransport = IRTCPTransportPtr()
                                   );
diff --git a/ortc/internal/ortc_RTPSenderChannel.h b/ortc/internal/ortc_RTPSenderChannel.h
index 4b38a51b..6cfea5d8 100644
--- a/ortc/internal/ortc_RTPSenderChannel.h
+++ b/ortc/internal/ortc_RTPSenderChannel.h
@@ -33,18 +33,18 @@
 
 #include <ortc/internal/types.h>
 #include <ortc/internal/ortc_ISecureTransport.h>
-#include <ortc/internal/ortc_RTPPacket.h>
 
 #include <ortc/IDTLSTransport.h>
 #include <ortc/IICETransport.h>
 #include <ortc/IRTPTypes.h>
 #include <ortc/IMediaStreamTrack.h>
 #include <ortc/IStatsProvider.h>
+#include <ortc/RTPPacket.h>
 
 #include <zsLib/MessageQueueAssociator.h>
 #include <zsLib/ITimer.h>
 
-#include <webrtc/video_frame.h>
+#include <webrtc/api/video/video_frame.h>
 
 #define ORTC_SETTING_RTP_SENDER_CHANNEL_RETAG_RTP_PACKETS_AFTER_SSRC_NOT_SENT_IN_SECONDS "ortc/rtp-sender-channel/retag-rtp-packets-after-ssrc-not-sent-in-seconds"
 #define ORTC_SETTING_RTP_SENDER_CHANNEL_TAG_MID_RID_IN_RTCP_SDES "ortc/rtp-sender-channel/tag-mid-rid-in-rtcp-sdes"
@@ -329,19 +329,19 @@ namespace ortc
                                         const Parameters &params
                                         );
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual void notifyTrackChanged(MediaStreamTrackPtr track) override;
+      void notifyTrackChanged(MediaStreamTrackPtr track) override;
 
-      virtual void notifyTransportState(ISecureTransportTypes::States state) override;
+      void notifyTransportState(ISecureTransportTypes::States state) override;
 
-      virtual void notifyPackets(RTCPPacketListPtr packets) override;
+      void notifyPackets(RTCPPacketListPtr packets) override;
 
-      virtual void notifyUpdate(const Parameters &params) override;
+      void notifyUpdate(const Parameters &params) override;
 
-      virtual bool handlePacket(RTCPPacketPtr packet) override;
+      bool handlePacket(RTCPPacketPtr packet) override;
 
-      virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override;
+      void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override;
 
       virtual void insertDTMF(
                               const char *tones,
@@ -349,9 +349,9 @@ namespace ortc
                               Milliseconds interToneGap
                               ) override;
 
-      virtual String toneBuffer() const override;
-      virtual Milliseconds duration() const override;
-      virtual Milliseconds interToneGap() const override;
+      String toneBuffer() const override;
+      Milliseconds duration() const override;
+      Milliseconds interToneGap() const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -360,16 +360,16 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual bool sendPacket(RTPPacketPtr packet) override;
+      bool sendPacket(RTPPacketPtr packet) override;
 
-      virtual bool sendPacket(RTCPPacketPtr packet) override;
+      bool sendPacket(RTCPPacketPtr packet) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPSenderChannel => IRTPSenderChannelForRTPSenderChannelAudio
       #pragma mark
 
-      virtual void notifyDTMFSenderToneChanged(const char *tone) override;
+      void notifyDTMFSenderToneChanged(const char *tone) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -385,40 +385,40 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual int32_t sendAudioSamples(
-                                       const void* audioSamples,
-                                       const size_t numberOfSamples,
-                                       const uint8_t numberOfChannels
-                                       ) override;
+      int32_t sendAudioSamples(
+                               const void* audioSamples,
+                               const size_t numberOfSamples,
+                               const uint8_t numberOfChannels
+                               ) override;
 
-      virtual void sendVideoFrame(VideoFramePtr videoFrame) override;
+      void sendVideoFrame(VideoFramePtr videoFrame) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPSenderChannel => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPSenderChannel => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark RTPSenderChannel => IRTPSenderChannelAsyncDelegate
       #pragma mark
 
-      virtual void onTrackChanged(UseMediaStreamTrackPtr track) override;
+      void onTrackChanged(UseMediaStreamTrackPtr track) override;
 
-      virtual void onSecureTransportState(ISecureTransport::States state) override;
+      void onSecureTransportState(ISecureTransport::States state) override;
 
-      virtual void onNotifyPackets(RTCPPacketListPtr packets) override;
+      void onNotifyPackets(RTCPPacketListPtr packets) override;
 
-      virtual void onUpdate(ParametersPtr params) override;
+      void onUpdate(ParametersPtr params) override;
 
     protected:
       //-----------------------------------------------------------------------
@@ -478,7 +478,7 @@ namespace ortc
       Optional<IMediaStreamTrackTypes::Kinds> mKind;
       UseMediaStreamTrackPtr mTrack;
 
-      // NO lockk is needed:
+      // NO lock is needed:
       UseMediaBasePtr mMediaBase; // valid
       UseAudioPtr mAudio; // either
       UseVideoPtr mVideo; // or valid
diff --git a/ortc/internal/ortc_RTPSenderChannelAudio.h b/ortc/internal/ortc_RTPSenderChannelAudio.h
deleted file mode 100644
index a5383f92..00000000
--- a/ortc/internal/ortc_RTPSenderChannelAudio.h
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#pragma once
-
-#include <ortc/internal/types.h>
-#include <ortc/internal/ortc_RTPSenderChannelMediaBase.h>
-#include <ortc/internal/ortc_ISecureTransport.h>
-#include <ortc/internal/ortc_RTPMediaEngine.h>
-
-#include <ortc/IRTPTypes.h>
-#include <ortc/IMediaStreamTrack.h>
-
-#include <zsLib/MessageQueueAssociator.h>
-#include <zsLib/ITimer.h>
-#include <zsLib/Event.h>
-
-#include <webrtc/transport.h>
-
-//#define ORTC_SETTING_SCTP_TRANSPORT_MAX_MESSAGE_SIZE "ortc/sctp/max-message-size"
-
-#define ORTC_SENDER_CHANNEL_PENDING_TONE_LOCK_OUT_MAGIC_STRING "PENDING"
-
-namespace ortc
-{
-  namespace internal
-  {
-    ZS_DECLARE_USING_PTR(zsLib, Event)
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelAudioForSettings)
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelMediaBaseForRTPSenderChannel)
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelAudioForRTPSenderChannel)
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelMediaBaseForMediaStreamTrack)
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelAudioForMediaStreamTrack)
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelAudioForRTPMediaEngine)
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelForRTPSenderChannelMediaBase)
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelForRTPSenderChannelAudio)
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSenderChannelMediaBase)
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSenderChannelAudio)
-
-    ZS_DECLARE_INTERACTION_PROXY(IRTPSenderChannelAudioAsyncDelegate)
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelAudioForRTPSenderChannel
-    #pragma mark
-
-    interaction IRTPSenderChannelAudioForRTPSenderChannel : public IRTPSenderChannelMediaBaseForRTPSenderChannel
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelAudioForRTPSenderChannel, ForRTPSenderChannel)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static RTPSenderChannelAudioPtr create(
-                                             RTPSenderChannelPtr senderChannel,
-                                             MediaStreamTrackPtr track,
-                                             const Parameters &params
-                                             );
-
-      virtual int32_t sendAudioSamples(
-                                       const void* audioSamples,
-                                       const size_t numberOfSamples,
-                                       const uint8_t numberOfChannels
-                                       ) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelAudioForMediaStreamTrack
-    #pragma mark
-
-    interaction IRTPSenderChannelAudioForMediaStreamTrack : public IRTPSenderChannelMediaBaseForMediaStreamTrack
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelAudioForMediaStreamTrack, ForMediaStreamTrack)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static ElementPtr toDebug(ForMediaStreamTrackPtr object);
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelAudioForRTPMediaEngine
-    #pragma mark
-
-    interaction IRTPSenderChannelAudioForRTPMediaEngine : public IRTPSenderChannelMediaBaseForRTPMediaEngine
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelAudioForRTPMediaEngine, ForRTPMediaEngine)
-
-      static ElementPtr toDebug(ForRTPMediaEnginePtr object);
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelAudioAsyncDelegate
-    #pragma mark
-
-    interaction IRTPSenderChannelAudioAsyncDelegate
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
-
-      virtual void onSecureTransportState(ISecureTransport::States state) = 0;
-      virtual void onUpdate(ParametersPtr params) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelAudio
-    #pragma mark
-    
-    class RTPSenderChannelAudio : public Noop,
-                                  public MessageQueueAssociator,
-                                  public SharedRecursiveLock,
-                                  public IRTPSenderChannelAudioForRTPSenderChannel,
-                                  public IRTPSenderChannelAudioForMediaStreamTrack,
-                                  public IRTPSenderChannelAudioForRTPMediaEngine,
-                                  public IWakeDelegate,
-                                  public IDTMFSenderDelegate,
-                                  public zsLib::ITimerDelegate,
-                                  public zsLib::IPromiseSettledDelegate,
-                                  public IRTPSenderChannelAudioAsyncDelegate
-    {
-    protected:
-      struct make_private {};
-
-    public:
-      friend interaction IRTPSenderChannelAudio;
-      friend interaction IRTPSenderChannelAudioFactory;
-      friend interaction IRTPSenderChannelMediaBaseForRTPSenderChannel;
-      friend interaction IRTPSenderChannelAudioForRTPSenderChannel;
-      friend interaction IRTPSenderChannelMediaBaseForMediaStreamTrack;
-      friend interaction IRTPSenderChannelAudioForMediaStreamTrack;
-      friend interaction IRTPSenderChannelAudioForRTPMediaEngine;
-
-      ZS_DECLARE_CLASS_PTR(Transport)
-      friend class Transport;
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelForRTPSenderChannelAudio, UseChannel);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelMediaBase, UseBaseMediaStreamTrack);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelAudio, UseMediaStreamTrack);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPSenderChannelAudio, UseMediaEngine);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineDeviceResource, UseDeviceResource);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineAudioSenderChannelResource, UseChannelResource);
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelMediaBaseForRTPSenderChannel, ForRTPSenderChannelFromMediaBase);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelMediaBaseForMediaStreamTrack, ForMediaStreamTrackFromMediaBase);
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
-      typedef std::list<RTCPPacketPtr> RTCPPacketList;
-      ZS_DECLARE_PTR(RTCPPacketList);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-
-      enum States
-      {
-        State_Pending,
-        State_Ready,
-        State_ShuttingDown,
-        State_Shutdown,
-      };
-      static const char *toString(States state);
-
-      ZS_DECLARE_STRUCT_PTR(ToneInfo);
-
-      struct ToneInfo
-      {
-        String mTones;
-        Milliseconds mDuration {};
-        Milliseconds mInterToneGap {};
-
-        ElementPtr toDebug() const;
-      };
-
-      typedef std::list<ToneInfoPtr> ToneInfoList;
-
-    public:
-      RTPSenderChannelAudio(
-                            const make_private &,
-                            IMessageQueuePtr queue,
-                            UseChannelPtr senderChannel,
-                            UseMediaStreamTrackPtr track,
-                            const Parameters &params
-                            );
-
-    protected:
-      RTPSenderChannelAudio(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
-        Noop(true),
-        MessageQueueAssociator(queue),
-        SharedRecursiveLock(SharedRecursiveLock::create())
-      {}
-
-      void init();
-
-    public:
-      virtual ~RTPSenderChannelAudio();
-
-      static RTPSenderChannelAudioPtr convert(ForRTPSenderChannelFromMediaBasePtr object);
-      static RTPSenderChannelAudioPtr convert(ForRTPSenderChannelPtr object);
-      static RTPSenderChannelAudioPtr convert(ForMediaStreamTrackFromMediaBasePtr object);
-      static RTPSenderChannelAudioPtr convert(ForMediaStreamTrackPtr object);
-      static RTPSenderChannelAudioPtr convert(ForRTPMediaEnginePtr object);
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => IRTPSenderChannelMediaBaseForRTPSenderChannel
-      #pragma mark
-
-      virtual PUID getID() const override {return mID;}
-
-      virtual void onTrackChanged(UseBaseMediaStreamTrackPtr track) override;
-
-      virtual void notifyTransportState(ISecureTransportTypes::States state) override;
-
-      virtual void notifyUpdate(ParametersPtr params) override;
-
-      virtual bool handlePacket(RTCPPacketPtr packet) override;
-      
-      virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override;
-
-      virtual void insertDTMF(
-                              const char *tones,
-                              Milliseconds duration,
-                              Milliseconds interToneGap
-                              ) override;
-
-      virtual String toneBuffer() const override;
-      virtual Milliseconds duration() const override;
-      virtual Milliseconds interToneGap() const override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => IRTPSenderChannelAudioForRTPSenderChannel
-      #pragma mark
-
-      static RTPSenderChannelAudioPtr create(
-                                             RTPSenderChannelPtr senderChannel,
-                                             MediaStreamTrackPtr track,
-                                             const Parameters &params
-                                             );
-
-      virtual int32_t sendAudioSamples(
-                                       const void* audioSamples,
-                                       const size_t numberOfSamples,
-                                       const uint8_t numberOfChannels
-                                       ) override;
-      
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => IRTPSenderChannelAudioForMediaStreamTrack
-      #pragma mark
-
-      // (duplicate) static ElementPtr toDebug(ForMediaStreamTrackPtr object);
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => IRTPSenderChannelMediaBaseForRTPMediaEngine
-      #pragma mark
-
-      // (duplicate) static ElementPtr toDebug(ForRTPMediaEnginePtr object);
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => IWakeDelegate
-      #pragma mark
-
-      virtual void onWake() override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => IDTMFSenderDelegate
-      #pragma mark
-
-      virtual void onDTMFSenderToneChanged(
-                                           IDTMFSenderPtr sender,
-                                           String tone
-                                           ) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => ITimerDelegate
-      #pragma mark
-
-      virtual void onTimer(ITimerPtr timer) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPReceiverChannelAudio => IPromiseSettledDelegate
-      #pragma mark
-
-      virtual void onPromiseSettled(PromisePtr promise) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => IRTPSenderChannelAudioAsyncDelegate
-      #pragma mark
-
-      virtual void onSecureTransportState(ISecureTransport::States state) override;
-
-      virtual void onUpdate(ParametersPtr params) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => friend Transport
-      #pragma mark
-
-      virtual bool SendRtp(
-                           const uint8_t* packet,
-                           size_t length,
-                           const webrtc::PacketOptions& options
-                           );
-
-      virtual bool SendRtcp(const uint8_t* packet, size_t length);
-
-    public:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio::Transport
-      #pragma mark
-
-      class Transport : public webrtc::Transport
-      {
-        struct make_private {};
-
-      protected:
-        void init();
-        
-      public:
-        Transport(
-                  const make_private &,
-                  RTPSenderChannelAudioPtr outer
-                  );
-        
-        ~Transport();
-        
-        static TransportPtr create(RTPSenderChannelAudioPtr outer);
-        
-      public:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPSenderChannelAudio::Transport => webrtc::Transport
-        #pragma mark
-
-        virtual bool SendRtp(
-                             const uint8_t* packet,
-                             size_t length,
-                             const webrtc::PacketOptions& options
-                             ) override;
-        
-        virtual bool SendRtcp(const uint8_t* packet, size_t length) override;
-        
-      private:
-        TransportWeakPtr mThisWeak;
-        RTPSenderChannelAudioWeakPtr mOuter;
-      };
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => (internal)
-      #pragma mark
-
-      Log::Params log(const char *message) const;
-      Log::Params debug(const char *message) const;
-      virtual ElementPtr toDebug() const;
-
-      bool isShuttingDown() const;
-      bool isShutdown() const;
-
-      void step();
-      bool stepSetupChannel();
-
-      void cancel();
-
-      void setState(States state);
-      void setError(WORD error, const char *reason = NULL);
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelAudio => (data)
-      #pragma mark
-
-      AutoPUID mID;
-      RTPSenderChannelAudioWeakPtr mThisWeak;
-      RTPSenderChannelAudioPtr mGracefulShutdownReference;
-
-      States mCurrentState {State_Pending};
-
-      WORD mLastError {};
-      String mLastErrorReason;
-
-      UseChannelWeakPtr mSenderChannel;
-
-      ParametersPtr mParameters;
-
-      PromiseWithRTPMediaEngineChannelResourcePtr mChannelResourceLifetimeHolderPromise;
-      UseChannelResourcePtr mChannelResource;
-
-      PromisePtr mCloseChannelPromise;
-
-      Optional<IMediaStreamTrackTypes::Kinds> mKind;
-      UseMediaStreamTrackPtr mTrack;
-
-      TransportPtr mTransport;  // allow lifetime of callback to exist separate from "this" object
-      std::atomic<ISecureTransport::States> mTransportState { ISecureTransport::State_Pending };
-
-      ToneInfoList mPendingTones;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelAudioFactory
-    #pragma mark
-
-    interaction IRTPSenderChannelAudioFactory
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static IRTPSenderChannelAudioFactory &singleton();
-
-      virtual RTPSenderChannelAudioPtr create(
-                                              RTPSenderChannelPtr sender,
-                                              MediaStreamTrackPtr track,
-                                              const Parameters &params
-                                              );
-    };
-
-    class RTPSenderChannelAudioFactory : public IFactory<IRTPSenderChannelAudioFactory> {};
-  }
-}
-
-ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPSenderChannelAudioAsyncDelegate)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::ISecureTransport::States, States)
-ZS_DECLARE_PROXY_METHOD_1(onSecureTransportState, States)
-ZS_DECLARE_PROXY_METHOD_1(onUpdate, ParametersPtr)
-ZS_DECLARE_PROXY_END()
diff --git a/ortc/internal/ortc_RTPSenderChannelMediaBase.h b/ortc/internal/ortc_RTPSenderChannelMediaBase.h
deleted file mode 100644
index 6ea9fc06..00000000
--- a/ortc/internal/ortc_RTPSenderChannelMediaBase.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#pragma once
-
-#include <ortc/internal/types.h>
-#include <ortc/internal/ortc_ISecureTransport.h>
-
-#include <ortc/IRTPTypes.h>
-#include <ortc/IStatsProvider.h>
-
-//#define ORTC_SETTING_SCTP_TRANSPORT_MAX_MESSAGE_SIZE "ortc/sctp/max-message-size"
-
-namespace ortc
-{
-  namespace internal
-  {
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelMediaBaseForRTPSenderChannel)
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelMediaBaseForMediaStreamTrack)
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelForRTPSenderChannelMediaBase)
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSenderChannelMediaBase)
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelMediaBaseForRTPSenderChannel
-    #pragma mark
-
-    interaction IRTPSenderChannelMediaBaseForRTPSenderChannel
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelMediaBaseForRTPSenderChannel, ForRTPSenderChannel);
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelMediaBase, UseBaseMediaStreamTrack);
-
-      ZS_DECLARE_TYPEDEF_PTR(IStatsProvider::PromiseWithStatsReport, PromiseWithStatsReport);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-
-      static ElementPtr toDebug(ForRTPSenderChannelPtr object);
-
-      virtual PUID getID() const = 0;
-
-      virtual void onTrackChanged(UseBaseMediaStreamTrackPtr track) = 0;
-
-      virtual void notifyTransportState(ISecureTransportTypes::States state) = 0;
-
-      virtual void notifyUpdate(ParametersPtr params) = 0;
-
-      virtual bool handlePacket(RTCPPacketPtr packet) = 0;
-
-      virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) = 0;
-
-      virtual void insertDTMF(
-                              const char *tones,
-                              Milliseconds duration,
-                              Milliseconds interToneGap
-                              ) = 0;
-
-      virtual String toneBuffer() const = 0;
-      virtual Milliseconds duration() const = 0;
-      virtual Milliseconds interToneGap() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelMediaBaseForMediaStreamTrack
-    #pragma mark
-
-    interaction IRTPSenderChannelMediaBaseForMediaStreamTrack
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelMediaBaseForMediaStreamTrack, ForMediaStreamTrack)
-
-      static ElementPtr toDebug(ForMediaStreamTrackPtr object);
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelMediaBaseForRTPMediaEngine
-    #pragma mark
-
-    interaction IRTPSenderChannelMediaBaseForRTPMediaEngine
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelMediaBaseForRTPMediaEngine, ForRTPMediaEngine)
-
-      static ElementPtr toDebug(ForRTPMediaEnginePtr object);
-
-      virtual PUID getID() const = 0;
-    };
-  }
-}
diff --git a/ortc/internal/ortc_RTPSenderChannelVideo.h b/ortc/internal/ortc_RTPSenderChannelVideo.h
deleted file mode 100644
index b1488482..00000000
--- a/ortc/internal/ortc_RTPSenderChannelVideo.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
-
- Copyright (c) 2015, Hookflash Inc. / Hookflash Inc.
- All rights reserved.
-
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- The views and conclusions contained in the software and documentation are those
- of the authors and should not be interpreted as representing official policies,
- either expressed or implied, of the FreeBSD Project.
- 
- */
-
-#pragma once
-
-#include <ortc/internal/types.h>
-#include <ortc/internal/ortc_RTPSenderChannelMediaBase.h>
-#include <ortc/internal/ortc_ISecureTransport.h>
-#include <ortc/internal/ortc_RTPMediaEngine.h>
-
-#include <ortc/IRTPTypes.h>
-#include <ortc/IMediaStreamTrack.h>
-
-#include <zsLib/MessageQueueAssociator.h>
-#include <zsLib/ITimer.h>
-#include <zsLib/Event.h>
-
-#include <webrtc/transport.h>
-
-//#define ORTC_SETTING_SCTP_TRANSPORT_MAX_MESSAGE_SIZE "ortc/sctp/max-message-size"
-
-namespace ortc
-{
-  namespace internal
-  {
-    ZS_DECLARE_USING_PTR(zsLib, Event);
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelMediaBaseForRTPSenderChannel);
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelVideoForRTPSenderChannel);
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelMediaBaseForMediaStreamTrack);
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelVideoForMediaStreamTrack);
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelVideoForRTPMediaEngine);
-
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelForRTPSenderChannelMediaBase);
-    ZS_DECLARE_INTERACTION_PTR(IRTPSenderChannelForRTPSenderChannelVideo);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSenderChannelMediaBase);
-    ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackForRTPSenderChannelVideo);
-
-    ZS_DECLARE_INTERACTION_PROXY(IRTPSenderChannelVideoAsyncDelegate);
-
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelVideoForRTPSenderChannel
-    #pragma mark
-
-    interaction IRTPSenderChannelVideoForRTPSenderChannel : public IRTPSenderChannelMediaBaseForRTPSenderChannel
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelVideoForRTPSenderChannel, ForRTPSenderChannel)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame);
-
-      static RTPSenderChannelVideoPtr create(
-                                             RTPSenderChannelPtr senderChannel,
-                                             MediaStreamTrackPtr track,
-                                             const Parameters &params
-                                             );
-
-      virtual void sendVideoFrame(VideoFramePtr videoFrame) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelVideoForMediaStreamTrack
-    #pragma mark
-
-    interaction IRTPSenderChannelVideoForMediaStreamTrack : public IRTPSenderChannelMediaBaseForMediaStreamTrack
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelVideoForMediaStreamTrack, ForMediaStreamTrack)
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static ElementPtr toDebug(ForMediaStreamTrackPtr object);
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelVideoForRTPMediaEngine
-    #pragma mark
-
-    interaction IRTPSenderChannelVideoForRTPMediaEngine : public IRTPSenderChannelMediaBaseForRTPMediaEngine
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelVideoForRTPMediaEngine, ForRTPMediaEngine)
-
-      static ElementPtr toDebug(ForRTPMediaEnginePtr object);
-
-      virtual PUID getID() const = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelVideoAsyncDelegate
-    #pragma mark
-
-    interaction IRTPSenderChannelVideoAsyncDelegate
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      virtual void onSecureTransportState(ISecureTransport::States state) = 0;
-      virtual void onUpdate(ParametersPtr params) = 0;
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark RTPSenderChannelVideo
-    #pragma mark
-    
-    class RTPSenderChannelVideo : public Noop,
-                                  public MessageQueueAssociator,
-                                  public SharedRecursiveLock,
-                                  public IRTPSenderChannelVideoForRTPSenderChannel,
-                                  public IRTPSenderChannelVideoForMediaStreamTrack,
-                                  public IRTPSenderChannelVideoForRTPMediaEngine,
-                                  public IWakeDelegate,
-                                  public zsLib::ITimerDelegate,
-                                  public zsLib::IPromiseSettledDelegate,
-                                  public IRTPSenderChannelVideoAsyncDelegate
-    {
-    protected:
-      struct make_private {};
-
-    public:
-      friend interaction IRTPSenderChannelVideo;
-      friend interaction IRTPSenderChannelVideoFactory;
-      friend interaction IRTPSenderChannelMediaBaseForRTPSenderChannel;
-      friend interaction IRTPSenderChannelVideoForRTPSenderChannel;
-      friend interaction IRTPSenderChannelMediaBaseForMediaStreamTrack;
-      friend interaction IRTPSenderChannelVideoForMediaStreamTrack;
-      friend interaction IRTPSenderChannelVideoForRTPMediaEngine;
-
-      ZS_DECLARE_CLASS_PTR(Transport);
-      friend class Transport;
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelForRTPSenderChannelVideo, UseChannel);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelMediaBase, UseBaseMediaStreamTrack);
-      ZS_DECLARE_TYPEDEF_PTR(IMediaStreamTrackForRTPSenderChannelVideo, UseMediaStreamTrack);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineForRTPSenderChannelAudio, UseMediaEngine);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineDeviceResource, UseDeviceResource);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPMediaEngineVideoSenderChannelResource, UseChannelResource);
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelMediaBaseForRTPSenderChannel, ForRTPSenderChannelFromMediaBase);
-      ZS_DECLARE_TYPEDEF_PTR(IRTPSenderChannelMediaBaseForMediaStreamTrack, ForMediaStreamTrackFromMediaBase);
-
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters);
-      typedef std::list<RTCPPacketPtr> RTCPPacketList;
-      ZS_DECLARE_PTR(RTCPPacketList);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsProviderTypes::PromiseWithStatsReport, PromiseWithStatsReport);
-      ZS_DECLARE_TYPEDEF_PTR(IStatsReportTypes::StatsTypeSet, StatsTypeSet)
-      ZS_DECLARE_TYPEDEF_PTR(webrtc::VideoFrame, VideoFrame);
-
-      enum States
-      {
-        State_Pending,
-        State_Ready,
-        State_ShuttingDown,
-        State_Shutdown,
-      };
-      static const char *toString(States state);
-
-    public:
-      RTPSenderChannelVideo(
-                            const make_private &,
-                            IMessageQueuePtr queue,
-                            UseChannelPtr senderChannel,
-                            UseMediaStreamTrackPtr track,
-                            const Parameters &params
-                            );
-
-    protected:
-      RTPSenderChannelVideo(Noop, IMessageQueuePtr queue = IMessageQueuePtr()) :
-        Noop(true),
-        MessageQueueAssociator(queue),
-        SharedRecursiveLock(SharedRecursiveLock::create())
-      {}
-
-      void init();
-
-    public:
-      virtual ~RTPSenderChannelVideo();
-
-      static RTPSenderChannelVideoPtr convert(ForRTPSenderChannelFromMediaBasePtr object);
-      static RTPSenderChannelVideoPtr convert(ForRTPSenderChannelPtr object);
-      static RTPSenderChannelVideoPtr convert(ForMediaStreamTrackFromMediaBasePtr object);
-      static RTPSenderChannelVideoPtr convert(ForMediaStreamTrackPtr object);
-      static RTPSenderChannelVideoPtr convert(ForRTPMediaEnginePtr object);
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => IRTPSenderChannelMediaBaseForRTPSenderChannel
-      #pragma mark
-
-      virtual PUID getID() const override {return mID;}
-
-      virtual void onTrackChanged(UseBaseMediaStreamTrackPtr track) override;
-      
-      virtual void notifyTransportState(ISecureTransportTypes::States state) override;
-
-      virtual void notifyUpdate(ParametersPtr params) override;
-
-      virtual bool handlePacket(RTCPPacketPtr packet) override;
-
-      virtual void requestStats(PromiseWithStatsReportPtr promise, const StatsTypeSet &stats) override;
-
-      virtual void insertDTMF(
-                              const char *tones,
-                              Milliseconds duration,
-                              Milliseconds interToneGap
-                              ) override {}
-
-      virtual String toneBuffer() const override { return String(); }
-      virtual Milliseconds duration() const override { return Milliseconds(); }
-      virtual Milliseconds interToneGap() const override { return Milliseconds(); }
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => IRTPSenderChannelVideoForRTPSenderChannel
-      #pragma mark
-
-      static RTPSenderChannelVideoPtr create(
-                                             RTPSenderChannelPtr senderChannel,
-                                             MediaStreamTrackPtr track,
-                                             const Parameters &params
-                                             );
-
-      virtual void sendVideoFrame(VideoFramePtr videoFrame) override;
-      
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => IRTPSenderChannelVideoForMediaStreamTrack
-      #pragma mark
-
-      // (duplicate) static ElementPtr toDebug(ForMediaStreamTrackPtr object);
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => IRTPSenderChannelMediaBaseForRTPMediaEngine
-      #pragma mark
-
-      // (duplicate) static ElementPtr toDebug(ForRTPMediaEnginePtr object);
-
-      // (duplicate) virtual PUID getID() const = 0;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => IWakeDelegate
-      #pragma mark
-
-      virtual void onWake() override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => ITimerDelegate
-      #pragma mark
-
-      virtual void onTimer(ITimerPtr timer) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => IPromiseSettledDelegate
-      #pragma mark
-
-      virtual void onPromiseSettled(PromisePtr promise) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => IRTPSenderChannelVideoAsyncDelegate
-      #pragma mark
-
-      virtual void onSecureTransportState(ISecureTransport::States state) override;
-
-      virtual void onUpdate(ParametersPtr params) override;
-
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => friend Transport
-      #pragma mark
-
-      virtual bool SendRtp(
-                           const uint8_t* packet,
-                           size_t length,
-                           const webrtc::PacketOptions& options
-                           );
-
-      virtual bool SendRtcp(const uint8_t* packet, size_t length);
-
-    public:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo::Transport
-      #pragma mark
-
-      class Transport : public webrtc::Transport
-      {
-        struct make_private {};
-
-      protected:
-        void init();
-        
-      public:
-        Transport(
-                  const make_private &,
-                  RTPSenderChannelVideoPtr outer
-                  );
-        
-        ~Transport();
-        
-        static TransportPtr create(RTPSenderChannelVideoPtr outer);
-        
-      public:
-        //---------------------------------------------------------------------
-        #pragma mark
-        #pragma mark RTPSenderChannelVideo::Transport => webrtc::Transport
-        #pragma mark
-
-        virtual bool SendRtp(
-                             const uint8_t* packet,
-                             size_t length,
-                             const webrtc::PacketOptions& options
-                             ) override;
-
-        virtual bool SendRtcp(const uint8_t* packet, size_t length) override;
-
-      private:
-        TransportWeakPtr mThisWeak;
-        RTPSenderChannelVideoWeakPtr mOuter;
-      };
-      
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => (internal)
-      #pragma mark
-
-      Log::Params log(const char *message) const;
-      Log::Params debug(const char *message) const;
-      virtual ElementPtr toDebug() const;
-
-      bool isShuttingDown() const;
-      bool isShutdown() const;
-
-      void step();
-      bool stepSetupChannel();
-
-      void cancel();
-
-      void setState(States state);
-      void setError(WORD error, const char *reason = NULL);
-
-    protected:
-      //-----------------------------------------------------------------------
-      #pragma mark
-      #pragma mark RTPSenderChannelVideo => (data)
-      #pragma mark
-
-      AutoPUID mID;
-      RTPSenderChannelVideoWeakPtr mThisWeak;
-      RTPSenderChannelVideoPtr mGracefulShutdownReference;
-
-      States mCurrentState {State_Pending};
-
-      WORD mLastError {};
-      String mLastErrorReason;
-
-      UseChannelWeakPtr mSenderChannel;
-
-      ParametersPtr mParameters;
-
-      PromiseWithRTPMediaEngineChannelResourcePtr mChannelResourceLifetimeHolderPromise;
-      UseChannelResourcePtr mChannelResource;
-
-      PromisePtr mCloseChannelPromise;
-
-      Optional<IMediaStreamTrackTypes::Kinds> mKind;
-      UseMediaStreamTrackPtr mTrack;
-
-      TransportPtr mTransport;  // allow lifetime of callback to exist separate from "this" object
-      std::atomic<ISecureTransport::States> mTransportState { ISecureTransport::State_Pending };
-    };
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    #pragma mark
-    #pragma mark IRTPSenderChannelVideoFactory
-    #pragma mark
-
-    interaction IRTPSenderChannelVideoFactory
-    {
-      ZS_DECLARE_TYPEDEF_PTR(IRTPTypes::Parameters, Parameters)
-
-      static IRTPSenderChannelVideoFactory &singleton();
-
-      virtual RTPSenderChannelVideoPtr create(
-                                              RTPSenderChannelPtr sender,
-                                              MediaStreamTrackPtr track,
-                                              const Parameters &params
-                                              );
-    };
-
-    class RTPSenderChannelVideoFactory : public IFactory<IRTPSenderChannelVideoFactory> {};
-  }
-}
-
-ZS_DECLARE_PROXY_BEGIN(ortc::internal::IRTPSenderChannelVideoAsyncDelegate)
-ZS_DECLARE_PROXY_TYPEDEF(ortc::internal::ISecureTransport::States, States)
-ZS_DECLARE_PROXY_METHOD_1(onSecureTransportState, States)
-ZS_DECLARE_PROXY_METHOD_1(onUpdate, ParametersPtr)
-ZS_DECLARE_PROXY_END()
diff --git a/ortc/internal/ortc_SCTPTransport.h b/ortc/internal/ortc_SCTPTransport.h
index 9ba7f6bf..8ddf86a1 100644
--- a/ortc/internal/ortc_SCTPTransport.h
+++ b/ortc/internal/ortc_SCTPTransport.h
@@ -46,6 +46,7 @@
 
 #include <usrsctp.h>
 #include <queue>
+#include <set>
 
 #define ORTC_SETTING_SCTP_TRANSPORT_MAX_SESSIONS_PER_PORT "ortc/sctp/max-sessions-per-port"
 
@@ -184,7 +185,7 @@ namespace ortc
         String mErrorReason;
       };
 
-      virtual PUID getID() const = 0;
+      virtual PUID getRealID() const = 0;
 
       virtual void registerNewDataChannel(
                                           UseDataChannelPtr &ioDataChannel,
@@ -233,12 +234,12 @@ namespace ortc
                                    WORD localPort
                                    );
 
-      virtual PUID getID() const = 0;
+      virtual PUID getRealID() const = 0;
 
-      virtual void start(
-                         const Capabilities &remoteCapabilities,
-                         WORD remotePort
-                         ) throw (InvalidStateError, InvalidParameters) = 0;
+      virtual void startFromListener(
+                                     const Capabilities &remoteCapabilities,
+                                     WORD remotePort
+                                     ) throw (InvalidStateError, InvalidParameters) = 0;
 
       virtual bool handleDataPacket(
                                     const BYTE *buffer,
@@ -330,6 +331,7 @@ namespace ortc
                           public ISCTPTransportForSettings,
                           public ISCTPTransportForDataChannel,
                           public ISCTPTransportForSCTPTransportListener,
+                          public ISCTPTransportDelegate,
                           public IWakeDelegate,
                           public zsLib::ITimerDelegate,
                           public ISCTPTransportAsyncDelegate,
@@ -357,6 +359,7 @@ namespace ortc
 
       typedef PUID DataChannelID;
       typedef std::map<DataChannelID, UseDataChannelPtr> DataChannelMap;
+      typedef std::set<DataChannelID> DataChannelIDSet;
 
       typedef WORD SessionID;
       typedef std::map<SessionID, UseDataChannelPtr> DataChannelSessionMap;
@@ -390,6 +393,7 @@ namespace ortc
       SCTPTransport(
                     const make_private &,
                     IMessageQueuePtr queue,
+                    ISCTPTransportDelegatePtr originalDelegate,
                     UseListenerPtr listener,
                     UseSecureTransportPtr secureTransport,
                     WORD localPort = 0,
@@ -420,7 +424,7 @@ namespace ortc
       #pragma mark SCTPTransport => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -435,26 +439,26 @@ namespace ortc
                                       WORD localPort = 0
                                       ) throw (InvalidParameters, InvalidStateError);
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override;
 
-      virtual IDTLSTransportPtr transport() const override;
-      virtual ISCTPTransportTypes::States state() const override;
+      IDTLSTransportPtr transport() const override;
+      ISCTPTransportTypes::States state() const override;
 
-      virtual WORD port() const override;
+      WORD port() const override;
 
-      virtual WORD localPort() const override;
-      virtual Optional<WORD> remotePort() const override;
+      WORD localPort() const override;
+      Optional<WORD> remotePort() const override;
 
-      virtual PromiseWithSocketOptionsPtr getOptions(const SocketOptions &inWhichOptions);
-      virtual PromisePtr setOptions(const SocketOptions &inOptions);
+      PromiseWithSocketOptionsPtr getOptions(const SocketOptions &inWhichOptions) override;
+      PromisePtr setOptions(const SocketOptions &inOptions) override;
 
       virtual void start(
                          const Capabilities &remoteCapabilities,
                          WORD remotePort
                          ) throw (InvalidStateError, InvalidParameters) override;
-      virtual void stop() override;
+      void stop() override;
 
-      virtual ISCTPTransportSubscriptionPtr subscribe(ISCTPTransportDelegatePtr delegate) override;
+      ISCTPTransportSubscriptionPtr subscribe(ISCTPTransportDelegatePtr delegate) override;
 
 
       //-----------------------------------------------------------------------
@@ -464,29 +468,29 @@ namespace ortc
 
       // (duplciate) static ElementPtr toDebug(ForDataChannelPtr transport);
 
-      virtual void registerNewDataChannel(
-                                          UseDataChannelPtr &ioDataChannel,
-                                          WORD &ioSessionID
-                                          ) override;
+      void registerNewDataChannel(
+                                  UseDataChannelPtr &ioDataChannel,
+                                  WORD &ioSessionID
+                                  ) override;
 
-      // (duplicate) virtual PUID getID() const = 0;
-      virtual ISCTPTransportForDataChannelSubscriptionPtr subscribe(ISCTPTransportForDataChannelDelegatePtr delegate) override;
+      PUID getRealID() const override { return mID; }
+      ISCTPTransportForDataChannelSubscriptionPtr subscribe(ISCTPTransportForDataChannelDelegatePtr delegate) override;
 
       // (duplicate) virtual bool isShuttingDown() const override;
       // (duplicate) virtual bool isShutdown() const override;
-      virtual bool isReady() const override;
+      bool isReady() const override;
 
-      virtual void announceIncoming(
-                                    UseDataChannelPtr dataChannel,
-                                    ParametersPtr params
-                                    ) override;
+      void announceIncoming(
+                            UseDataChannelPtr dataChannel,
+                            ParametersPtr params
+                            ) override;
 
-      virtual PromisePtr sendDataNow(SCTPPacketOutgoingPtr packet) override;
+      PromisePtr sendDataNow(SCTPPacketOutgoingPtr packet) override;
 
-      virtual void requestShutdown(
-                                   UseDataChannelPtr dataChannel,
-                                   WORD sessionID
-                                   ) override;
+      void requestShutdown(
+                           UseDataChannelPtr dataChannel,
+                           WORD sessionID
+                           ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -501,17 +505,17 @@ namespace ortc
                                    WORD localPort
                                    );
 
-      // (duplicate) virtual void start(
-      //                                const Capabilities &remoteCapabilities,
-      //                                WORD remotePort
-      //                                ) throw (InvalidStateError, InvalidParameters) = 0;
+      void startFromListener(
+                             const Capabilities &remoteCapabilities,
+                             WORD remotePort
+                             ) throw (InvalidStateError, InvalidParameters) override;
 
-      virtual bool handleDataPacket(
-                                    const BYTE *buffer,
-                                    size_t bufferLengthInBytes
-                                    ) override;
+      bool handleDataPacket(
+                            const BYTE *buffer,
+                            size_t bufferLengthInBytes
+                            ) override;
 
-      virtual void notifyShutdown() override;
+      void notifyShutdown() override;
 
       // (duplicate) virtual bool isShuttingDown() const = 0;
       // (duplicate) virtual bool isShutdown() const = 0;
@@ -521,24 +525,38 @@ namespace ortc
       #pragma mark SCTPTransport => friend SCTPInit
       #pragma mark
 
-      virtual bool notifySendSCTPPacket(
-                                        const BYTE *buffer,
-                                        size_t bufferLengthInBytes
-                                        );
+      bool notifySendSCTPPacket(
+                                const BYTE *buffer,
+                                size_t bufferLengthInBytes
+                                );
+      
+      //-----------------------------------------------------------------------
+      #pragma mark
+      #pragma mark SCTPTransport => ISCTPTransportDelegate
+      #pragma mark
+
+      virtual void onSCTPTransportStateChange(
+                                              ISCTPTransportPtr transport,
+                                              ISCTPTransportTypes::States state
+                                              ) override;
+      virtual void onSCTPTransportDataChannel(
+                                              ISCTPTransportPtr transport,
+                                              IDataChannelPtr channel
+                                              ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark SCTPTransport => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark SCTPTransport => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       
       //-----------------------------------------------------------------------
@@ -546,8 +564,8 @@ namespace ortc
       #pragma mark SCTPTransport => ISCTPTransportAsyncDelegate
       #pragma mark
 
-      virtual void onIncomingPacket(SCTPPacketIncomingPtr packet) override;
-      virtual void onNotifiedToShutdown() override;
+      void onIncomingPacket(SCTPPacketIncomingPtr packet) override;
+      void onNotifiedToShutdown() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -561,10 +579,10 @@ namespace ortc
       #pragma mark SCTPTransport => ISecureTransportDelegate
       #pragma mark
 
-      virtual void onSecureTransportStateChanged(
-                                                 ISecureTransportPtr transport,
-                                                 ISecureTransportTypes::States state
-                                                 ) override;
+      void onSecureTransportStateChanged(
+                                         ISecureTransportPtr transport,
+                                         ISecureTransportTypes::States state
+                                         ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -620,8 +638,6 @@ namespace ortc
       struct TearAwayData
       {
         UseListenerPtr mListener;
-        ISCTPTransportDelegateWeakPtr mDelegate;
-        ISCTPTransportSubscriptionPtr mDefaultSubscription;
       };
 
     protected:
@@ -631,6 +647,7 @@ namespace ortc
       #pragma mark
 
       AutoPUID mID;
+      mutable std::atomic<bool> mObtainedID {};
       SCTPTransportWeakPtr mThisWeak;
       SCTPTransportPtr mGracefulShutdownReference;
 
@@ -638,6 +655,7 @@ namespace ortc
       size_t mMaxSessionsPerPort {};
 
       ISCTPTransportDelegateSubscriptions mSubscriptions;
+      ISCTPTransportSubscriptionPtr mDefaultSubscription;
 
       ISCTPTransportForDataChannelDelegateSubscriptions mDataChannelSubscriptions;
 
@@ -649,10 +667,18 @@ namespace ortc
 
       UseListenerWeakPtr mListener;
 
+      // If the transport is started after an existing transport was created
+      // by the remote party then two SCTP transports will exist pointing
+      // to the same local:remote mapping. This redirection forwards all
+      // requests to the existing object to prevent mapping confusion.
+      SCTPTransportPtr mRedirectToExistingTransport;
+      ISCTPTransportSubscriptionPtr mRedirectToExistingTransportSubscription;
+
       UseSecureTransportWeakPtr mSecureTransport; // no lock needed
       ISecureTransportSubscriptionPtr mSecureTransportSubscription;
 
       CapabilitiesPtr mCapabilities;
+      bool mStartedFromListener {};
 
       SCTPTransportWeakPtr *mThisSocket {};
       ISCTPTransportWeakPtr mTearAway;
@@ -674,6 +700,8 @@ namespace ortc
       DataChannelSessionMap mPendingResetSessions;
       DataChannelSessionMap mQueuedResetSessions;
 
+      DataChannelIDSet mFilterSessionRequests;
+
       bool mSettledRole {false};
       WORD mCurrentAllocationSessionID {};
       WORD mMinAllocationSessionID {0};
@@ -742,15 +770,15 @@ ZS_DECLARE_TEAR_AWAY_METHOD_CONST_RETURN_0(state, States)
 ZS_DECLARE_TEAR_AWAY_METHOD_CONST_RETURN_0(port, WORD)
 ZS_DECLARE_TEAR_AWAY_METHOD_CONST_RETURN_0(localPort, WORD)
 ZS_DECLARE_TEAR_AWAY_METHOD_CONST_RETURN_0(remotePort, Optional<WORD>)
-  virtual PromiseWithSocketOptionsPtr getOptions(const SocketOptions &inWhichOptions)
+  PromiseWithSocketOptionsPtr getOptions(const SocketOptions &inWhichOptions) override
   {
     return getDelegate()->getOptions(inWhichOptions);
   }
-  virtual PromisePtr setOptions(const SocketOptions &inOptions)
+  PromisePtr setOptions(const SocketOptions &inOptions) override
   {
     return getDelegate()->setOptions(inOptions);
   }
-  virtual void start(const Capabilities & v1, WORD v2) throw (ortc::InvalidStateError, ortc::InvalidParameters) override {
+  void start(const Capabilities & v1, WORD v2) throw (ortc::InvalidStateError, ortc::InvalidParameters) override {
     getDelegate()->start(v1, v2);
   }
 ZS_DECLARE_TEAR_AWAY_METHOD_0(stop)
diff --git a/ortc/internal/ortc_SCTPTransportListener.h b/ortc/internal/ortc_SCTPTransportListener.h
index 3c8ed827..2a8b96a5 100644
--- a/ortc/internal/ortc_SCTPTransportListener.h
+++ b/ortc/internal/ortc_SCTPTransportListener.h
@@ -234,30 +234,30 @@ namespace ortc
       #pragma mark SCTPTransport => ISCTPTransportListenerForSCTPTransport
       #pragma mark
 
-      virtual PUID getID() const override {return mID;}
-
-      virtual WORD allocateLocalPort() override;
-      virtual void deallocateLocalPort(WORD previouslyAllocatedLocalPort) override;
-
-      virtual void registerNewTransport(
-                                        IDTLSTransportPtr dtlsTransport,
-                                        UseSCTPTransportPtr &ioTransport,
-                                        WORD &ioLocalPort,
-                                        bool localPortWasPreallocated,
-                                        WORD &ioRemotePort
-                                        ) override;
-
-      virtual void announceTransport(
-                                     UseSCTPTransportPtr transport,
-                                     WORD localPort,
-                                     WORD remotePort
-                                     ) override;
-
-      virtual void notifyShutdown(
-                                  UseSCTPTransport &transport,
-                                  WORD localPort,
-                                  WORD remotePort
-                                  ) override;
+      PUID getID() const override {return mID;}
+
+      WORD allocateLocalPort() override;
+      void deallocateLocalPort(WORD previouslyAllocatedLocalPort) override;
+
+      void registerNewTransport(
+                                IDTLSTransportPtr dtlsTransport,
+                                UseSCTPTransportPtr &ioTransport,
+                                WORD &ioLocalPort,
+                                bool localPortWasPreallocated,
+                                WORD &ioRemotePort
+                                ) override;
+
+      void announceTransport(
+                             UseSCTPTransportPtr transport,
+                             WORD localPort,
+                             WORD remotePort
+                             ) override;
+
+      void notifyShutdown(
+                          UseSCTPTransport &transport,
+                          WORD localPort,
+                          WORD remotePort
+                          ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -270,10 +270,10 @@ namespace ortc
 
       static ForSecureTransportPtr create(UseSecureTransportPtr transport);
 
-      virtual bool handleDataPacket(
-                                    const BYTE *buffer,
-                                    size_t bufferLengthInBytes
-                                    ) override;
+      bool handleDataPacket(
+                            const BYTE *buffer,
+                            size_t bufferLengthInBytes
+                            ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -285,7 +285,7 @@ namespace ortc
       #pragma mark SCTPTransportListener => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
     protected:
       //-----------------------------------------------------------------------
diff --git a/ortc/internal/ortc_SRTPSDESTransport.h b/ortc/internal/ortc_SRTPSDESTransport.h
index 82566aaa..74b6db73 100644
--- a/ortc/internal/ortc_SRTPSDESTransport.h
+++ b/ortc/internal/ortc_SRTPSDESTransport.h
@@ -141,7 +141,7 @@ namespace ortc
       #pragma mark SRTPSDESTransport => IStatsProvider
       #pragma mark
 
-      virtual PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
+      PromiseWithStatsReportPtr getStats(const StatsTypeSet &stats = StatsTypeSet()) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -159,16 +159,16 @@ namespace ortc
 
       static SRTPSDESTransportPtr convert(IRTPTransportPtr rtpTransport);
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual ISRTPSDESTransportSubscriptionPtr subscribe(ISRTPSDESTransportDelegatePtr delegate) override;
+      ISRTPSDESTransportSubscriptionPtr subscribe(ISRTPSDESTransportDelegatePtr delegate) override;
 
-      virtual IICETransportPtr transport() const override;
-      virtual IICETransportPtr rtcpTransport() const override;
+      IICETransportPtr transport() const override;
+      IICETransportPtr rtcpTransport() const override;
 
       static ParametersPtr getLocalParameters();
 
-      virtual void stop() override;
+      void stop() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -186,9 +186,9 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const;
 
-      virtual ISecureTransportSubscriptionPtr subscribe(ISecureTransportDelegatePtr delegate) override;
+      ISecureTransportSubscriptionPtr subscribe(ISecureTransportDelegatePtr delegate) override;
 
-      virtual ISecureTransportTypes::States state(ISecureTransportTypes::States ignored) const override;
+      ISecureTransportTypes::States state(ISecureTransportTypes::States ignored) const override;
 
       virtual bool sendPacket(
                               IICETypes::Components sendOverICETransport,
@@ -197,7 +197,7 @@ namespace ortc
                               size_t bufferLengthInBytes
                               ) override;
 
-      virtual IICETransportPtr getICETransport() const override;
+      IICETransportPtr getICETransport() const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -229,20 +229,20 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const;
 
-      virtual void notifyAssociateTransportCreated(
-                                                   IICETypes::Components associatedComponent,
-                                                   ICETransportPtr assoicated
-                                                   ) override;
-
-      virtual bool handleReceivedPacket(
-                                        IICETypes::Components viaTransport,
-                                        const BYTE *buffer,
-                                        size_t bufferLengthInBytes
-                                        ) override;
-      virtual void handleReceivedSTUNPacket(
-                                            IICETypes::Components viaComponent,
-                                            STUNPacketPtr packet
-                                            ) override;
+      void notifyAssociateTransportCreated(
+                                           IICETypes::Components associatedComponent,
+                                           ICETransportPtr assoicated
+                                           ) override;
+
+      bool handleReceivedPacket(
+                                IICETypes::Components viaTransport,
+                                const BYTE *buffer,
+                                size_t bufferLengthInBytes
+                                ) override;
+      void handleReceivedSTUNPacket(
+                                    IICETypes::Components viaComponent,
+                                    STUNPacketPtr packet
+                                    ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -253,19 +253,19 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual bool sendEncryptedPacket(
-                                       IICETypes::Components sendOverICETransport,
-                                       IICETypes::Components packetType,
-                                       const BYTE *buffer,
-                                       size_t bufferLengthInBytes
-                                       ) override;
+      bool sendEncryptedPacket(
+                               IICETypes::Components sendOverICETransport,
+                               IICETypes::Components packetType,
+                               const BYTE *buffer,
+                               size_t bufferLengthInBytes
+                               ) override;
 
-      virtual bool handleReceivedDecryptedPacket(
-                                                 IICETypes::Components viaTransport,
-                                                 IICETypes::Components packetType,
-                                                 const BYTE *buffer,
-                                                 size_t bufferLengthInBytes
-                                                 ) override;
+      bool handleReceivedDecryptedPacket(
+                                         IICETypes::Components viaTransport,
+                                         IICETypes::Components packetType,
+                                         const BYTE *buffer,
+                                         size_t bufferLengthInBytes
+                                         ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -276,7 +276,7 @@ namespace ortc
 
       // (duplicate) virtual PUID getID() const = 0;
 
-      virtual RTPListenerPtr getListener() const override;
+      RTPListenerPtr getListener() const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -290,42 +290,42 @@ namespace ortc
       #pragma mark SRTPSDESTransport => ISRTPSDESTransportAsyncDelegate
       #pragma mark
 
-      virtual void onAttachRTCP() override;
+      void onAttachRTCP() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark SRTPSDESTransport => ISRTPTransportDelegate
       #pragma mark
 
-      virtual void onSRTPTransportLifetimeRemaining(
-                                                    ISRTPTransportPtr transport,
-                                                    ULONG leastLifetimeRemainingPercentageForAllKeys,
-                                                    ULONG overallLifetimeRemainingPercentage
-                                                    ) override;
+      void onSRTPTransportLifetimeRemaining(
+                                            ISRTPTransportPtr transport,
+                                            ULONG leastLifetimeRemainingPercentageForAllKeys,
+                                            ULONG overallLifetimeRemainingPercentage
+                                            ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark SRTPSDESTransport => IICETransportDelegate
       #pragma mark
 
-      virtual void onICETransportStateChange(
-                                             IICETransportPtr transport,
-                                             IICETransport::States state
-                                             ) override;
-
-      virtual void onICETransportCandidatePairAvailable(
-                                                        IICETransportPtr transport,
-                                                        CandidatePairPtr candidatePair
-                                                        ) override;
-      virtual void onICETransportCandidatePairGone(
-                                                   IICETransportPtr transport,
-                                                   CandidatePairPtr candidatePair
-                                                   ) override;
-
-      virtual void onICETransportCandidatePairChanged(
-                                                      IICETransportPtr transport,
-                                                      CandidatePairPtr candidatePair
-                                                      ) override;
+      void onICETransportStateChange(
+                                     IICETransportPtr transport,
+                                     IICETransport::States state
+                                     ) override;
+
+      void onICETransportCandidatePairAvailable(
+                                                IICETransportPtr transport,
+                                                CandidatePairPtr candidatePair
+                                                ) override;
+      void onICETransportCandidatePairGone(
+                                           IICETransportPtr transport,
+                                           CandidatePairPtr candidatePair
+                                           ) override;
+
+      void onICETransportCandidatePairChanged(
+                                              IICETransportPtr transport,
+                                              CandidatePairPtr candidatePair
+                                              ) override;
 
     protected:
       //-----------------------------------------------------------------------
diff --git a/ortc/internal/ortc_SRTPTransport.h b/ortc/internal/ortc_SRTPTransport.h
index 0f425510..23612e94 100644
--- a/ortc/internal/ortc_SRTPTransport.h
+++ b/ortc/internal/ortc_SRTPTransport.h
@@ -38,10 +38,7 @@
 #include <zsLib/MessageQueueAssociator.h>
 #include <zsLib/ITimer.h>
 
-// Forward declaration to avoid pulling in libsrtp headers here
-struct srtp_event_data_t;
-struct srtp_ctx_t;
-struct srtp_policy_t;
+#include "srtp.h"
 
 //#define ORTC_SETTING_SRTP_TRANSPORT_WARN_OF_KEY_LIFETIME_EXHAUGSTION_WHEN_REACH_PERCENTAGE_USSED "ortc/srtp/warm-key-lifetime-exhaustion-when-reach-percentage-used"
 
@@ -220,36 +217,36 @@ namespace ortc
                                      const CryptoParameters &decryptParameters
                                      ) throw(InvalidParameters);
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual ISRTPTransportSubscriptionPtr subscribe(ISRTPTransportDelegatePtr delegate) override;
+      ISRTPTransportSubscriptionPtr subscribe(ISRTPTransportDelegatePtr delegate) override;
 
-      virtual bool handleReceivedPacket(
-                                        IICETypes::Components viaTransport,
-                                        const BYTE *buffer,
-                                        size_t bufferLengthInBytes
-                                        ) override;
+      bool handleReceivedPacket(
+                                IICETypes::Components viaTransport,
+                                const BYTE *buffer,
+                                size_t bufferLengthInBytes
+                                ) override;
 
-      virtual bool sendPacket(
-                              IICETypes::Components sendOverICETransport,
-                              IICETypes::Components component,
-                              const BYTE *buffer,
-                              size_t bufferLengthInBytes
-                              ) override;
+      bool sendPacket(
+                      IICETypes::Components sendOverICETransport,
+                      IICETypes::Components component,
+                      const BYTE *buffer,
+                      size_t bufferLengthInBytes
+                      ) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark SRTPTransport => IWakeDelegate
       #pragma mark
 
-      virtual void onWake() override;
+      void onWake() override;
 
       //-----------------------------------------------------------------------
       #pragma mark
       #pragma mark SRTPTransport => ITimerDelegate
       #pragma mark
 
-      virtual void onTimer(ITimerPtr timer) override;
+      void onTimer(ITimerPtr timer) override;
 
       //-----------------------------------------------------------------------
       #pragma mark
diff --git a/ortc/internal/ortc_StatsReport.h b/ortc/internal/ortc_StatsReport.h
index 772277c8..a8cf0e07 100644
--- a/ortc/internal/ortc_StatsReport.h
+++ b/ortc/internal/ortc_StatsReport.h
@@ -143,10 +143,10 @@ namespace ortc
 
       static ElementPtr toDebug(StatsReportPtr report);
 
-      virtual PUID getID() const override {return mID;}
+      PUID getID() const override {return mID;}
 
-      virtual IDListPtr getStatesIDs() const override;
-      virtual StatsPtr getStats(const char *id) const override;
+      IDListPtr getStatesIDs() const override;
+      StatsPtr getStats(const char *id) const override;
 
       //-----------------------------------------------------------------------
       #pragma mark
@@ -165,7 +165,7 @@ namespace ortc
       #pragma mark StatsReport => IPromiseSettledDelegate
       #pragma mark
 
-      virtual void onPromiseSettled(PromisePtr promise) override;
+      void onPromiseSettled(PromisePtr promise) override;
 
     protected:
       //-----------------------------------------------------------------------
diff --git a/ortc/internal/platform.h b/ortc/internal/platform.h
index f699b0cc..dbc35ec2 100644
--- a/ortc/internal/platform.h
+++ b/ortc/internal/platform.h
@@ -47,8 +47,8 @@
 #ifdef _WIN32
 
 #ifdef __cplusplus_winrt
-#undef WINRT
-#define WINRT
+#undef WINUWP
+#define WINUWP
 #endif //__cplusplus_winrt
 
 
@@ -59,22 +59,22 @@
 #define HAVE_SPRINTF_S 1
 #define HAVE_GETADAPTERADDRESSES 1
 
-#ifdef WINRT
+#ifdef WINUWP
 
-// WINRT has these defined
+// WINUWP has these defined
 
-// WINRT does not support these features (but WIN32 does)
+// WINUWP does not support these features (but WIN32 does)
 #undef HAVE_GETADAPTERADDRESSES
 
 #if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
 
-// WINRT phone has these defined
+// WINUWP phone has these defined
 
-// WINRT phone odes not support these features (but WINRT does)
+// WINUWP phone odes not support these features (but WINUWP does)
 #undef HAVE_IPHLPAPI_H
 #endif //defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
 
-#endif //WINRT
+#endif //WINUWP
 
 #endif //_WIN32
 
@@ -108,21 +108,22 @@
 #endif //__APPPLE__
 
 
-#ifdef _LINUX
+#ifdef __linux__
 
 // Linux has these options
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_IFADDRS_H 1
 #define HAVE_NET_IF_H 1
-#define HAVE_NETINIT6_IN6_VAR_H 1
+//#define HAVE_NETINIT6_IN6_VAR_H 1
 #define HAVE_GETIFADDRS 1
 
-#ifdef _ANDROID
+#ifdef ANDROID
 
 // Android supports these additional features
 
 // Android does not support these features
 #undef HAVE_IFADDRS_H
+#undef HAVE_GETIFADDRS
 
-#endif //_ANDROID
-#endif //_LINUX
+#endif //ANDROID
+#endif //__linux__
diff --git a/ortc/internal/types.h b/ortc/internal/types.h
index d962b54f..47ef1c4b 100644
--- a/ortc/internal/types.h
+++ b/ortc/internal/types.h
@@ -109,9 +109,6 @@ namespace ortc
     #pragma mark (forwards)
     #pragma mark
 
-    ZS_DECLARE_CLASS_PTR(RTPPacket);
-    ZS_DECLARE_CLASS_PTR(RTCPPacket);
-
     ZS_DECLARE_INTERACTION_PTR(IDataTransportForSecureTransport);
     ZS_DECLARE_INTERACTION_PTR(ISecureTransport);
     ZS_DECLARE_INTERACTION_PTR(ISecureTransportForRTPSender);
@@ -119,6 +116,20 @@ namespace ortc
     ZS_DECLARE_INTERACTION_PTR(ISecureTransportForICETransport);
     ZS_DECLARE_INTERACTION_PTR(ISecureTransportForRTPListener);
     ZS_DECLARE_INTERACTION_PTR(ISRTPTransport);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDevice);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceCapture);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceCaptureAudio);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceCaptureVideo);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceRender);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceRenderAudio);
+    ZS_DECLARE_INTERACTION_PTR(IMediaDeviceRenderVideo);
+    ZS_DECLARE_INTERACTION_PTR(IRTP);
+    ZS_DECLARE_INTERACTION_PTR(IRTPDecoder);
+    ZS_DECLARE_INTERACTION_PTR(IRTPDecoderAudio);
+    ZS_DECLARE_INTERACTION_PTR(IRTPDecoderVideo);
+    ZS_DECLARE_INTERACTION_PTR(IRTPEncoder);
+    ZS_DECLARE_INTERACTION_PTR(IRTPEncoderAudio);
+    ZS_DECLARE_INTERACTION_PTR(IRTPEncoderVideo);
 
     ZS_DECLARE_CLASS_PTR(ORTC);
     ZS_DECLARE_CLASS_PTR(Certificate);
@@ -130,10 +141,21 @@ namespace ortc
     ZS_DECLARE_CLASS_PTR(ICETransport);
     ZS_DECLARE_CLASS_PTR(ICETransportController);
     ZS_DECLARE_CLASS_PTR(Identity);
+    ZS_DECLARE_CLASS_PTR(MediaChannelTraceHelper);
+    ZS_DECLARE_CLASS_PTR(MediaDeviceCaptureAudio);
+    ZS_DECLARE_CLASS_PTR(MediaDeviceCaptureVideo);
+    ZS_DECLARE_CLASS_PTR(MediaDeviceRenderAudio);
     ZS_DECLARE_CLASS_PTR(MediaDevices);
     ZS_DECLARE_CLASS_PTR(MediaStreamTrack);
+    ZS_DECLARE_CLASS_PTR(MediaStreamTrackChannel);
+    ZS_DECLARE_CLASS_PTR(MediaStreamTrackSubscriberMedia);
+    ZS_DECLARE_CLASS_PTR(MediaStreamTrackSubscriberRTP);
+    ZS_DECLARE_CLASS_PTR(MediaEngine);
+    ZS_DECLARE_CLASS_PTR(RTPDecoderAudio);
+    ZS_DECLARE_CLASS_PTR(RTPDecoderVideo);
+    ZS_DECLARE_CLASS_PTR(RTPEncoderAudio);
+    ZS_DECLARE_CLASS_PTR(RTPEncoderVideo);
     ZS_DECLARE_CLASS_PTR(RTPListener);
-    ZS_DECLARE_CLASS_PTR(RTPMediaEngine);
     ZS_DECLARE_CLASS_PTR(RTPReceiver);
     ZS_DECLARE_CLASS_PTR(RTPReceiverChannel);
     ZS_DECLARE_CLASS_PTR(RTPReceiverChannelAudio);
@@ -149,7 +171,22 @@ namespace ortc
 
     ZS_DECLARE_INTERACTION_PROXY(ISecureTransportDelegate);
     ZS_DECLARE_INTERACTION_PROXY(ISRTPTransportDelegate);
+    ZS_DECLARE_INTERACTION_PROXY(ISecureTransportDelegate);
+
+    ZS_DECLARE_INTERACTION_PROXY(IMediaDeviceCaptureDelegate);
+    ZS_DECLARE_INTERACTION_PROXY(IMediaDeviceRenderDelegate);
+    ZS_DECLARE_INTERACTION_PROXY(IRTPDecoderDelegate);
+    ZS_DECLARE_INTERACTION_PROXY(IRTPEncoderDelegate);
+
+    ZS_DECLARE_INTERACTION_PROXY(IMediaStreamTrackFeedbackDelegate);
+    ZS_DECLARE_INTERACTION_PROXY(IMediaStreamTrackRTPDelegate);
 
+    ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IMediaDeviceCaptureSubscription, IMediaDeviceCaptureDelegate);
+    ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IMediaDeviceRenderSubscription, IMediaDeviceRenderDelegate);
+    ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IMediaStreamTrackFeedbackSubscription, IMediaStreamTrackFeedbackDelegate);
+    ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IMediaStreamTrackRTPSubscription, IMediaStreamTrackRTPDelegate);
+    ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IRTPDecoderSubscription, IRTPDecoderDelegate);
+    ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IRTPEncoderSubscription, IRTPEncoderDelegate);
     ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(ISRTPTransportSubscription, ISRTPTransportDelegate);
     ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(ISecureTransportSubscription, ISecureTransportDelegate);
   }
diff --git a/ortc/ortc.h b/ortc/ortc.h
index ed9363ae..721310f4 100644
--- a/ortc/ortc.h
+++ b/ortc/ortc.h
@@ -46,7 +46,9 @@
 #include <ortc/IICETransport.h>
 #include <ortc/IICETransportController.h>
 #include <ortc/IMediaDevices.h>
+#include <ortc/IMediaElement.h>
 #include <ortc/IMediaStreamTrack.h>
+#include <ortc/IMediaStreamTrackSelector.h>
 #include <ortc/IRTPTypes.h>
 #include <ortc/IRTPListener.h>
 #include <ortc/IRTPSender.h>
diff --git a/ortc/test/TestDTLS.cpp b/ortc/test/TestDTLS.cpp
index 7edb2164..8b1d25f2 100644
--- a/ortc/test/TestDTLS.cpp
+++ b/ortc/test/TestDTLS.cpp
@@ -44,7 +44,7 @@
 #include "config.h"
 #include "testing.h"
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
diff --git a/ortc/test/TestICEGatherer.cpp b/ortc/test/TestICEGatherer.cpp
index 6ce88c57..72ed569a 100644
--- a/ortc/test/TestICEGatherer.cpp
+++ b/ortc/test/TestICEGatherer.cpp
@@ -41,7 +41,7 @@
 #include "config.h"
 #include "testing.h"
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
diff --git a/ortc/test/TestICETransport.cpp b/ortc/test/TestICETransport.cpp
index 5d1d3747..743a73fa 100644
--- a/ortc/test/TestICETransport.cpp
+++ b/ortc/test/TestICETransport.cpp
@@ -42,7 +42,7 @@
 #include "config.h"
 #include "testing.h"
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
diff --git a/ortc/test/TestMediaStreamTrack.cpp b/ortc/test/TestMediaStreamTrack.cpp
index f52126ef..bac79494 100644
--- a/ortc/test/TestMediaStreamTrack.cpp
+++ b/ortc/test/TestMediaStreamTrack.cpp
@@ -42,10 +42,10 @@
 #include "config.h"
 #include "testing.h"
 
-#include <webrtc/base/logging.h>
+#include <webrtc/rtc_base/logging.h>
 #include <webrtc/system_wrappers/include/trace.h>
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
@@ -550,7 +550,7 @@ namespace ortc
         webrtc::VideoFrame frame;
         frame.CreateEmptyFrame(width, height, width, width / 2, width / 2);
 
-        uint8_t* yBuffer = frame.buffer(webrtc::kYPlane);
+        uint8_t* yBuffer = frame.video_frame_buffer()->MutableDataY();//buffer(webrtc::kYPlane);
         for (int i = 0; i < height; i++)
         {
           memset(yBuffer, 0, width);
@@ -560,8 +560,8 @@ namespace ortc
           yBuffer += width;
         }
 
-        uint8_t* uBuffer = frame.buffer(webrtc::kUPlane);
-        uint8_t* vBuffer = frame.buffer(webrtc::kVPlane);
+        uint8_t* uBuffer = frame.video_frame_buffer()->MutableDataU();//frame.buffer(webrtc::kUPlane);
+        uint8_t* vBuffer = frame.video_frame_buffer()->MutableDataV();//frame.buffer(webrtc::kVPlane);
         for (int i = 0; i < height / 2; i++)
         {
           memset(uBuffer, 128, width / 2);
diff --git a/ortc/test/TestRTCPPacket.cpp b/ortc/test/TestRTCPPacket.cpp
index 6ff29b0f..bd8752bd 100644
--- a/ortc/test/TestRTCPPacket.cpp
+++ b/ortc/test/TestRTCPPacket.cpp
@@ -42,7 +42,7 @@
 #include "config.h"
 #include "testing.h"
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using std::make_shared;
 
diff --git a/ortc/test/TestRTPChannel.cpp b/ortc/test/TestRTPChannel.cpp
index 28f48e45..fc26c037 100644
--- a/ortc/test/TestRTPChannel.cpp
+++ b/ortc/test/TestRTPChannel.cpp
@@ -43,7 +43,7 @@
 #include "config.h"
 #include "testing.h"
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
diff --git a/ortc/test/TestRTPChannelAudio.cpp b/ortc/test/TestRTPChannelAudio.cpp
index c16434bd..de6e8f6a 100644
--- a/ortc/test/TestRTPChannelAudio.cpp
+++ b/ortc/test/TestRTPChannelAudio.cpp
@@ -43,11 +43,11 @@
 #include "config.h"
 #include "testing.h"
 
-#include <webrtc/base/logging.h>
+#include <webrtc/rtc_base/logging.h>
 #include <webrtc/system_wrappers/include/trace.h>
 #include <webrtc/modules/audio_device/audio_device_impl.h>
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
diff --git a/ortc/test/TestRTPChannelVideo.cpp b/ortc/test/TestRTPChannelVideo.cpp
index f5b3139f..7ecafa20 100644
--- a/ortc/test/TestRTPChannelVideo.cpp
+++ b/ortc/test/TestRTPChannelVideo.cpp
@@ -43,11 +43,11 @@
 #include "config.h"
 #include "testing.h"
 
-#include <webrtc/base/logging.h>
+#include <webrtc/rtc_base/logging.h>
 #include <webrtc/system_wrappers/include/trace.h>
 #include <webrtc/modules/video_capture/video_capture_factory.h>
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
@@ -297,8 +297,9 @@ namespace ortc
       {
         AutoRecursiveLock lock(*this);
 
-        if (mVideoRendererCallback)
-          mVideoRendererCallback->RenderFrame(1, videoFrame);
+        //Renderer is not in use anymore
+        //if (mVideoRendererCallback)
+        //  mVideoRendererCallback->RenderFrame(1, videoFrame);
 
         auto senderChannel = mSenderChannel.lock();
         //if (senderChannel)
diff --git a/ortc/test/TestRTPListener.cpp b/ortc/test/TestRTPListener.cpp
index ab74df49..38fd19a1 100644
--- a/ortc/test/TestRTPListener.cpp
+++ b/ortc/test/TestRTPListener.cpp
@@ -43,7 +43,7 @@
 #include "config.h"
 #include "testing.h"
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
diff --git a/ortc/test/TestRTPPacket.cpp b/ortc/test/TestRTPPacket.cpp
index 3f0ee14e..299fc0a6 100644
--- a/ortc/test/TestRTPPacket.cpp
+++ b/ortc/test/TestRTPPacket.cpp
@@ -45,7 +45,7 @@
 #include "config.h"
 #include "testing.h"
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using std::make_shared;
 
diff --git a/ortc/test/TestRTPReceiver.cpp b/ortc/test/TestRTPReceiver.cpp
index 41cb29aa..4a92c9ed 100644
--- a/ortc/test/TestRTPReceiver.cpp
+++ b/ortc/test/TestRTPReceiver.cpp
@@ -43,7 +43,7 @@
 #include "config.h"
 #include "testing.h"
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
diff --git a/ortc/test/TestRTPSender.cpp b/ortc/test/TestRTPSender.cpp
index 30ea5328..3f4d1d3b 100644
--- a/ortc/test/TestRTPSender.cpp
+++ b/ortc/test/TestRTPSender.cpp
@@ -43,7 +43,7 @@
 #include "config.h"
 #include "testing.h"
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
diff --git a/ortc/test/TestSCTP.cpp b/ortc/test/TestSCTP.cpp
index b6d5a72a..0c49c86c 100644
--- a/ortc/test/TestSCTP.cpp
+++ b/ortc/test/TestSCTP.cpp
@@ -42,7 +42,7 @@
 #include "testing.h"
 #include <zsLib/date.h>
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::String;
 using zsLib::ULONG;
diff --git a/ortc/test/TestSRTP.cpp b/ortc/test/TestSRTP.cpp
index 0c25094c..93642010 100644
--- a/ortc/test/TestSRTP.cpp
+++ b/ortc/test/TestSRTP.cpp
@@ -48,7 +48,7 @@
 #include "config.h"
 #include "testing.h"
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 using zsLib::BYTE;
 using zsLib::String;
diff --git a/ortc/test/TestSetup.cpp b/ortc/test/TestSetup.cpp
index 21e9e968..cf5522a7 100644
--- a/ortc/test/TestSetup.cpp
+++ b/ortc/test/TestSetup.cpp
@@ -58,23 +58,23 @@
 #include <Iphlpapi.h>
 #endif //HAVE_IPHLPAPI_H
 
-#ifdef WINRT
+#ifdef WINUWP
 using namespace Windows::Networking::Connectivity;
-#endif //WINRT
+#endif //WINUWP
 
-#ifdef WINRT
+#ifdef WINUWP
 #include <ppltasks.h>
-#endif //WINRT
+#endif //WINUWP
 
-#if defined(WINRT) && !defined(HAVE_GETADAPTERADDRESSES)
+#if defined(WINUWP) && !defined(HAVE_GETADAPTERADDRESSES)
 using Windows::Foundation::Collections::IVectorView;
 using namespace concurrency;
 using Windows::Networking::HostNameType;
 using namespace Windows::UI::Core;
-#endif //defined(WINRT) && !defined(HAVE_GETADAPTERADDRESSES)
+#endif //defined(WINUWP) && !defined(HAVE_GETADAPTERADDRESSES)
 
 
-namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_DECLARE_SUBSYSTEM(org_ortc_test) } }
 
 //using zsLib::String;
 //using zsLib::ULONG;
@@ -109,7 +109,7 @@ namespace ortc
         {
           calculateInterfaces_ifaddr();
           calculateInterfaces_Win32();
-          calculateInterfaces_WinRT();
+          calculateInterfaces_WinUWP();
 
           UseSettings::setUInt("tester/total-host-ips", mTotalHostIPs);
         }
@@ -278,16 +278,16 @@ namespace ortc
         }
 
         //-------------------------------------------------------------------------
-        void calculateInterfaces_WinRT()
+        void calculateInterfaces_WinUWP()
         {
-#if defined(WINRT) && !defined(HAVE_GETADAPTERADDRESSES)
+#if defined(WINUWP) && !defined(HAVE_GETADAPTERADDRESSES)
           typedef Windows::Networking::Sockets::DatagramSocket DatagramSocket;
           typedef Windows::Networking::HostName HostName;
           typedef Windows::Networking::EndpointPair EndpointPair;
 
           // http://stackoverflow.com/questions/10336521/query-local-ip-address
 
-          // Use WinRT GetHostNames to search for IP addresses
+          // Use WinUWP GetHostNames to search for IP addresses
       {
         typedef std::map<String, bool> HostNameMap;
         typedef std::list<ConnectionProfile ^> ConnectionProfileList;
@@ -533,7 +533,7 @@ namespace ortc
 
         mTotalHostIPs = mFoundIPs.size();
       }
-#endif //defined(WINRT) && !defined(HAVE_GETADAPTERADDRESSES)
+#endif //defined(WINUWP) && !defined(HAVE_GETADAPTERADDRESSES)
         }
 
 
@@ -564,9 +564,9 @@ namespace ortc
         std::atomic<size_t> mDone {};
         std::atomic<size_t> mTotalHostIPs {};
 
-#if defined(WINRT) && !defined(HAVE_GETADAPTERADDRESSES)
+#if defined(WINUWP) && !defined(HAVE_GETADAPTERADDRESSES)
         concurrency::cancellation_token_source mCancellationTokenSource;
-#endif //defined(WINRT) && !defined(HAVE_GETADAPTERADDRESSES)
+#endif //defined(WINUWP) && !defined(HAVE_GETADAPTERADDRESSES)
       };
 
     }
diff --git a/ortc/test/testing.cpp b/ortc/test/testing.cpp
index c448fd8f..74887ece 100644
--- a/ortc/test/testing.cpp
+++ b/ortc/test/testing.cpp
@@ -39,7 +39,7 @@
 
 #include <iostream>
 
-namespace ortc { namespace test { ZS_IMPLEMENT_SUBSYSTEM(ortc_test) } }
+namespace ortc { namespace test { ZS_IMPLEMENT_SUBSYSTEM(org_ortc_test) } }
 
 
 #ifdef _WIN32
diff --git a/ortc/types.h b/ortc/types.h
index 505bfb3a..8f9ce745 100644
--- a/ortc/types.h
+++ b/ortc/types.h
@@ -31,6 +31,10 @@
 
 #pragma once
 
+#ifdef _WIN32
+#pragma warning(disable:4290)
+#endif
+
 #include <ortc/services/types.h>
 
 #include <zsLib/Proxy.h>
@@ -88,8 +92,8 @@ namespace ortc
 
     ErrorAny(WORD errorCode, const char *reason, const char *name = NULL) :
       mErrorCode(errorCode),
-      mReason(reason),
-      mName(name) {}
+      mName(name),
+      mReason(reason) {}
 
     static ErrorAnyPtr create(WORD errorCode, const char *reason, const char *name = NULL) { return make_shared<ErrorAny>(errorCode, reason, name); }
   };
@@ -126,6 +130,9 @@ namespace ortc
   #pragma mark (forwards)
   #pragma mark
 
+  ZS_DECLARE_CLASS_PTR(RTPPacket);
+  ZS_DECLARE_CLASS_PTR(RTCPPacket);
+
   interaction IRTPTransport
   {
     virtual PUID getID() const = 0;
@@ -148,8 +155,9 @@ namespace ortc
   ZS_DECLARE_INTERACTION_PTR(IICETransport);
   ZS_DECLARE_INTERACTION_PTR(IICETransportController);
   ZS_DECLARE_INTERACTION_PTR(IMediaDevices);
-  ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackRenderCallback);
+  ZS_DECLARE_INTERACTION_PTR(IMediaElement);
   ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrack);
+  ZS_DECLARE_INTERACTION_PTR(IMediaStreamTrackSelector);
   ZS_DECLARE_INTERACTION_PTR(IRTPListener);
   ZS_DECLARE_INTERACTION_PTR(IRTPSender);
   ZS_DECLARE_INTERACTION_PTR(IRTPReceiver);
@@ -168,7 +176,11 @@ namespace ortc
   ZS_DECLARE_INTERACTION_PROXY(IICETransportDelegate);
   ZS_DECLARE_INTERACTION_PROXY(IRTPListenerDelegate);
   ZS_DECLARE_INTERACTION_PROXY(IMediaDevicesDelegate);
+  ZS_DECLARE_INTERACTION_PROXY(IMediaElementDelegate);
   ZS_DECLARE_INTERACTION_PROXY(IMediaStreamTrackDelegate);
+  ZS_DECLARE_INTERACTION_PROXY(IMediaStreamTrackSyncMediaDelegate);
+  ZS_DECLARE_INTERACTION_PROXY(IMediaStreamTrackAsyncMediaDelegate);
+  ZS_DECLARE_INTERACTION_PROXY(IMediaStreamTrackSelectorDelegate);
   ZS_DECLARE_INTERACTION_PROXY(IRTPSenderDelegate);
   ZS_DECLARE_INTERACTION_PROXY(IRTPReceiverDelegate);
   ZS_DECLARE_INTERACTION_PROXY(ISCTPTransportDelegate);
@@ -182,6 +194,10 @@ namespace ortc
   ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IICETransportSubscription, IICETransportDelegate);
   ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IMediaDevicesSubscription, IMediaDevicesDelegate);
   ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IMediaStreamTrackSubscription, IMediaStreamTrackDelegate);
+  ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IMediaStreamTrackMediaSubscription, IMediaStreamTrackSyncMediaDelegate);
+  ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IMediaStreamTrackMediaSubscription, IMediaStreamTrackAsyncMediaDelegate);
+  ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IMediaStreamTrackSelectorSubscription, IMediaStreamTrackSelectorDelegate);
+  ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IMediaElementSubscription, IMediaElementDelegate);
   ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IRTPListenerSubscription, IRTPListenerDelegate);
   ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IRTPSenderSubscription, IRTPSenderDelegate);
   ZS_DECLARE_INTERACTION_PROXY_SUBSCRIPTION(IRTPReceiverSubscription, IRTPReceiverDelegate);
@@ -197,42 +213,4 @@ namespace ortc
   #pragma mark
   #pragma mark (mixed case versions of interfaces are available externally)
   #pragma mark
-
-#ifndef ORTCLIB_INTERNAL
-#if 0
-  ZS_DECLARE_TYPEDEF_PTR(IDTLSTransport, IDtlsTransport);
-  ZS_DECLARE_TYPEDEF_PTR(IDTMFSender, IDtmfSender);
-  ZS_DECLARE_TYPEDEF_PTR(IORTC, IOrtc);
-  ZS_DECLARE_TYPEDEF_PTR(IICEGatherer, IIceGatherer);
-  ZS_DECLARE_TYPEDEF_PTR(IICETransport, IIceTransport);
-  ZS_DECLARE_TYPEDEF_PTR(IICETransportController, IIceTransportController);
-  ZS_DECLARE_TYPEDEF_PTR(IRTPListener, IRtpListener);
-  ZS_DECLARE_TYPEDEF_PTR(IRTPSender, IRtpSender);
-  ZS_DECLARE_TYPEDEF_PTR(IRTPReceiver, IRtpReceiver);
-  ZS_DECLARE_TYPEDEF_PTR(IRTPTransport, IRtpTransport);
-  ZS_DECLARE_TYPEDEF_PTR(IRTCPTransport, IRtcpTransport);
-  ZS_DECLARE_TYPEDEF_PTR(ISCTPTransport, ISctpTransport);
-  ZS_DECLARE_TYPEDEF_PTR(ISRTPSDESTransport, ISrtpSdesTransport);
-
-  ZS_DECLARE_TYPEDEF_PTR(IDTLSTransportDelegate, IDtlsTransportDelegate);
-  ZS_DECLARE_TYPEDEF_PTR(IDTMFSenderDelegate, IDtmfSenderDelegate);
-  ZS_DECLARE_TYPEDEF_PTR(IICEGathererDelegate, IIceGathererDelegate);
-  ZS_DECLARE_TYPEDEF_PTR(IICETransportDelegate, IIceTransportDelegate);
-  ZS_DECLARE_TYPEDEF_PTR(IRTPListenerDelegate, IRtpListenerDelegate);
-  ZS_DECLARE_TYPEDEF_PTR(IRTPSenderDelegate, IRtpSenderDelegate);
-  ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverDelegate, IRtpReceiverDelegate);
-  ZS_DECLARE_TYPEDEF_PTR(ISCTPTransportDelegate, ISctpTransportDelegate);
-  ZS_DECLARE_TYPEDEF_PTR(ISRTPSDESTransportDelegate, ISrtpSdesTransportDelegate);
-
-  ZS_DECLARE_TYPEDEF_PTR(IDTLSTransportSubscription, IDtlsTransportSubscription);
-  ZS_DECLARE_TYPEDEF_PTR(IDTMFSenderSubscription, IDtmfSenderSubscription);
-  ZS_DECLARE_TYPEDEF_PTR(IICEGathererSubscription, IIceGathererSubscription);
-  ZS_DECLARE_TYPEDEF_PTR(IICETransportSubscription, IIceTransportSubscription);
-  ZS_DECLARE_TYPEDEF_PTR(IRTPListenerSubscription, IRtpListenerSubscription);
-  ZS_DECLARE_TYPEDEF_PTR(IRTPSenderSubscription, IRtpSenderSubscription);
-  ZS_DECLARE_TYPEDEF_PTR(IRTPReceiverSubscription, IRtpReceiverSubscription);
-  ZS_DECLARE_TYPEDEF_PTR(ISCTPTransportSubscription, ISctpTransportSubscription);
-  ZS_DECLARE_TYPEDEF_PTR(ISRTPSDESTransportSubscription, ISrtpSdesTransportSubscription);
-#endif //0
-#endif //ORTCLIB_INTERNAL
 }
diff --git a/projects/msvs/ortclib-c.Universal/dllmain.cpp b/projects/msvs/ortclib-c.Universal/dllmain.cpp
new file mode 100644
index 00000000..5ecb7122
--- /dev/null
+++ b/projects/msvs/ortclib-c.Universal/dllmain.cpp
@@ -0,0 +1,21 @@
+
+#include "targetver.h"
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <windows.h>
+
+BOOL APIENTRY DllMain(HMODULE /* hModule */, DWORD ul_reason_for_call, LPVOID /* lpReserved */)
+{
+    switch (ul_reason_for_call)
+    {
+    case DLL_PROCESS_ATTACH:
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+    return TRUE;
+}
diff --git a/projects/msvs/ortclib-c.Universal/ortclib-c.vcxproj b/projects/msvs/ortclib-c.Universal/ortclib-c.vcxproj
new file mode 100644
index 00000000..15c67adc
--- /dev/null
+++ b/projects/msvs/ortclib-c.Universal/ortclib-c.vcxproj
@@ -0,0 +1,596 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{ff79354e-6381-405e-a16c-659b02e617e5}</ProjectGuid>
+    <Keyword>DynamicLibrary</Keyword>
+    <RootNamespace>ortclib_c</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>libOrtc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>libOrtc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>libOrtc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>libOrtc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>libOrtc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>libOrtc</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068</DisableSpecificWarnings>
+      <PreprocessorDefinitions>ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc\WEBRTC_BUILD\ortc\$(Configuration)\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>webrtc.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/defaultlib:vccorlibd.lib /defaultlib:msvcrtd.lib %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068</DisableSpecificWarnings>
+      <PreprocessorDefinitions>ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc\WEBRTC_BUILD\ortc\$(Configuration)\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>webrtc.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/defaultlib:vccorlib.lib /defaultlib:msvcrt.lib %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068</DisableSpecificWarnings>
+      <PreprocessorDefinitions>ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc\WEBRTC_BUILD\ortc\$(Configuration)\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>webrtc.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/defaultlib:vccorlibd.lib /defaultlib:msvcrtd.lib %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068</DisableSpecificWarnings>
+      <PreprocessorDefinitions>ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc\WEBRTC_BUILD\ortc\$(Configuration)\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>webrtc.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/defaultlib:vccorlib.lib /defaultlib:msvcrt.lib %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068</DisableSpecificWarnings>
+      <PreprocessorDefinitions>ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc\WEBRTC_BUILD\ortc\$(Configuration)\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>webrtc.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/defaultlib:vccorlibd.lib /defaultlib:msvcrtd.lib %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068</DisableSpecificWarnings>
+      <PreprocessorDefinitions>ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc\WEBRTC_BUILD\ortc\$(Configuration)\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>webrtc.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/defaultlib:vccorlib.lib /defaultlib:msvcrt.lib %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_helpers.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_MediaStream.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnection.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCTrackEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBoolean.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBooleanParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDouble.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLong.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainString.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainStringParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Dispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_DoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Error.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Json.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Logger.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_LongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaControl.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDeviceInfo.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDevices.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraintSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSupportedConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MessageQueue.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLib.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLibWithDispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificateStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCodec.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannel.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsCertificateBinary.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsFingerprint.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfToneChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateAttributes.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateComplete.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePair.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateCompleteEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherInterfacePolicy.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceServer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportController.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentity.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityAssertion.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityResult.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCInboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamTrackStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMessageEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCOutboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpFeedback.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapability.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpContributingSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpEncodingParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtension.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtensionParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpReceiver.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRedCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpUnhandledEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListenerEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesCryptoParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesKeyParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSsrcConflictEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsProvider.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsReport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsTypeSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Settings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_StringOrStringList.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\types.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_helpers.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_MediaStream.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCAnswerOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCConfiguration.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCIceCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferAnswerOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnection.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescription.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCTrackEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBoolean.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBooleanParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDouble.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDoubleRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLong.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLongRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainString.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainStringParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Dispatcher.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_DoubleRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Error.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Json.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Logger.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_LongRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaControl.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDeviceInfo.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDevices.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaSource.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamTrack.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraintSet.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSupportedConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MessageQueue.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLib.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLibWithDispatcher.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedError.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificateStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCodec.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannel.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsCertificateBinary.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsFingerprint.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfToneChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateAttributes.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateComplete.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePair.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherer.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererIceErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherInterfacePolicy.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceServer.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportController.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentity.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityAssertion.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityError.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityResult.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCInboundRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamTrackStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMessageEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCOutboundRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpFeedback.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapability.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpContributingSource.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpEncodingParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFecParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtension.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtensionParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpListener.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpReceiver.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRedCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpUnhandledEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListener.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListenerEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesCryptoParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesKeyParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSsrcConflictEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsProvider.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsReport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsTypeSet.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Settings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_StringOrStringList.cpp" />
+    <ClCompile Include="dllmain.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\cryptopp\projects\msvs\cryptopp.Universal\cryptopp.vcxproj">
+      <Project>{cc14ffe5-0018-4d8d-bc2c-c93477ce081c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\idnkit\projects\msvc\idnkit.Universal\idnkit.vcxproj">
+      <Project>{b236bf5a-561d-4720-babf-f6119adf5793}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\ortclib-services-cpp\projects\msvs\ortclib.services.Universal\ortclib.services.vcxproj">
+      <Project>{cc03fba3-9028-47ad-b931-13b12db368f8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\udns\projects\msvs\udns.Universal\udns.vcxproj">
+      <Project>{6c13dfe2-3aa7-40b9-919c-5e95e47fc321}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\zsLib-eventing\projects\msvc\zsLib.Eventing.Universal\zsLib.Eventing.vcxproj">
+      <Project>{a19b7d13-a6ee-43bb-a913-aeb34f91bf98}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\zsLib\projects\msvs\zsLib.Universal\zsLib.vcxproj">
+      <Project>{55555c53-504f-4237-abc0-b2f59558a0e9}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\ortclib.Universal\ortclib.vcxproj">
+      <Project>{83e6cc72-ebc5-4c0c-b6a6-2d67a3c1e8a9}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\ortclib.wrapper.Universal\ortclib.wrapper.vcxproj">
+      <Project>{f370ffcf-6d70-40a3-853d-a272c4df2014}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/msvs/ortclib-c.Universal/ortclib-c.vcxproj.filters b/projects/msvs/ortclib-c.Universal/ortclib-c.vcxproj.filters
new file mode 100644
index 00000000..5139fb72
--- /dev/null
+++ b/projects/msvs/ortclib-c.Universal/ortclib-c.vcxproj.filters
@@ -0,0 +1,969 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="c">
+      <UniqueIdentifier>{6c756899-f026-418e-9288-8899d3d12eff}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCAnswerOptions.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCCapabilityOptions.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCConfiguration.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCIceCandidate.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferAnswerOptions.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferOptions.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnection.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescription.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCTrackEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBoolean.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBooleanParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDouble.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDoubleRange.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLong.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLongRange.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainString.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainStringParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Dispatcher.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_DoubleRange.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Error.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ErrorEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Json.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Logger.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_LongRange.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaControl.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDeviceInfo.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDevices.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaSource.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamConstraints.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamTrack.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackCapabilities.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraints.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraintSet.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSettings.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSupportedConstraints.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MessageQueue.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLib.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLibWithDispatcher.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedError.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedErrorEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificate.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificateStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCodec.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannel.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStateChangeEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataTransport.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsCertificateBinary.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsFingerprint.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransport.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfSender.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfToneChangeEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidate.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateAttributes.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateComplete.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePair.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairChangeEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherer.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidate.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererIceErrorEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStateChangeEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherInterfacePolicy.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherOptions.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceServer.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransport.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportController.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportOptions.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStateChangeEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentity.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityAssertion.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityError.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityResult.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCInboundRtpStreamStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamTrackStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMessageEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCOutboundRtpStreamStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpFeedback.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpTransport.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCapabilities.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapability.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityOptions.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameterSettings.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpContributingSource.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpEncodingParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFecParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecParameterSettings.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtension.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtensionParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpListener.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpReceiver.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRedCodecParameterSettings.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpSender.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpStreamStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpTransport.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpUnhandledEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpCapabilities.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransport.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListener.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListenerEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStateChangeEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesCryptoParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesKeyParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesParameters.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransport.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpTransportStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSsrcConflictEvent.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStats.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsProvider.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsReport.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsTypeSet.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Settings.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_StringOrStringList.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_helpers.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_MediaStream.cpp">
+      <Filter>c</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_MediaStream.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCAnswerOptions.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCCapabilityOptions.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCConfiguration.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCIceCandidate.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferAnswerOptions.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferOptions.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnection.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescription.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescription.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransport.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCTrackEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBoolean.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBooleanParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDouble.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDoubleRange.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLong.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLongRange.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainString.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainStringParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Dispatcher.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_DoubleRange.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Error.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ErrorEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Json.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Logger.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_LongRange.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaControl.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDeviceInfo.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDevices.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaSource.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamConstraints.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamTrack.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackCapabilities.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraints.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraintSet.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSettings.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSupportedConstraints.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MessageQueue.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLib.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLibWithDispatcher.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedError.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedErrorEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificate.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificateStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCodec.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannel.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStateChangeEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataTransport.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsCertificateBinary.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsFingerprint.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransport.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStateChangeEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfSender.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfToneChangeEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidate.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateAttributes.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateComplete.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePair.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairChangeEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherer.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidate.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateCompleteEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererIceErrorEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStateChangeEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherInterfacePolicy.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherOptions.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceServer.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransport.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportController.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportOptions.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStateChangeEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentity.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityAssertion.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityError.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityResult.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCInboundRtpStreamStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamTrackStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMessageEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCOutboundRtpStreamStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpFeedback.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpTransport.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCapabilities.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapability.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityOptions.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameterSettings.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpContributingSource.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpEncodingParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFecParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecCapabilityParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecParameterSettings.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtension.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtensionParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpListener.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecParameterSettings.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpReceiver.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRedCodecParameterSettings.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecParameterSettings.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpSender.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpStreamStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpTransport.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpUnhandledEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecParameterSettings.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpCapabilities.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransport.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListener.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListenerEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStateChangeEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesCryptoParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesKeyParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesParameters.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransport.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpTransportStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSsrcConflictEvent.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStats.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsProvider.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsReport.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsTypeSet.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Settings.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_StringOrStringList.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\types.h">
+      <Filter>c</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_helpers.h">
+      <Filter>c</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/msvs/ortclib-c.Universal/targetver.h b/projects/msvs/ortclib-c.Universal/targetver.h
new file mode 100644
index 00000000..a66ecb00
--- /dev/null
+++ b/projects/msvs/ortclib-c.Universal/targetver.h
@@ -0,0 +1,8 @@
+#pragma once
+
+// Including SDKDDKVer.h defines the highest available Windows platform.
+
+// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+
+#include <SDKDDKVer.h>
diff --git a/projects/msvs/ortclib-c/dllmain.cpp b/projects/msvs/ortclib-c/dllmain.cpp
new file mode 100644
index 00000000..69b58914
--- /dev/null
+++ b/projects/msvs/ortclib-c/dllmain.cpp
@@ -0,0 +1,19 @@
+// dllmain.cpp : Defines the entry point for the DLL application.
+#include "stdafx.h"
+
+BOOL APIENTRY DllMain( HMODULE hModule,
+                       DWORD  ul_reason_for_call,
+                       LPVOID lpReserved
+					 )
+{
+	switch (ul_reason_for_call)
+	{
+	case DLL_PROCESS_ATTACH:
+	case DLL_THREAD_ATTACH:
+	case DLL_THREAD_DETACH:
+	case DLL_PROCESS_DETACH:
+		break;
+	}
+	return TRUE;
+}
+
diff --git a/projects/msvs/ortclib-c/ortclib-c.cpp b/projects/msvs/ortclib-c/ortclib-c.cpp
new file mode 100644
index 00000000..f9f51276
--- /dev/null
+++ b/projects/msvs/ortclib-c/ortclib-c.cpp
@@ -0,0 +1,6 @@
+// ortclib-c.cpp : Defines the exported functions for the DLL application.
+//
+
+#include "stdafx.h"
+
+
diff --git a/projects/msvs/ortclib-c/ortclib-c.vcxproj b/projects/msvs/ortclib-c/ortclib-c.vcxproj
new file mode 100644
index 00000000..3001f05b
--- /dev/null
+++ b/projects/msvs/ortclib-c/ortclib-c.vcxproj
@@ -0,0 +1,554 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2ACCF81D-4C88-4677-834A-CBE8488A66E7}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>ortclibc</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>
+    </LinkIncremental>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>libOrtc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>
+    </LinkIncremental>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>libOrtc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>
+    </LinkIncremental>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>libOrtc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>
+    </LinkIncremental>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>libOrtc</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION;WIN32;_DEBUG;_WINDOWS;_USRDLL;ORTCLIBC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <MinimalRebuild>false</MinimalRebuild>
+      <DisableSpecificWarnings>4068</DisableSpecificWarnings>
+      <CompileAsManaged>
+      </CompileAsManaged>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Strmiids.lib;Userenv.lib;libcurl.lib;webrtc.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Dmoguids.lib;wmcodecdspuuid.lib;Msdmo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\curl\$(PlatformTarget)-$(Configuration)-static\lib\;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc\WEBRTC_BUILD\ortc\$(Configuration)\win32</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION;_DEBUG;_WINDOWS;_USRDLL;ORTCLIBC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <MinimalRebuild>false</MinimalRebuild>
+      <DisableSpecificWarnings>4068</DisableSpecificWarnings>
+      <CompileAsManaged>true</CompileAsManaged>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Strmiids.lib;Userenv.lib;libcurl.lib;webrtc.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Dmoguids.lib;wmcodecdspuuid.lib;Msdmo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\curl\$(PlatformTarget)-$(Configuration)-static\lib\;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc\WEBRTC_BUILD\ortc\$(Configuration)\$(PlatformTarget);</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION;WIN32;NDEBUG;_WINDOWS;_USRDLL;ORTCLIBC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <DisableSpecificWarnings>4068</DisableSpecificWarnings>
+      <CompileAsManaged>true</CompileAsManaged>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Strmiids.lib;Userenv.lib;libcurl.lib;webrtc.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Dmoguids.lib;wmcodecdspuuid.lib;Msdmo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\curl\$(PlatformTarget)-$(Configuration)-static\lib\;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc\WEBRTC_BUILD\ortc\$(Configuration)\win32</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>ORTC_WRAPPER_C_GENERATED_IMPLEMENTATION;NDEBUG;_WINDOWS;_USRDLL;ORTCLIBC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <DisableSpecificWarnings>4068</DisableSpecificWarnings>
+      <CompileAsManaged>true</CompileAsManaged>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Strmiids.lib;Userenv.lib;libcurl.lib;webrtc.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Dmoguids.lib;wmcodecdspuuid.lib;Msdmo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\curl\$(PlatformTarget)-$(Configuration)-static\lib\;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc\WEBRTC_BUILD\ortc\$(Configuration)\$(PlatformTarget);</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_helpers.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_MediaStream.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnection.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCTrackEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBoolean.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBooleanParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDouble.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLong.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainString.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainStringParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Dispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_DoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Error.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Json.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Logger.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_LongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaControl.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDeviceInfo.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDevices.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraintSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSupportedConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MessageQueue.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLib.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLibWithDispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificateStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCodec.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannel.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsCertificateBinary.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsFingerprint.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfToneChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateAttributes.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateComplete.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePair.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateCompleteEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherInterfacePolicy.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceServer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportController.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentity.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityAssertion.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityResult.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCInboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamTrackStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMessageEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCOutboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpFeedback.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapability.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpContributingSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpEncodingParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtension.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtensionParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpReceiver.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRedCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpUnhandledEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListenerEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesCryptoParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesKeyParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSsrcConflictEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsProvider.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsReport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsTypeSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Settings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_StringOrStringList.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\types.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_helpers.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_MediaStream.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCAnswerOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCConfiguration.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCIceCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferAnswerOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnection.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescription.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCTrackEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBoolean.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBooleanParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDouble.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDoubleRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLong.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLongRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainString.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainStringParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Dispatcher.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_DoubleRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Error.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Json.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Logger.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_LongRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaControl.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDeviceInfo.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDevices.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaSource.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamTrack.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraintSet.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSupportedConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MessageQueue.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLib.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLibWithDispatcher_Bogus.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedError.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificateStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCodec.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannel.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsCertificateBinary.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsFingerprint.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfToneChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateAttributes.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateComplete.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePair.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherer.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererIceErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherInterfacePolicy.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceServer.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportController.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentity.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityAssertion.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityError.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityResult.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCInboundRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamTrackStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMessageEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCOutboundRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpFeedback.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapability.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpContributingSource.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpEncodingParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFecParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtension.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtensionParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpListener.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpReceiver.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRedCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpUnhandledEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListener.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListenerEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesCryptoParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesKeyParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSsrcConflictEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsProvider.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsReport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsTypeSet.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Settings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_StringOrStringList.cpp" />
+    <ClCompile Include="dllmain.cpp">
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </PrecompiledHeader>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="stdafx.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\cryptopp\projects\msvs\cryptopp.Win32\cryptopp.vcxproj">
+      <Project>{09a641ee-e209-4f71-9558-71a21720c800}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\idnkit\projects\msvc\idnkit.Win32\idnkit.vcxproj">
+      <Project>{83e1df0d-525a-4bee-8e22-09b77cfaad27}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\ortclib-services-cpp\projects\msvs\ortclib.services.Win32\ortclib.services.vcxproj">
+      <Project>{51152297-1963-433d-b1ac-3d77a99b5184}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\udns\projects\msvs\udns.Win32\udns.vcxproj">
+      <Project>{c61e43f2-c43c-4841-951b-e9de605d30b4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\zsLib-eventing\projects\msvc\zsLib.Eventing.Win32\zsLib.Eventing.vcxproj">
+      <Project>{fff92483-103e-4c15-86c3-8865737273cf}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\zsLib\projects\msvs\zsLib.Win32\zsLib.vcxproj">
+      <Project>{80306fbe-b1df-4741-ae97-9be65c8c4cae}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\ortclib.Win32\ortclib.vcxproj">
+      <Project>{0cad64d3-2e39-49af-961f-f57f6b1ae786}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\ortclib.wrapper\ortclib.wrapper.vcxproj">
+      <Project>{606afb99-807e-4306-9b3f-970e10744f0a}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/msvs/ortclib-c/ortclib-c.vcxproj.filters b/projects/msvs/ortclib-c/ortclib-c.vcxproj.filters
new file mode 100644
index 00000000..6155c46a
--- /dev/null
+++ b/projects/msvs/ortclib-c/ortclib-c.vcxproj.filters
@@ -0,0 +1,984 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="targetver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_helpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_MediaStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCAnswerOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCCapabilityOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCConfiguration.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCIceCandidate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferAnswerOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescription.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescription.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCTrackEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBoolean.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBooleanParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDouble.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDoubleRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLong.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLongRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainString.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainStringParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Dispatcher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_DoubleRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Error.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Json.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_LongRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaControl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDeviceInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDevices.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaSource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamConstraints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamTrack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraintSet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSupportedConstraints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MessageQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLibWithDispatcher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedError.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificateStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCodec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannel.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsCertificateBinary.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsFingerprint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfSender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfToneChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateAttributes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateComplete.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePair.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateCompleteEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererIceErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherInterfacePolicy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceServer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportController.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentity.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityAssertion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityError.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityResult.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCInboundRtpStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamTrackStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMessageEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCOutboundRtpStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpFeedback.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapability.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpContributingSource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpEncodingParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFecParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtension.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtensionParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpListener.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpReceiver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRedCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpSender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpUnhandledEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListener.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListenerEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesCryptoParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesKeyParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSsrcConflictEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsProvider.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsReport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsTypeSet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Settings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_StringOrStringList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\c\types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dllmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_helpers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_MediaStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCAnswerOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCCapabilityOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCConfiguration.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCIceCandidate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferAnswerOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCOfferOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescription.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_adapter_RTCTrackEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBoolean.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainBooleanParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDouble.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainDoubleRange.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLong.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainLongRange.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainString.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ConstrainStringParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Dispatcher.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_DoubleRange.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Error.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_ErrorEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Json.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Logger.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_LongRange.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaControl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDeviceInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaDevices.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaSource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamConstraints.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaStreamTrack.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackCapabilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraints.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackConstraintSet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MediaTrackSupportedConstraints.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_MessageQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedError.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OverconstrainedErrorEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCertificateStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCCodec.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStateChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataChannelStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDataTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsCertificateBinary.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsFingerprint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtlsTransportStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfSender.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCDtmfToneChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateAttributes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidateComplete.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePair.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceCandidatePairStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererCandidateEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererIceErrorEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStateChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGathererStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherInterfacePolicy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceGatherOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceServer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportController.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStateChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIceTransportStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentity.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityAssertion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityError.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCIdentityResult.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCInboundRtpStreamStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMediaStreamTrackStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCMessageEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCOutboundRtpStreamStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpFeedback.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtcpTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCapabilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapability.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpCodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpContributingSource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpEncodingParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFecParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpH264CodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtension.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpHeaderExtensionParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpListener.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpReceiver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRedCodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpRtxParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpSender.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpStreamStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpUnhandledEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpCapabilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListener.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportListenerEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStateChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSctpTransportStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesCryptoParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesKeyParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSrtpTransportStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCSsrcConflictEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsProvider.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsReport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_RTCStatsTypeSet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_Settings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_StringOrStringList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\generated\c\c_org_ortc_OrtcLibWithDispatcher_Bogus.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/msvs/ortclib-c/stdafx.cpp b/projects/msvs/ortclib-c/stdafx.cpp
new file mode 100644
index 00000000..2cc10635
--- /dev/null
+++ b/projects/msvs/ortclib-c/stdafx.cpp
@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// ortclib-c.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
diff --git a/projects/msvs/ortclib-c/stdafx.h b/projects/msvs/ortclib-c/stdafx.h
new file mode 100644
index 00000000..f3a07375
--- /dev/null
+++ b/projects/msvs/ortclib-c/stdafx.h
@@ -0,0 +1,16 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+#include "targetver.h"
+
+#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+// Windows Header Files:
+#include <windows.h>
+
+
+
+// TODO: reference additional headers your program requires here
diff --git a/projects/msvs/ortclib-c/targetver.h b/projects/msvs/ortclib-c/targetver.h
new file mode 100644
index 00000000..87c0086d
--- /dev/null
+++ b/projects/msvs/ortclib-c/targetver.h
@@ -0,0 +1,8 @@
+#pragma once
+
+// Including SDKDDKVer.h defines the highest available Windows platform.
+
+// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+
+#include <SDKDDKVer.h>
diff --git a/projects/msvs/ortclib.Universal/ortclib.vcxproj b/projects/msvs/ortclib.Universal/ortclib.vcxproj
index 91d68064..d3212327 100644
--- a/projects/msvs/ortclib.Universal/ortclib.vcxproj
+++ b/projects/msvs/ortclib.Universal/ortclib.vcxproj
@@ -46,6 +46,14 @@
     <ClInclude Include="..\..\..\ortc\IDataChannel.h" />
     <ClInclude Include="..\..\..\ortc\IDataChannelTypes.h" />
     <ClInclude Include="..\..\..\ortc\IDataTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\Ortc.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="..\..\..\ortc\IDTLSTransport.h" />
     <ClInclude Include="..\..\..\ortc\IDTMFSender.h" />
     <ClInclude Include="..\..\..\ortc\IHelper.h" />
@@ -55,7 +63,9 @@
     <ClInclude Include="..\..\..\ortc\IICETypes.h" />
     <ClInclude Include="..\..\..\ortc\IIdentity.h" />
     <ClInclude Include="..\..\..\ortc\IMediaDevices.h" />
+    <ClInclude Include="..\..\..\ortc\IMediaElement.h" />
     <ClInclude Include="..\..\..\ortc\IMediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\IMediaStreamTrackSelector.h" />
     <ClInclude Include="..\..\..\ortc\internal\ifaddrs-android.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc.events.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc.events_win.h" />
@@ -64,8 +74,17 @@
     <ClInclude Include="..\..\..\ortc\internal\ortc.stats.events.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc.stats.events_win.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc.stats.events_win_etw.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaStreamTrackChannel.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaStreamTrackMonitor.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaStreamTrackSubscriber.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IRTP.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaChannelTraceHelper.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaDeviceCaptureAudio.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaDeviceCaptureVideo.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_Certificate.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_DataChannel.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaDeviceRenderAudio.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_DTLSTransport.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_DTMFSender.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_Helper.h" />
@@ -74,25 +93,30 @@
     <ClInclude Include="..\..\..\ortc\internal\ortc_ICETransport.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_ICETransportController.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_Identity.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaDevice.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaDeviceCapture.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaDeviceRender.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IRTPDecoder.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IRTPEncoder.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_ISecureTransport.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_ISRTPTransport.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_MediaDevices.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaEngine.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_MediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaStreamTrackChannel.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaStreamTrackMonitor.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaStreamTrackSubscriberMedia.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaStreamTrackSubscriberRTP.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_ORTC.h" />
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTCPPacket.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPDecoderAudio.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPDecoderVideo.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPEncoderAudio.h" />
+    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPEncoderVideo.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPListener.h" />
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPMediaEngine.h" />
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPPacket.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPReceiver.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPReceiverChannel.h" />
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPReceiverChannelAudio.h" />
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPReceiverChannelMediaBase.h" />
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPReceiverChannelVideo.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPSender.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPSenderChannel.h" />
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPSenderChannelAudio.h" />
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPSenderChannelMediaBase.h" />
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPSenderChannelVideo.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPTypes.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPUtils.h" />
     <ClInclude Include="..\..\..\ortc\internal\ortc_SCTPTransport.h" />
@@ -112,11 +136,29 @@
     <ClInclude Include="..\..\..\ortc\IStatsProvider.h" />
     <ClInclude Include="..\..\..\ortc\IStatsReport.h" />
     <ClInclude Include="..\..\..\ortc\ortc.h" />
+    <ClInclude Include="..\..\..\ortc\RTCPPacket.h" />
+    <ClInclude Include="..\..\..\ortc\RTPPacket.h" />
     <ClInclude Include="..\..\..\ortc\types.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\ortc\cpp\ortc.events.json" />
     <None Include="..\..\..\ortc\cpp\ortc.stats.events.json" />
+    <None Include="..\..\..\ortc\idl\config.json">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
+    <None Include="..\..\..\ortc\idl\winuwp.json">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
     <None Include="..\..\..\ortc\internal\ortc.events.jman" />
     <None Include="..\..\..\ortc\internal\ortc.events_win_etw.man" />
     <None Include="..\..\..\ortc\internal\ortc.events_win_etw.wprp" />
@@ -155,23 +197,28 @@
     <ClCompile Include="..\..\..\ortc\cpp\ortc_ICETypes.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_Identity.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_ISecureTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaChannelTraceHelper.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDevice.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDeviceCapture.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDeviceCaptureAudio.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDeviceCaptureVideo.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDeviceRenderAudio.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDevices.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaEngine.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaStreamTrack.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaStreamTrackMonitor.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_ORTC.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTCPPacket.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPDecoderAudio.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPDecoderVideo.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPEncoderAudio.cpp" />
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPEncoderVideo.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPListener.cpp" />
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPMediaEngine.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPPacket.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPReceiver.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPReceiverChannel.cpp" />
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPReceiverChannelAudio.cpp" />
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPReceiverChannelMediaBase.cpp" />
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPReceiverChannelVideo.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPSender.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPSenderChannel.cpp" />
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPSenderChannelAudio.cpp" />
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPSenderChannelMediaBase.cpp" />
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPSenderChannelVideo.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPTypes.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPUtils.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_SCTPTransport.cpp" />
@@ -181,6 +228,232 @@
     <ClCompile Include="..\..\..\ortc\cpp\ortc_StatsReport.cpp" />
     <ClCompile Include="..\..\..\ortc\cpp\ortc_webrtc.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <Midl Include="..\..\..\ortc\idl\adapter\enums.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\adapter\MediaStream.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\adapter\PeerConnection.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\adapter\SessionDescription.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\Capabilities.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\Certificate.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\Constraints.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\DataChannel.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\DtmfSender.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\DtlsTransport.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\enums.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\error.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\IceGatherer.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\IceTransport.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\IceTransportController.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\IceTypes.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\Identity.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\Logger.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\MediaDevices.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\MediaStreamTrack.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\RtpListener.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\RtpReceiver.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\RtpSender.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\RtpTypes.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\SctpTransport.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\SrtpSdesTransport.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\StatsProvider.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\StatsReport.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Midl>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{83e6cc72-ebc5-4c0c-b6a6-2d67a3c1e8a9}</ProjectGuid>
     <Keyword>StaticLibrary</Keyword>
@@ -299,9 +572,9 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
-      <PreprocessorDefinitions>USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -329,9 +602,9 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
-      <PreprocessorDefinitions>USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -359,9 +632,9 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
-      <PreprocessorDefinitions>USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -389,9 +662,9 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
-      <PreprocessorDefinitions>USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -419,9 +692,9 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
-      <PreprocessorDefinitions>USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -449,9 +722,9 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
-      <PreprocessorDefinitions>USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_ETW;USE_OPENSSL=1;NOMINMAX;WEBRTC_WIN;WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/projects/msvs/ortclib.Universal/ortclib.vcxproj.filters b/projects/msvs/ortclib.Universal/ortclib.vcxproj.filters
index 07100303..c4657202 100644
--- a/projects/msvs/ortclib.Universal/ortclib.vcxproj.filters
+++ b/projects/msvs/ortclib.Universal/ortclib.vcxproj.filters
@@ -19,6 +19,12 @@
     <Filter Include="ortc\adapter\internal">
       <UniqueIdentifier>{a46272cc-d4bc-45f1-9353-82cc226e179e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ortc\idl">
+      <UniqueIdentifier>{9ceab807-59c7-48a2-b3e6-101f52afbe9e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ortc\idl\adapter">
+      <UniqueIdentifier>{77c8ce93-8bbf-4b4a-92ba-49bf839a7dd9}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\ortc\IConstraints.h">
@@ -150,48 +156,21 @@
     <ClInclude Include="..\..\..\ortc\internal\ortc_ORTC.h">
       <Filter>ortc\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTCPPacket.h">
-      <Filter>ortc\internal</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPListener.h">
       <Filter>ortc\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPMediaEngine.h">
-      <Filter>ortc\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPPacket.h">
-      <Filter>ortc\internal</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPReceiver.h">
       <Filter>ortc\internal</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPReceiverChannel.h">
       <Filter>ortc\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPReceiverChannelAudio.h">
-      <Filter>ortc\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPReceiverChannelMediaBase.h">
-      <Filter>ortc\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPReceiverChannelVideo.h">
-      <Filter>ortc\internal</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPSender.h">
       <Filter>ortc\internal</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPSenderChannel.h">
       <Filter>ortc\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPSenderChannelAudio.h">
-      <Filter>ortc\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPSenderChannelMediaBase.h">
-      <Filter>ortc\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPSenderChannelVideo.h">
-      <Filter>ortc\internal</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\ortc\internal\ortc_RTPTypes.h">
       <Filter>ortc\internal</Filter>
     </ClInclude>
@@ -279,6 +258,90 @@
     <ClInclude Include="..\..\..\ortc\internal\ortc.stats.events_win_etw.h">
       <Filter>ortc\internal</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\Ortc.idl">
+      <Filter>ortc\idl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaEngine.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\IMediaElement.h">
+      <Filter>ortc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IRTPEncoder.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IRTPDecoder.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaDeviceRender.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaDeviceCapture.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaDevice.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaDeviceCaptureAudio.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaDeviceCaptureVideo.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaDeviceRenderAudio.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPEncoderAudio.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IRTP.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPEncoderVideo.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPDecoderAudio.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_RTPDecoderVideo.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\IMediaStreamTrackSelector.h">
+      <Filter>ortc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\RTPPacket.h">
+      <Filter>ortc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\RTCPPacket.h">
+      <Filter>ortc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaStreamTrack.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaChannelTraceHelper.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaStreamTrackSubscriber.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaStreamTrackSubscriberMedia.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaStreamTrackSubscriberRTP.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaStreamTrackChannel.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaStreamTrackChannel.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_IMediaStreamTrackMonitor.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\internal\ortc_MediaStreamTrackMonitor.h">
+      <Filter>ortc\internal</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\ortc\internal\ortc_ETWStatsReport.man">
@@ -317,6 +380,12 @@
     <None Include="..\..\..\ortc\internal\ortc.events.jman">
       <Filter>ortc\internal</Filter>
     </None>
+    <None Include="..\..\..\ortc\idl\config.json">
+      <Filter>ortc\idl</Filter>
+    </None>
+    <None Include="..\..\..\ortc\idl\winuwp.json">
+      <Filter>ortc\idl</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\ortc\cpp\ortc.cpp">
@@ -379,9 +448,6 @@
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPListener.cpp">
       <Filter>ortc\cpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPMediaEngine.cpp">
-      <Filter>ortc\cpp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPPacket.cpp">
       <Filter>ortc\cpp</Filter>
     </ClCompile>
@@ -391,30 +457,12 @@
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPReceiverChannel.cpp">
       <Filter>ortc\cpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPReceiverChannelAudio.cpp">
-      <Filter>ortc\cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPReceiverChannelMediaBase.cpp">
-      <Filter>ortc\cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPReceiverChannelVideo.cpp">
-      <Filter>ortc\cpp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPSender.cpp">
       <Filter>ortc\cpp</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPSenderChannel.cpp">
       <Filter>ortc\cpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPSenderChannelAudio.cpp">
-      <Filter>ortc\cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPSenderChannelMediaBase.cpp">
-      <Filter>ortc\cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPSenderChannelVideo.cpp">
-      <Filter>ortc\cpp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPTypes.cpp">
       <Filter>ortc\cpp</Filter>
     </ClCompile>
@@ -472,5 +520,127 @@
     <ClCompile Include="..\..\..\ortc\adapter\cpp\ortc_adapter_MediaStream.cpp">
       <Filter>ortc\adapter\cpp</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaEngine.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDeviceCapture.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDevice.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDeviceCaptureAudio.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDeviceCaptureVideo.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaDeviceRenderAudio.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPEncoderAudio.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPEncoderVideo.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPDecoderAudio.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_RTPDecoderVideo.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaChannelTraceHelper.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\cpp\ortc_MediaStreamTrackMonitor.cpp">
+      <Filter>ortc\cpp</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="..\..\..\ortc\idl\Capabilities.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\Certificate.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\Constraints.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\DataChannel.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\StatsReport.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\enums.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\StatsProvider.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\error.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\DtlsTransport.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\IceGatherer.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\IceTypes.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\IceTransport.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\IceTransportController.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\Identity.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\MediaDevices.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\MediaStreamTrack.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\RtpListener.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\RtpTypes.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\RtpReceiver.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\RtpSender.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\DtmfSender.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\SctpTransport.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\SrtpSdesTransport.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\adapter\enums.idl">
+      <Filter>ortc\idl\adapter</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\adapter\PeerConnection.idl">
+      <Filter>ortc\idl\adapter</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\adapter\SessionDescription.idl">
+      <Filter>ortc\idl\adapter</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\adapter\MediaStream.idl">
+      <Filter>ortc\idl\adapter</Filter>
+    </Midl>
+    <Midl Include="..\..\..\ortc\idl\Logger.idl">
+      <Filter>ortc\idl</Filter>
+    </Midl>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/msvs/ortclib.Win32/ortclib.vcxproj b/projects/msvs/ortclib.Win32/ortclib.vcxproj
index f9802e7a..ccbc5b70 100644
--- a/projects/msvs/ortclib.Win32/ortclib.vcxproj
+++ b/projects/msvs/ortclib.Win32/ortclib.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -177,32 +177,32 @@
     <ProjectGuid>{0CAD64D3-2E39-49AF-961F-F57F6B1AE786}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>ortclib</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/projects/msvs/ortclib.wrapper.Universal/ortclib.wrapper.vcxproj b/projects/msvs/ortclib.wrapper.Universal/ortclib.wrapper.vcxproj
new file mode 100644
index 00000000..20e8df85
--- /dev/null
+++ b/projects/msvs/ortclib.wrapper.Universal/ortclib.wrapper.vcxproj
@@ -0,0 +1,718 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_MediaStream.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCAnswerOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCConfiguration.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCIceCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnection.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescription.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCTrackEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBoolean.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBooleanParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDouble.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDoubleRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLong.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLongRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainString.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainStringParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Dispatcher.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_DoubleRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Error.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Helper.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Json.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Logger.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_LongRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaControl.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDeviceInfo.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDevices.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaSource.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamTrack.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraintSet.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSupportedConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MessageQueue.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLib.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLibWithDispatcher.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedError.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificateStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCodec.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannel.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsCertificateBinary.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsFingerprint.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfToneChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateAttributes.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateComplete.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePair.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherer.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererIceErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherInterfacePolicy.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceServer.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportController.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentity.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityAssertion.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityError.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityResult.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCInboundRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamTrackStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMessageEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCOutboundRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpFeedback.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapability.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpContributingSource.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpEncodingParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFecParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtension.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpListener.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpReceiver.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpUnhandledEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListener.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListenerEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesKeyParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSsrcConflictEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsProvider.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsReport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsTypeSet.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Settings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_StringOrStringList.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_MediaStream.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCMediaStreamTrackConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCOfferAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCOfferOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnection.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnectionIceEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionConnectionData.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionTransportParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCTrackEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainBoolean.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainBooleanParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainDouble.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainDoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainLong.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainLongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainString.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainStringParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Dispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_DoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Error.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Json.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Logger.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_LongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaControl.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaDeviceInfo.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaDevices.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaStreamConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackConstraintSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackSupportedConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MessageQueue.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OrtcLib.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OrtcLibWithDispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OverconstrainedError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OverconstrainedErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCertificate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCertificateStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCodec.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannel.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsCertificateBinary.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsFingerprint.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtmfSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtmfToneChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidateAttributes.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidateComplete.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePair.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePairChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePairStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidateCompleteEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidateEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherInterfacePolicy.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceServer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportController.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentity.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityAssertion.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityResult.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCInboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMediaStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMediaStreamTrackStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMessageEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCOutboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpFeedback.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapability.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpContributingSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpEncodingParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFlexFecCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpH264CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpH264CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpHeaderExtension.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpHeaderExtensionParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpReceiver.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRedCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpUnhandledEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpVp8CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpVp8CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesCryptoParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesKeyParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSsrcConflictEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsProvider.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsReport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsTypeSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Settings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_StringOrStringList.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\types.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_MediaStream.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnection.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCTrackEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBoolean.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBooleanParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDouble.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLong.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainString.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainStringParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Dispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_DoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Error.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Helper.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Json.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Logger.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_LongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaControl.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDeviceInfo.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDevices.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraintSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSupportedConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MessageQueue.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLib.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLibWithDispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificateStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCodec.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannel.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsCertificateBinary.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsFingerprint.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfToneChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateAttributes.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateComplete.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePair.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherInterfacePolicy.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceServer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportController.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentity.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityAssertion.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityResult.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCInboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamTrackStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMessageEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCOutboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpFeedback.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapability.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpContributingSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpEncodingParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtension.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtensionParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpReceiver.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRedCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpUnhandledEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListenerEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesCryptoParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesKeyParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSsrcConflictEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsProvider.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsReport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsTypeSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Settings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_StringOrStringList.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\types.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{f370ffcf-6d70-40a3-853d-a272c4df2014}</ProjectGuid>
+    <Keyword>StaticLibrary</Keyword>
+    <RootNamespace>ortclib_wrapper</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <GenerateManifest>false</GenerateManifest>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <GenerateManifest>false</GenerateManifest>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <GenerateManifest>false</GenerateManifest>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <GenerateManifest>false</GenerateManifest>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <GenerateManifest>false</GenerateManifest>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <GenerateManifest>false</GenerateManifest>
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+    <Lib>
+      <AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+    <Lib>
+      <AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+    <Lib>
+      <AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+    <Lib>
+      <AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+    <Lib>
+      <AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+    <Lib>
+      <AdditionalOptions>/IGNORE:4264 %(AdditionalOptions)</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/msvs/ortclib.wrapper.Universal/ortclib.wrapper.vcxproj.filters b/projects/msvs/ortclib.wrapper.Universal/ortclib.wrapper.vcxproj.filters
new file mode 100644
index 00000000..147aeeb3
--- /dev/null
+++ b/projects/msvs/ortclib.wrapper.Universal/ortclib.wrapper.vcxproj.filters
@@ -0,0 +1,1440 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="ortc">
+      <UniqueIdentifier>{b6baf693-b17a-4e11-8724-cfd637d309b6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ortc\idl">
+      <UniqueIdentifier>{152586c3-7ca8-4960-ab98-6cd775b89c72}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ortc\idl\wrapper">
+      <UniqueIdentifier>{2a06a640-30ed-4588-8934-f49d95168794}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ortc\idl\wrapper\generated">
+      <UniqueIdentifier>{856ec7c4-23a4-4b0a-ae49-46a103ab4f34}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCCapabilityOptions.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCConfiguration.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCIceCandidate.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferOptions.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnection.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescription.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCTrackEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBoolean.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBooleanParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDouble.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDoubleRange.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLong.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLongRange.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainString.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainStringParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Dispatcher.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_DoubleRange.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Error.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ErrorEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_LongRange.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDeviceInfo.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDevices.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamConstraints.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamTrack.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackCapabilities.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraints.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraintSet.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSettings.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSupportedConstraints.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedError.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedErrorEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificate.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificateStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCodec.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannel.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStateChangeEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataTransport.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsFingerprint.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransport.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidate.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateAttributes.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateComplete.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePair.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherer.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidate.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererIceErrorEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStateChangeEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceServer.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransport.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportController.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportOptions.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStateChangeEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentity.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityAssertion.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityError.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityResult.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamTrackStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMessageEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpFeedback.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpTransport.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCapabilities.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapability.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpContributingSource.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpEncodingParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFecParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtension.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpListener.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpReceiver.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpSender.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpTransport.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpUnhandledEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpCapabilities.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransport.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListener.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesKeyParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesParameters.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransport.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpTransportStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSsrcConflictEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsProvider.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsReport.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsTypeSet.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_StringOrStringList.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_MediaStream.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCAnswerOptions.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaSource.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Settings.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpStreamStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCInboundRtpStreamStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCOutboundRtpStreamStats.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherOptions.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherInterfacePolicy.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Logger.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLibWithDispatcher.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLib.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MessageQueue.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Json.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaControl.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Helper.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameterSettings.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfSender.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfToneChangeEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsCertificateBinary.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListenerEvent.cpp">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCCapabilityOptions.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCConfiguration.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCIceCandidate.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferAnswerOptions.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferOptions.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnection.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescription.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescription.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransport.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCTrackEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBoolean.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBooleanParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDouble.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDoubleRange.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLong.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLongRange.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainString.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainStringParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Dispatcher.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_DoubleRange.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Error.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ErrorEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_LongRange.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDeviceInfo.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDevices.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamConstraints.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamTrack.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackCapabilities.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraints.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraintSet.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSettings.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSupportedConstraints.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedError.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedErrorEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificate.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificateStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCodec.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannel.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStateChangeEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataTransport.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsFingerprint.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransport.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStateChangeEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidate.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateAttributes.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateComplete.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePair.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairChangeEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherer.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidate.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererIceErrorEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStateChangeEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceServer.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransport.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportController.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportOptions.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStateChangeEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentity.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityAssertion.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityError.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityResult.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamTrackStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMessageEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpFeedback.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpTransport.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCapabilities.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapability.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityOptions.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpContributingSource.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpEncodingParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFecParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtension.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtensionParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpListener.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpReceiver.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRedCodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpSender.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpTransport.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpUnhandledEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpCapabilities.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransport.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListener.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStateChangeEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesCryptoParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesKeyParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesParameters.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransport.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpTransportStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSsrcConflictEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsProvider.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsReport.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsTypeSet.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_StringOrStringList.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\types.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_MediaStream.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCAnswerOptions.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsProvider.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsReport.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsTypeSet.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_StringOrStringList.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\types.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_MediaStream.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCAnswerOptions.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCCapabilityOptions.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCConfiguration.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCIceCandidate.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCMediaStreamTrackConfiguration.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCOfferAnswerOptions.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCOfferOptions.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnection.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnectionIceEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescription.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionConnectionData.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionDescription.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionMediaLine.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpSender.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionTransport.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionTransportParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCTrackEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainBoolean.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainBooleanParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainDouble.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainDoubleRange.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainLong.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainLongRange.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainString.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainStringParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Dispatcher.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_DoubleRange.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Error.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ErrorEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_LongRange.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaDeviceInfo.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaDevices.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaStreamConstraints.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaStreamTrack.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackCapabilities.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackConstraints.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackConstraintSet.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackSettings.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackSupportedConstraints.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OverconstrainedError.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OverconstrainedErrorEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCertificate.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCertificateStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCodec.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannel.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelStateChangeEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataTransport.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsFingerprint.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransport.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransportStateChangeEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransportStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidate.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidateAttributes.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidateComplete.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePair.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePairChangeEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePairStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherer.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidate.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidateCompleteEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidateEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererIceErrorEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererStateChangeEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceServer.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransport.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportController.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportOptions.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportStateChangeEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentity.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityAssertion.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityError.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityResult.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMediaStreamStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMediaStreamTrackStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMessageEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpFeedback.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpTransport.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCapabilities.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapability.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapabilityOptions.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpContributingSource.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpEncodingParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFecParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpH264CodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpHeaderExtension.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpHeaderExtensionParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpListener.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecCapabilityOptions.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpReceiver.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRedCodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxCodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpSender.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpTransport.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpUnhandledEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpVp8CodecCapabilityParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpCapabilities.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransport.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportListener.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportStateChangeEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesCryptoParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesKeyParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesParameters.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesTransport.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpTransportStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSsrcConflictEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaSource.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Settings.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Settings.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCOutboundRtpStreamStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCInboundRtpStreamStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpStreamStats.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpStreamStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCInboundRtpStreamStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCOutboundRtpStreamStats.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherInterfacePolicy.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherOptions.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherInterfacePolicy.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherOptions.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Logger.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Logger.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OrtcLib.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OrtcLibWithDispatcher.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLib.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLibWithDispatcher.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MessageQueue.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Json.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MessageQueue.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Json.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaControl.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaControl.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Helper.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFlexFecCodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpH264CodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxCodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpVp8CodecParameterSettings.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsCertificateBinary.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsCertificateBinary.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListenerEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfToneChangeEvent.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfSender.h">
+      <Filter>ortc\idl\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtmfSender.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtmfToneChangeEvent.h">
+      <Filter>ortc\idl\wrapper\generated</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/msvs/ortclib.wrapper/ortclib.wrapper.vcxproj b/projects/msvs/ortclib.wrapper/ortclib.wrapper.vcxproj
new file mode 100644
index 00000000..f1d52835
--- /dev/null
+++ b/projects/msvs/ortclib.wrapper/ortclib.wrapper.vcxproj
@@ -0,0 +1,645 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A7614AFA-6E2A-4037-96CA-B9F043333CA9}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>ortclibwrapper</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <CompileAsManaged>
+      </CompileAsManaged>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <MinimalRebuild>false</MinimalRebuild>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <CompileAsManaged>true</CompileAsManaged>
+      <DebugInformationFormat>None</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <CompileAsManaged>true</CompileAsManaged>
+      <DebugInformationFormat>None</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <CompileAsManaged>true</CompileAsManaged>
+      <DebugInformationFormat>None</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_MediaStream.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCMediaStreamTrackConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCOfferAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCOfferOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnection.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnectionIceEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionConnectionData.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionTransportParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCTrackEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainBoolean.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainBooleanParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainDouble.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainDoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainLong.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainLongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainString.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainStringParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Dispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_DoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Error.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Json.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Logger.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_LongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaControl.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaDeviceInfo.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaDevices.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaStreamConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackConstraintSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackSupportedConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MessageQueue.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OrtcLib.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OrtcLibWithDispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OverconstrainedError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OverconstrainedErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCertificate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCertificateStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCodec.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannel.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsCertificateBinary.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsFingerprint.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtmfSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtmfToneChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidateAttributes.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidateComplete.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePair.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePairChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePairStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidateCompleteEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidateEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherInterfacePolicy.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceServer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportController.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentity.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityAssertion.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityResult.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCInboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMediaStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMediaStreamTrackStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMessageEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCOutboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpFeedback.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapability.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpContributingSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpEncodingParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFlexFecCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpH264CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpH264CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpHeaderExtension.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpHeaderExtensionParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpReceiver.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRedCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpUnhandledEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpVp8CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpVp8CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportListenerEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesCryptoParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesKeyParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSsrcConflictEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsProvider.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsReport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsTypeSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Settings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_StringOrStringList.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\types.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_MediaStream.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnection.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCTrackEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBoolean.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBooleanParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDouble.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLong.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainString.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainStringParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Dispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_DoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Error.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Helper.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Json.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Logger.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_LongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaControl.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDeviceInfo.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDevices.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraintSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSupportedConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MessageQueue.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLib.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificateStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCodec.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannel.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsCertificateBinary.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsFingerprint.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfToneChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateAttributes.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateComplete.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePair.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherInterfacePolicy.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceServer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportController.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentity.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityAssertion.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityResult.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCInboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamTrackStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMessageEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCOutboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpFeedback.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapability.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpContributingSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpEncodingParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtension.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtensionParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpReceiver.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRedCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpUnhandledEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListenerEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesCryptoParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesKeyParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSsrcConflictEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsProvider.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsReport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsTypeSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Settings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_StringOrStringList.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\types.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_MediaStream.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCAnswerOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCConfiguration.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCIceCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnection.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescription.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCTrackEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBoolean.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBooleanParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDouble.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDoubleRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLong.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLongRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainString.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainStringParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Dispatcher.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_DoubleRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Error.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Helper.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Json.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Logger.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_LongRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaControl.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDeviceInfo.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDevices.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaSource.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamTrack.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraintSet.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSupportedConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MessageQueue.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLib.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedError.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificateStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCodec.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannel.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsCertificateBinary.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsFingerprint.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfToneChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateAttributes.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateComplete.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePair.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherer.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererIceErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherInterfacePolicy.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceServer.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportController.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentity.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityAssertion.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityError.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityResult.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCInboundRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamTrackStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMessageEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCOutboundRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpFeedback.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapability.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpContributingSource.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpEncodingParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFecParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtension.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpListener.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpReceiver.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpUnhandledEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListener.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListenerEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesKeyParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSsrcConflictEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsProvider.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsReport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsTypeSet.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Settings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_StringOrStringList.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/msvs/ortclib.wrapper/ortclib.wrapper.vcxproj.bak b/projects/msvs/ortclib.wrapper/ortclib.wrapper.vcxproj.bak
new file mode 100644
index 00000000..41ae4d41
--- /dev/null
+++ b/projects/msvs/ortclib.wrapper/ortclib.wrapper.vcxproj.bak
@@ -0,0 +1,648 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A7614AFA-6E2A-4037-96CA-B9F043333CA9}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>ortclibwrapper</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)Build\Output\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)Build\Intermediate\$(PlatformTarget)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+	  <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <CompileAsManaged>
+      </CompileAsManaged>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <MinimalRebuild>false</MinimalRebuild>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <CompileAsManaged>true</CompileAsManaged>
+      <DebugInformationFormat>None</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <CompileAsManaged>true</CompileAsManaged>
+      <DebugInformationFormat>None</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WEBRTC_WIN;USE_ETW;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..;$(ProjectDir)..\..\..\..\zsLib;$(ProjectDir)..\..\..\..\zsLib-eventing;$(ProjectDir)..\..\..\..\ortclib-services-cpp;$(ProjectDir)..\..\..\..;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\webrtc;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\boringssl\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\usrsctp\usrsctplib;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\..\webrtc\xplatform\libsrtp\config;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4068;4290</DisableSpecificWarnings>
+      <CompileAsManaged>true</CompileAsManaged>
+      <DebugInformationFormat>None</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_MediaStream.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCMediaStreamTrackConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCOfferAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCOfferOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnection.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnectionIceEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionConnectionData.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionTransportParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCTrackEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainBoolean.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainBooleanParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainDouble.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainDoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainLong.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainLongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainString.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainStringParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Dispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_DoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Error.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Json.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Logger.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_LongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaControl.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaDeviceInfo.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaDevices.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaStreamConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackConstraintSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackSupportedConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MessageQueue.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OrtcLib.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OrtcLibWithDispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OverconstrainedError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OverconstrainedErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCertificate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCertificateStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCodec.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannel.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsCertificateBinary.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsFingerprint.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtmfSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtmfToneChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidateAttributes.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidateComplete.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePair.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePairChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePairStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidateCompleteEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidateEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherInterfacePolicy.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceServer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportController.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentity.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityAssertion.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityResult.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCInboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMediaStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMediaStreamTrackStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMessageEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCOutboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpFeedback.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapability.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpContributingSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpEncodingParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFlexFecCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpH264CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpH264CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpHeaderExtension.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpHeaderExtensionParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpReceiver.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRedCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpUnhandledEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpVp8CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpVp8CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportListenerEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesCryptoParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesKeyParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSsrcConflictEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsProvider.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsReport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsTypeSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Settings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_StringOrStringList.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\types.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_MediaStream.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferAnswerOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnection.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescription.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCTrackEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBoolean.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBooleanParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDouble.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLong.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainString.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainStringParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Dispatcher.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_DoubleRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Error.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Helper.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Json.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Logger.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_LongRange.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaControl.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDeviceInfo.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDevices.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamTrack.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraintSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSupportedConstraints.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MessageQueue.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLib.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificateStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCodec.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannel.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsCertificateBinary.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsFingerprint.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfToneChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateAttributes.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateComplete.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePair.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidate.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererIceErrorEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherInterfacePolicy.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceServer.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportController.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentity.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityAssertion.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityError.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityResult.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCInboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamTrackStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMessageEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCOutboundRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpFeedback.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapability.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpContributingSource.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpEncodingParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFecParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtension.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtensionParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpReceiver.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRedCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpSender.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpStreamStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpUnhandledEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecParameterSettings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpCapabilities.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListener.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListenerEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStateChangeEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesCryptoParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesKeyParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesParameters.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpTransportStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSsrcConflictEvent.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStats.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsProvider.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsReport.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsTypeSet.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Settings.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_StringOrStringList.h" />
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\types.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_MediaStream.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCAnswerOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCConfiguration.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCIceCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnection.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescription.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCTrackEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBoolean.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBooleanParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDouble.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDoubleRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLong.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLongRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainString.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainStringParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Dispatcher.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_DoubleRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Error.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Helper.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Json.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Logger.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_LongRange.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaControl.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDeviceInfo.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDevices.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaSource.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamTrack.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraintSet.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSupportedConstraints.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MessageQueue.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLib.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedError.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificateStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCodec.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannel.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsCertificateBinary.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsFingerprint.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfToneChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateAttributes.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateComplete.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePair.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherer.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidate.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererIceErrorEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherInterfacePolicy.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceServer.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportController.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentity.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityAssertion.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityError.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityResult.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCInboundRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamTrackStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMessageEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCOutboundRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpFeedback.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapability.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpContributingSource.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpEncodingParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFecParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtension.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpListener.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpReceiver.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpSender.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpStreamStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpUnhandledEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpCapabilities.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListener.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListenerEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesKeyParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesParameters.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpTransportStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSsrcConflictEvent.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStats.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsProvider.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsReport.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsTypeSet.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Settings.cpp" />
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_StringOrStringList.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/msvs/ortclib.wrapper/ortclib.wrapper.vcxproj.filters b/projects/msvs/ortclib.wrapper/ortclib.wrapper.vcxproj.filters
new file mode 100644
index 00000000..c795bda5
--- /dev/null
+++ b/projects/msvs/ortclib.wrapper/ortclib.wrapper.vcxproj.filters
@@ -0,0 +1,1443 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_MediaStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCAnswerOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCCapabilityOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCConfiguration.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCIceCandidate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescription.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCTrackEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBoolean.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBooleanParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDouble.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDoubleRange.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLong.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLongRange.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainString.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainStringParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Dispatcher.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_DoubleRange.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Error.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ErrorEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Helper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Json.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Logger.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_LongRange.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaControl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDeviceInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDevices.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaSource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamConstraints.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamTrack.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackCapabilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraints.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraintSet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSupportedConstraints.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MessageQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedError.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedErrorEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificateStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCodec.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStateChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsCertificateBinary.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsFingerprint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfSender.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfToneChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateAttributes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateComplete.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePair.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererIceErrorEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStateChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherInterfacePolicy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceServer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportController.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStateChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentity.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityAssertion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityError.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityResult.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCInboundRtpStreamStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamTrackStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMessageEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCOutboundRtpStreamStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpFeedback.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCapabilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapability.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpContributingSource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpEncodingParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFecParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtension.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpListener.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpReceiver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpSender.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpStreamStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpUnhandledEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpCapabilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListener.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListenerEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesKeyParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesParameters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpTransportStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSsrcConflictEvent.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsProvider.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsReport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsTypeSet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Settings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_StringOrStringList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_MediaStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCAnswerOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCCapabilityOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCConfiguration.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCIceCandidate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCMediaStreamTrackConfiguration.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCOfferAnswerOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCOfferOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCPeerConnectionIceEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescription.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionConnectionData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionDescription.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionMediaLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpSender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCSessionDescriptionTransportParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_adapter_RTCTrackEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainBoolean.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainBooleanParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainDouble.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainDoubleRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainLong.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainLongRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainString.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ConstrainStringParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Dispatcher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_DoubleRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Error.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_ErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Json.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_LongRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaControl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaDeviceInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaDevices.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaSource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaStreamConstraints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaStreamTrack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackConstraints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackConstraintSet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MediaTrackSupportedConstraints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_MessageQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OrtcLib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OrtcLibWithDispatcher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OverconstrainedError.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_OverconstrainedErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCertificate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCertificateStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCCodec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannel.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataChannelStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDataTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsCertificateBinary.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsFingerprint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransportStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtlsTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtmfSender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCDtmfToneChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidateAttributes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidateComplete.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePair.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePairChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceCandidatePairStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidateCompleteEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererCandidateEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererIceErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGathererStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherInterfacePolicy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceGatherOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceServer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportController.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIceTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentity.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityAssertion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityError.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCIdentityResult.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCInboundRtpStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMediaStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMediaStreamTrackStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCMessageEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCOutboundRtpStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpFeedback.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtcpTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapability.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapabilityOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpContributingSource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpEncodingParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFecParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpFlexFecCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpH264CodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpH264CodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpHeaderExtension.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpHeaderExtensionParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpListener.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecCapabilityOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpOpusCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpReceiver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRedCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpRtxParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpSender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpUnhandledEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpVp8CodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCRtpVp8CodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportListener.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportListenerEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSctpTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesCryptoParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesKeyParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSrtpTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCSsrcConflictEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsProvider.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsReport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_RTCStatsTypeSet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_Settings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\org_ortc_StringOrStringList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\generated\types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_MediaStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCAnswerOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCCapabilityOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCConfiguration.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCIceCandidate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferAnswerOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCOfferOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescription.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescription.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_adapter_RTCTrackEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBoolean.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainBooleanParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDouble.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainDoubleRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLong.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainLongRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainString.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ConstrainStringParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Dispatcher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_DoubleRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Error.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_ErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Helper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Json.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_LongRange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaControl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDeviceInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaDevices.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaSource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamConstraints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaStreamTrack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackConstraintSet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MediaTrackSupportedConstraints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_MessageQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OrtcLib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedError.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_OverconstrainedErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCertificateStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCCodec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannel.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataChannelStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDataTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsCertificateBinary.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsFingerprint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtlsTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfSender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCDtmfToneChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateAttributes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidateComplete.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePair.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceCandidatePairStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererCandidateEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererIceErrorEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGathererStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherInterfacePolicy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceGatherOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceServer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportController.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIceTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentity.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityAssertion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityError.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCIdentityResult.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCInboundRtpStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMediaStreamTrackStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCMessageEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCOutboundRtpStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpFeedback.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtcpTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapability.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpContributingSource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpEncodingParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFecParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpH264CodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtension.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpHeaderExtensionParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpListener.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpOpusCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpReceiver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRedCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxCodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpRtxParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpSender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpStreamStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpUnhandledEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCRtpVp8CodecParameterSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpCapabilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListener.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportListenerEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStateChangeEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSctpTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesCryptoParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesKeyParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesParameters.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSrtpTransportStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCSsrcConflictEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsProvider.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsReport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_RTCStatsTypeSet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_Settings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\impl_org_ortc_StringOrStringList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ortc\idl\wrapper\types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/xcode/ortclib-c-ios/ortclib-c-ios.xcodeproj/project.pbxproj b/projects/xcode/ortclib-c-ios/ortclib-c-ios.xcodeproj/project.pbxproj
new file mode 100644
index 00000000..5ff99c5b
--- /dev/null
+++ b/projects/xcode/ortclib-c-ios/ortclib-c-ios.xcodeproj/project.pbxproj
@@ -0,0 +1,1822 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		00216E151E96E97F008204EA /* c_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CDC1E96E97F008204EA /* c_helpers.cpp */; };
+		00216E161E96E97F008204EA /* c_org_ortc_adapter_MediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CDE1E96E97F008204EA /* c_org_ortc_adapter_MediaStream.cpp */; };
+		00216E171E96E97F008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CE01E96E97F008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp */; };
+		00216E181E96E97F008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CE21E96E97F008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp */; };
+		00216E191E96E97F008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CE41E96E97F008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp */; };
+		00216E1A1E96E97F008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CE61E96E97F008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp */; };
+		00216E1B1E96E97F008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CE81E96E97F008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */; };
+		00216E1C1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CEA1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp */; };
+		00216E1D1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CEC1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp */; };
+		00216E1E1E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CEE1E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp */; };
+		00216E1F1E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CF01E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */; };
+		00216E201E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CF21E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */; };
+		00216E211E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CF41E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp */; };
+		00216E221E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CF61E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */; };
+		00216E231E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CF81E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */; };
+		00216E241E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CFA1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */; };
+		00216E251E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CFC1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */; };
+		00216E261E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CFE1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */; };
+		00216E271E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D001E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */; };
+		00216E281E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D021E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */; };
+		00216E291E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D041E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */; };
+		00216E2A1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D061E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */; };
+		00216E2B1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D081E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */; };
+		00216E2C1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D0A1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */; };
+		00216E2D1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D0C1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */; };
+		00216E2E1E96E97F008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D0E1E96E97F008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp */; };
+		00216E2F1E96E97F008204EA /* c_org_ortc_ConstrainBoolean.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D101E96E97F008204EA /* c_org_ortc_ConstrainBoolean.cpp */; };
+		00216E301E96E97F008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D121E96E97F008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp */; };
+		00216E311E96E97F008204EA /* c_org_ortc_ConstrainDouble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D141E96E97F008204EA /* c_org_ortc_ConstrainDouble.cpp */; };
+		00216E321E96E97F008204EA /* c_org_ortc_ConstrainDoubleRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D161E96E97F008204EA /* c_org_ortc_ConstrainDoubleRange.cpp */; };
+		00216E331E96E97F008204EA /* c_org_ortc_ConstrainLong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D181E96E97F008204EA /* c_org_ortc_ConstrainLong.cpp */; };
+		00216E341E96E97F008204EA /* c_org_ortc_ConstrainLongRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D1A1E96E97F008204EA /* c_org_ortc_ConstrainLongRange.cpp */; };
+		00216E351E96E97F008204EA /* c_org_ortc_ConstrainString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D1C1E96E97F008204EA /* c_org_ortc_ConstrainString.cpp */; };
+		00216E361E96E97F008204EA /* c_org_ortc_ConstrainStringParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D1E1E96E97F008204EA /* c_org_ortc_ConstrainStringParameters.cpp */; };
+		00216E371E96E97F008204EA /* c_org_ortc_DoubleRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D201E96E97F008204EA /* c_org_ortc_DoubleRange.cpp */; };
+		00216E381E96E97F008204EA /* c_org_ortc_Error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D221E96E97F008204EA /* c_org_ortc_Error.cpp */; };
+		00216E391E96E97F008204EA /* c_org_ortc_ErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D241E96E97F008204EA /* c_org_ortc_ErrorEvent.cpp */; };
+		00216E3A1E96E97F008204EA /* c_org_ortc_Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D261E96E97F008204EA /* c_org_ortc_Json.cpp */; };
+		00216E3B1E96E97F008204EA /* c_org_ortc_Logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D281E96E97F008204EA /* c_org_ortc_Logger.cpp */; };
+		00216E3C1E96E97F008204EA /* c_org_ortc_LongRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D2A1E96E97F008204EA /* c_org_ortc_LongRange.cpp */; };
+		00216E3D1E96E97F008204EA /* c_org_ortc_MediaControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D2C1E96E97F008204EA /* c_org_ortc_MediaControl.cpp */; };
+		00216E3E1E96E980008204EA /* c_org_ortc_MediaDeviceInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D2E1E96E97F008204EA /* c_org_ortc_MediaDeviceInfo.cpp */; };
+		00216E3F1E96E980008204EA /* c_org_ortc_MediaDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D301E96E97F008204EA /* c_org_ortc_MediaDevices.cpp */; };
+		00216E401E96E980008204EA /* c_org_ortc_MediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D321E96E97F008204EA /* c_org_ortc_MediaSource.cpp */; };
+		00216E411E96E980008204EA /* c_org_ortc_MediaStreamConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D341E96E97F008204EA /* c_org_ortc_MediaStreamConstraints.cpp */; };
+		00216E421E96E980008204EA /* c_org_ortc_MediaStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D361E96E97F008204EA /* c_org_ortc_MediaStreamTrack.cpp */; };
+		00216E431E96E980008204EA /* c_org_ortc_MediaTrackCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D381E96E97F008204EA /* c_org_ortc_MediaTrackCapabilities.cpp */; };
+		00216E441E96E980008204EA /* c_org_ortc_MediaTrackConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D3A1E96E97F008204EA /* c_org_ortc_MediaTrackConstraints.cpp */; };
+		00216E451E96E980008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D3C1E96E97F008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp */; };
+		00216E461E96E980008204EA /* c_org_ortc_MediaTrackSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D3E1E96E97F008204EA /* c_org_ortc_MediaTrackSettings.cpp */; };
+		00216E471E96E980008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D401E96E97F008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp */; };
+		00216E481E96E980008204EA /* c_org_ortc_MessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D421E96E97F008204EA /* c_org_ortc_MessageQueue.cpp */; };
+		00216E491E96E980008204EA /* c_org_ortc_OrtcLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D441E96E97F008204EA /* c_org_ortc_OrtcLib.cpp */; };
+		00216E4A1E96E980008204EA /* c_org_ortc_OverconstrainedError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D461E96E97F008204EA /* c_org_ortc_OverconstrainedError.cpp */; };
+		00216E4B1E96E980008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D481E96E97F008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp */; };
+		00216E4C1E96E980008204EA /* c_org_ortc_RTCCertificate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D4A1E96E97F008204EA /* c_org_ortc_RTCCertificate.cpp */; };
+		00216E4D1E96E980008204EA /* c_org_ortc_RTCCertificateStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D4C1E96E97F008204EA /* c_org_ortc_RTCCertificateStats.cpp */; };
+		00216E4E1E96E980008204EA /* c_org_ortc_RTCCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D4E1E96E97F008204EA /* c_org_ortc_RTCCodec.cpp */; };
+		00216E4F1E96E980008204EA /* c_org_ortc_RTCDataChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D501E96E97F008204EA /* c_org_ortc_RTCDataChannel.cpp */; };
+		00216E501E96E980008204EA /* c_org_ortc_RTCDataChannelEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D521E96E97F008204EA /* c_org_ortc_RTCDataChannelEvent.cpp */; };
+		00216E511E96E980008204EA /* c_org_ortc_RTCDataChannelParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D541E96E97F008204EA /* c_org_ortc_RTCDataChannelParameters.cpp */; };
+		00216E521E96E980008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D561E96E97F008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp */; };
+		00216E531E96E980008204EA /* c_org_ortc_RTCDataChannelStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D581E96E97F008204EA /* c_org_ortc_RTCDataChannelStats.cpp */; };
+		00216E541E96E980008204EA /* c_org_ortc_RTCDataTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D5A1E96E97F008204EA /* c_org_ortc_RTCDataTransport.cpp */; };
+		00216E551E96E980008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D5C1E96E97F008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp */; };
+		00216E561E96E980008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D5E1E96E97F008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp */; };
+		00216E571E96E980008204EA /* c_org_ortc_RTCDtlsParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D601E96E97F008204EA /* c_org_ortc_RTCDtlsParameters.cpp */; };
+		00216E581E96E980008204EA /* c_org_ortc_RTCDtlsTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D621E96E97F008204EA /* c_org_ortc_RTCDtlsTransport.cpp */; };
+		00216E591E96E980008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D641E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */; };
+		00216E5A1E96E980008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D661E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp */; };
+		00216E5B1E96E980008204EA /* c_org_ortc_RTCDtmfSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D681E96E97F008204EA /* c_org_ortc_RTCDtmfSender.cpp */; };
+		00216E5C1E96E980008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D6A1E96E97F008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp */; };
+		00216E5D1E96E980008204EA /* c_org_ortc_RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D6C1E96E97F008204EA /* c_org_ortc_RTCIceCandidate.cpp */; };
+		00216E5E1E96E980008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D6E1E96E97F008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp */; };
+		00216E5F1E96E980008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D701E96E97F008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp */; };
+		00216E601E96E980008204EA /* c_org_ortc_RTCIceCandidatePair.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D721E96E97F008204EA /* c_org_ortc_RTCIceCandidatePair.cpp */; };
+		00216E611E96E980008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D741E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp */; };
+		00216E621E96E980008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D761E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp */; };
+		00216E631E96E980008204EA /* c_org_ortc_RTCIceGatherer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D781E96E97F008204EA /* c_org_ortc_RTCIceGatherer.cpp */; };
+		00216E641E96E980008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D7A1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp */; };
+		00216E651E96E980008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D7C1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */; };
+		00216E661E96E980008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D7E1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp */; };
+		00216E671E96E980008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D801E96E97F008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp */; };
+		00216E681E96E980008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D821E96E97F008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp */; };
+		00216E691E96E980008204EA /* c_org_ortc_RTCIceGathererStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D841E96E97F008204EA /* c_org_ortc_RTCIceGathererStats.cpp */; };
+		00216E6A1E96E980008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D861E96E97F008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp */; };
+		00216E6B1E96E980008204EA /* c_org_ortc_RTCIceGatherOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D881E96E97F008204EA /* c_org_ortc_RTCIceGatherOptions.cpp */; };
+		00216E6C1E96E980008204EA /* c_org_ortc_RTCIceParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D8A1E96E97F008204EA /* c_org_ortc_RTCIceParameters.cpp */; };
+		00216E6D1E96E980008204EA /* c_org_ortc_RTCIceServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D8C1E96E97F008204EA /* c_org_ortc_RTCIceServer.cpp */; };
+		00216E6E1E96E980008204EA /* c_org_ortc_RTCIceTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D8E1E96E97F008204EA /* c_org_ortc_RTCIceTransport.cpp */; };
+		00216E6F1E96E980008204EA /* c_org_ortc_RTCIceTransportController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D901E96E97F008204EA /* c_org_ortc_RTCIceTransportController.cpp */; };
+		00216E701E96E980008204EA /* c_org_ortc_RTCIceTransportOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D921E96E97F008204EA /* c_org_ortc_RTCIceTransportOptions.cpp */; };
+		00216E711E96E980008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D941E96E97F008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp */; };
+		00216E721E96E980008204EA /* c_org_ortc_RTCIceTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D961E96E97F008204EA /* c_org_ortc_RTCIceTransportStats.cpp */; };
+		00216E731E96E980008204EA /* c_org_ortc_RTCIdentity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D981E96E97F008204EA /* c_org_ortc_RTCIdentity.cpp */; };
+		00216E741E96E980008204EA /* c_org_ortc_RTCIdentityAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D9A1E96E97F008204EA /* c_org_ortc_RTCIdentityAssertion.cpp */; };
+		00216E751E96E980008204EA /* c_org_ortc_RTCIdentityError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D9C1E96E97F008204EA /* c_org_ortc_RTCIdentityError.cpp */; };
+		00216E761E96E980008204EA /* c_org_ortc_RTCIdentityResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D9E1E96E97F008204EA /* c_org_ortc_RTCIdentityResult.cpp */; };
+		00216E771E96E980008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DA01E96E97F008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp */; };
+		00216E781E96E980008204EA /* c_org_ortc_RTCMediaStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DA21E96E97F008204EA /* c_org_ortc_RTCMediaStreamStats.cpp */; };
+		00216E791E96E980008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DA41E96E97F008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp */; };
+		00216E7A1E96E980008204EA /* c_org_ortc_RTCMessageEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DA61E96E97F008204EA /* c_org_ortc_RTCMessageEvent.cpp */; };
+		00216E7B1E96E980008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DA81E96E97F008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp */; };
+		00216E7C1E96E980008204EA /* c_org_ortc_RTCRtcpFeedback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DAA1E96E97F008204EA /* c_org_ortc_RTCRtcpFeedback.cpp */; };
+		00216E7D1E96E980008204EA /* c_org_ortc_RTCRtcpParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DAC1E96E97F008204EA /* c_org_ortc_RTCRtcpParameters.cpp */; };
+		00216E7E1E96E980008204EA /* c_org_ortc_RTCRtcpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DAE1E96E97F008204EA /* c_org_ortc_RTCRtcpTransport.cpp */; };
+		00216E7F1E96E980008204EA /* c_org_ortc_RTCRtpCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DB01E96E97F008204EA /* c_org_ortc_RTCRtpCapabilities.cpp */; };
+		00216E801E96E980008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DB21E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp */; };
+		00216E811E96E980008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DB41E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp */; };
+		00216E821E96E980008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DB61E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp */; };
+		00216E831E96E980008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DB81E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp */; };
+		00216E841E96E980008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DBA1E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp */; };
+		00216E851E96E980008204EA /* c_org_ortc_RTCRtpContributingSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DBC1E96E97F008204EA /* c_org_ortc_RTCRtpContributingSource.cpp */; };
+		00216E861E96E980008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DBE1E96E97F008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp */; };
+		00216E871E96E980008204EA /* c_org_ortc_RTCRtpFecParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DC01E96E97F008204EA /* c_org_ortc_RTCRtpFecParameters.cpp */; };
+		00216E881E96E980008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DC21E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */; };
+		00216E891E96E980008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DC41E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */; };
+		00216E8A1E96E980008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DC61E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */; };
+		00216E8B1E96E980008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DC81E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp */; };
+		00216E8C1E96E980008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DCA1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp */; };
+		00216E8D1E96E980008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DCC1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp */; };
+		00216E8E1E96E980008204EA /* c_org_ortc_RTCRtpListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DCE1E96E97F008204EA /* c_org_ortc_RTCRtpListener.cpp */; };
+		00216E8F1E96E980008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DD01E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */; };
+		00216E901E96E980008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DD21E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */; };
+		00216E911E96E980008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DD41E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */; };
+		00216E921E96E980008204EA /* c_org_ortc_RTCRtpParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DD61E96E97F008204EA /* c_org_ortc_RTCRtpParameters.cpp */; };
+		00216E931E96E980008204EA /* c_org_ortc_RTCRtpReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DD81E96E97F008204EA /* c_org_ortc_RTCRtpReceiver.cpp */; };
+		00216E941E96E980008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DDA1E96E97F008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp */; };
+		00216E951E96E980008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DDC1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */; };
+		00216E961E96E980008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DDE1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */; };
+		00216E971E96E980008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DE01E96E97F008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp */; };
+		00216E981E96E980008204EA /* c_org_ortc_RTCRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DE21E96E97F008204EA /* c_org_ortc_RTCRtpSender.cpp */; };
+		00216E991E96E980008204EA /* c_org_ortc_RTCRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DE41E96E97F008204EA /* c_org_ortc_RTCRtpStreamStats.cpp */; };
+		00216E9A1E96E980008204EA /* c_org_ortc_RTCRtpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DE61E96E97F008204EA /* c_org_ortc_RTCRtpTransport.cpp */; };
+		00216E9B1E96E980008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DE81E96E97F008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp */; };
+		00216E9C1E96E980008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DEA1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */; };
+		00216E9D1E96E980008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DEC1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */; };
+		00216E9E1E96E980008204EA /* c_org_ortc_RTCSctpCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DEE1E96E97F008204EA /* c_org_ortc_RTCSctpCapabilities.cpp */; };
+		00216E9F1E96E980008204EA /* c_org_ortc_RTCSctpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DF01E96E97F008204EA /* c_org_ortc_RTCSctpTransport.cpp */; };
+		00216EA01E96E980008204EA /* c_org_ortc_RTCSctpTransportListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DF21E96E97F008204EA /* c_org_ortc_RTCSctpTransportListener.cpp */; };
+		00216EA11E96E980008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DF41E96E97F008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp */; };
+		00216EA21E96E980008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DF61E96E97F008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp */; };
+		00216EA31E96E980008204EA /* c_org_ortc_RTCSctpTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DF81E96E97F008204EA /* c_org_ortc_RTCSctpTransportStats.cpp */; };
+		00216EA41E96E980008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DFA1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp */; };
+		00216EA51E96E980008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DFC1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp */; };
+		00216EA61E96E980008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DFE1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp */; };
+		00216EA71E96E980008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E001E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp */; };
+		00216EA81E96E980008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E021E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */; };
+		00216EA91E96E980008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E041E96E97F008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp */; };
+		00216EAA1E96E980008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E061E96E97F008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp */; };
+		00216EAB1E96E980008204EA /* c_org_ortc_RTCStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E081E96E97F008204EA /* c_org_ortc_RTCStats.cpp */; };
+		00216EAC1E96E980008204EA /* c_org_ortc_RTCStatsProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E0A1E96E97F008204EA /* c_org_ortc_RTCStatsProvider.cpp */; };
+		00216EAD1E96E980008204EA /* c_org_ortc_RTCStatsReport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E0C1E96E97F008204EA /* c_org_ortc_RTCStatsReport.cpp */; };
+		00216EAE1E96E980008204EA /* c_org_ortc_RTCStatsTypeSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E0E1E96E97F008204EA /* c_org_ortc_RTCStatsTypeSet.cpp */; };
+		00216EAF1E96E980008204EA /* c_org_ortc_Settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E101E96E97F008204EA /* c_org_ortc_Settings.cpp */; };
+		00216EB01E96E980008204EA /* c_org_ortc_StringOrStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E121E96E97F008204EA /* c_org_ortc_StringOrStringList.cpp */; };
+		52BFF6211E9CFBEE00DF88A1 /* libcryptopp-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6191E9CFBEE00DF88A1 /* libcryptopp-ios.a */; };
+		52BFF6221E9CFBEE00DF88A1 /* libidnkit-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF61A1E9CFBEE00DF88A1 /* libidnkit-ios.a */; };
+		52BFF6231E9CFBEE00DF88A1 /* libortclib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF61B1E9CFBEE00DF88A1 /* libortclib-ios.a */; };
+		52BFF6241E9CFBEE00DF88A1 /* libortclib-wrapper-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF61C1E9CFBEE00DF88A1 /* libortclib-wrapper-ios.a */; };
+		52BFF6251E9CFBEE00DF88A1 /* libortclib.services-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF61D1E9CFBEE00DF88A1 /* libortclib.services-ios.a */; };
+		52BFF6261E9CFBEE00DF88A1 /* libudns-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF61E1E9CFBEE00DF88A1 /* libudns-ios.a */; };
+		52BFF6271E9CFBEE00DF88A1 /* libzsLib-eventing-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF61F1E9CFBEE00DF88A1 /* libzsLib-eventing-ios.a */; };
+		52BFF6281E9CFBEE00DF88A1 /* libzsLib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6201E9CFBEE00DF88A1 /* libzsLib-ios.a */; };
+		52BFF6331E9CFC5500DF88A1 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6291E9CFC5500DF88A1 /* AudioToolbox.framework */; };
+		52BFF6341E9CFC5500DF88A1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62A1E9CFC5500DF88A1 /* AVFoundation.framework */; };
+		52BFF6351E9CFC5500DF88A1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62B1E9CFC5500DF88A1 /* CoreMedia.framework */; };
+		52BFF6361E9CFC5500DF88A1 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62C1E9CFC5500DF88A1 /* CoreVideo.framework */; };
+		52BFF6371E9CFC5500DF88A1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62D1E9CFC5500DF88A1 /* Foundation.framework */; };
+		52BFF6381E9CFC5500DF88A1 /* libresolv.9.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62E1E9CFC5500DF88A1 /* libresolv.9.tbd */; };
+		52BFF6391E9CFC5500DF88A1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62F1E9CFC5500DF88A1 /* libz.tbd */; };
+		52BFF63A1E9CFC5500DF88A1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6301E9CFC5500DF88A1 /* Security.framework */; };
+		52BFF63B1E9CFC5500DF88A1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6311E9CFC5500DF88A1 /* UIKit.framework */; };
+		52BFF63C1E9CFC5500DF88A1 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6321E9CFC5500DF88A1 /* VideoToolbox.framework */; };
+		52BFF63E1E9D053900DF88A1 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF63D1E9D053900DF88A1 /* libcurl.a */; };
+		52BFF6401E9D0A1800DF88A1 /* webrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF63F1E9D0A1800DF88A1 /* webrtc.a */; };
+		52BFF6491E9D0C2800DF88A1 /* c_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CDC1E96E97F008204EA /* c_helpers.cpp */; };
+		52BFF64A1E9D0C2800DF88A1 /* c_org_ortc_adapter_MediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CDE1E96E97F008204EA /* c_org_ortc_adapter_MediaStream.cpp */; };
+		52BFF64B1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CE01E96E97F008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp */; };
+		52BFF64C1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CE21E96E97F008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp */; };
+		52BFF64D1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CE41E96E97F008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp */; };
+		52BFF64E1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CE61E96E97F008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp */; };
+		52BFF64F1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CE81E96E97F008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */; };
+		52BFF6501E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CEA1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp */; };
+		52BFF6511E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCOfferOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CEC1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp */; };
+		52BFF6521E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CEE1E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp */; };
+		52BFF6531E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CF01E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */; };
+		52BFF6541E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CF21E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */; };
+		52BFF6551E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CF41E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp */; };
+		52BFF6561E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CF61E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */; };
+		52BFF6571E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CF81E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */; };
+		52BFF6581E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CFA1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */; };
+		52BFF6591E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CFC1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */; };
+		52BFF65A1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216CFE1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */; };
+		52BFF65B1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D001E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */; };
+		52BFF65C1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D021E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */; };
+		52BFF65D1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D041E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */; };
+		52BFF65E1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D061E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */; };
+		52BFF65F1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D081E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */; };
+		52BFF6601E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D0A1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */; };
+		52BFF6611E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D0C1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */; };
+		52BFF6621E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCTrackEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D0E1E96E97F008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp */; };
+		52BFF6631E9D0C2800DF88A1 /* c_org_ortc_ConstrainBoolean.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D101E96E97F008204EA /* c_org_ortc_ConstrainBoolean.cpp */; };
+		52BFF6641E9D0C2800DF88A1 /* c_org_ortc_ConstrainBooleanParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D121E96E97F008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp */; };
+		52BFF6651E9D0C2800DF88A1 /* c_org_ortc_ConstrainDouble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D141E96E97F008204EA /* c_org_ortc_ConstrainDouble.cpp */; };
+		52BFF6661E9D0C2800DF88A1 /* c_org_ortc_ConstrainDoubleRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D161E96E97F008204EA /* c_org_ortc_ConstrainDoubleRange.cpp */; };
+		52BFF6671E9D0C2800DF88A1 /* c_org_ortc_ConstrainLong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D181E96E97F008204EA /* c_org_ortc_ConstrainLong.cpp */; };
+		52BFF6681E9D0C2800DF88A1 /* c_org_ortc_ConstrainLongRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D1A1E96E97F008204EA /* c_org_ortc_ConstrainLongRange.cpp */; };
+		52BFF6691E9D0C2800DF88A1 /* c_org_ortc_ConstrainString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D1C1E96E97F008204EA /* c_org_ortc_ConstrainString.cpp */; };
+		52BFF66A1E9D0C2800DF88A1 /* c_org_ortc_ConstrainStringParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D1E1E96E97F008204EA /* c_org_ortc_ConstrainStringParameters.cpp */; };
+		52BFF66B1E9D0C2800DF88A1 /* c_org_ortc_DoubleRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D201E96E97F008204EA /* c_org_ortc_DoubleRange.cpp */; };
+		52BFF66C1E9D0C2800DF88A1 /* c_org_ortc_Error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D221E96E97F008204EA /* c_org_ortc_Error.cpp */; };
+		52BFF66D1E9D0C2800DF88A1 /* c_org_ortc_ErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D241E96E97F008204EA /* c_org_ortc_ErrorEvent.cpp */; };
+		52BFF66E1E9D0C2800DF88A1 /* c_org_ortc_Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D261E96E97F008204EA /* c_org_ortc_Json.cpp */; };
+		52BFF66F1E9D0C2800DF88A1 /* c_org_ortc_Logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D281E96E97F008204EA /* c_org_ortc_Logger.cpp */; };
+		52BFF6701E9D0C2800DF88A1 /* c_org_ortc_LongRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D2A1E96E97F008204EA /* c_org_ortc_LongRange.cpp */; };
+		52BFF6711E9D0C2800DF88A1 /* c_org_ortc_MediaControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D2C1E96E97F008204EA /* c_org_ortc_MediaControl.cpp */; };
+		52BFF6721E9D0C2800DF88A1 /* c_org_ortc_MediaDeviceInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D2E1E96E97F008204EA /* c_org_ortc_MediaDeviceInfo.cpp */; };
+		52BFF6731E9D0C2800DF88A1 /* c_org_ortc_MediaDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D301E96E97F008204EA /* c_org_ortc_MediaDevices.cpp */; };
+		52BFF6741E9D0C2800DF88A1 /* c_org_ortc_MediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D321E96E97F008204EA /* c_org_ortc_MediaSource.cpp */; };
+		52BFF6751E9D0C2800DF88A1 /* c_org_ortc_MediaStreamConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D341E96E97F008204EA /* c_org_ortc_MediaStreamConstraints.cpp */; };
+		52BFF6761E9D0C2800DF88A1 /* c_org_ortc_MediaStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D361E96E97F008204EA /* c_org_ortc_MediaStreamTrack.cpp */; };
+		52BFF6771E9D0C2800DF88A1 /* c_org_ortc_MediaTrackCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D381E96E97F008204EA /* c_org_ortc_MediaTrackCapabilities.cpp */; };
+		52BFF6781E9D0C2800DF88A1 /* c_org_ortc_MediaTrackConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D3A1E96E97F008204EA /* c_org_ortc_MediaTrackConstraints.cpp */; };
+		52BFF6791E9D0C2800DF88A1 /* c_org_ortc_MediaTrackConstraintSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D3C1E96E97F008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp */; };
+		52BFF67A1E9D0C2800DF88A1 /* c_org_ortc_MediaTrackSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D3E1E96E97F008204EA /* c_org_ortc_MediaTrackSettings.cpp */; };
+		52BFF67B1E9D0C2800DF88A1 /* c_org_ortc_MediaTrackSupportedConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D401E96E97F008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp */; };
+		52BFF67C1E9D0C2800DF88A1 /* c_org_ortc_MessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D421E96E97F008204EA /* c_org_ortc_MessageQueue.cpp */; };
+		52BFF67D1E9D0C2800DF88A1 /* c_org_ortc_OrtcLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D441E96E97F008204EA /* c_org_ortc_OrtcLib.cpp */; };
+		52BFF67E1E9D0C2800DF88A1 /* c_org_ortc_OverconstrainedError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D461E96E97F008204EA /* c_org_ortc_OverconstrainedError.cpp */; };
+		52BFF67F1E9D0C2800DF88A1 /* c_org_ortc_OverconstrainedErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D481E96E97F008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp */; };
+		52BFF6801E9D0C2800DF88A1 /* c_org_ortc_RTCCertificate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D4A1E96E97F008204EA /* c_org_ortc_RTCCertificate.cpp */; };
+		52BFF6811E9D0C2800DF88A1 /* c_org_ortc_RTCCertificateStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D4C1E96E97F008204EA /* c_org_ortc_RTCCertificateStats.cpp */; };
+		52BFF6821E9D0C2800DF88A1 /* c_org_ortc_RTCCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D4E1E96E97F008204EA /* c_org_ortc_RTCCodec.cpp */; };
+		52BFF6831E9D0C2800DF88A1 /* c_org_ortc_RTCDataChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D501E96E97F008204EA /* c_org_ortc_RTCDataChannel.cpp */; };
+		52BFF6841E9D0C2800DF88A1 /* c_org_ortc_RTCDataChannelEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D521E96E97F008204EA /* c_org_ortc_RTCDataChannelEvent.cpp */; };
+		52BFF6851E9D0C2800DF88A1 /* c_org_ortc_RTCDataChannelParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D541E96E97F008204EA /* c_org_ortc_RTCDataChannelParameters.cpp */; };
+		52BFF6861E9D0C2800DF88A1 /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D561E96E97F008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp */; };
+		52BFF6871E9D0C2800DF88A1 /* c_org_ortc_RTCDataChannelStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D581E96E97F008204EA /* c_org_ortc_RTCDataChannelStats.cpp */; };
+		52BFF6881E9D0C2800DF88A1 /* c_org_ortc_RTCDataTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D5A1E96E97F008204EA /* c_org_ortc_RTCDataTransport.cpp */; };
+		52BFF6891E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsCertificateBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D5C1E96E97F008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp */; };
+		52BFF68A1E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsFingerprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D5E1E96E97F008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp */; };
+		52BFF68B1E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D601E96E97F008204EA /* c_org_ortc_RTCDtlsParameters.cpp */; };
+		52BFF68C1E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D621E96E97F008204EA /* c_org_ortc_RTCDtlsTransport.cpp */; };
+		52BFF68D1E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D641E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */; };
+		52BFF68E1E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D661E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp */; };
+		52BFF68F1E9D0C2800DF88A1 /* c_org_ortc_RTCDtmfSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D681E96E97F008204EA /* c_org_ortc_RTCDtmfSender.cpp */; };
+		52BFF6901E9D0C2800DF88A1 /* c_org_ortc_RTCDtmfToneChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D6A1E96E97F008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp */; };
+		52BFF6911E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D6C1E96E97F008204EA /* c_org_ortc_RTCIceCandidate.cpp */; };
+		52BFF6921E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidateAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D6E1E96E97F008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp */; };
+		52BFF6931E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidateComplete.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D701E96E97F008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp */; };
+		52BFF6941E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidatePair.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D721E96E97F008204EA /* c_org_ortc_RTCIceCandidatePair.cpp */; };
+		52BFF6951E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D741E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp */; };
+		52BFF6961E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidatePairStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D761E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp */; };
+		52BFF6971E9D0C2800DF88A1 /* c_org_ortc_RTCIceGatherer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D781E96E97F008204EA /* c_org_ortc_RTCIceGatherer.cpp */; };
+		52BFF6981E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D7A1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp */; };
+		52BFF6991E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D7C1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */; };
+		52BFF69A1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererCandidateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D7E1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp */; };
+		52BFF69B1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D801E96E97F008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp */; };
+		52BFF69C1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D821E96E97F008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp */; };
+		52BFF69D1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D841E96E97F008204EA /* c_org_ortc_RTCIceGathererStats.cpp */; };
+		52BFF69E1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D861E96E97F008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp */; };
+		52BFF69F1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGatherOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D881E96E97F008204EA /* c_org_ortc_RTCIceGatherOptions.cpp */; };
+		52BFF6A01E9D0C2800DF88A1 /* c_org_ortc_RTCIceParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D8A1E96E97F008204EA /* c_org_ortc_RTCIceParameters.cpp */; };
+		52BFF6A11E9D0C2800DF88A1 /* c_org_ortc_RTCIceServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D8C1E96E97F008204EA /* c_org_ortc_RTCIceServer.cpp */; };
+		52BFF6A21E9D0C2800DF88A1 /* c_org_ortc_RTCIceTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D8E1E96E97F008204EA /* c_org_ortc_RTCIceTransport.cpp */; };
+		52BFF6A31E9D0C2800DF88A1 /* c_org_ortc_RTCIceTransportController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D901E96E97F008204EA /* c_org_ortc_RTCIceTransportController.cpp */; };
+		52BFF6A41E9D0C2800DF88A1 /* c_org_ortc_RTCIceTransportOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D921E96E97F008204EA /* c_org_ortc_RTCIceTransportOptions.cpp */; };
+		52BFF6A51E9D0C2800DF88A1 /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D941E96E97F008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp */; };
+		52BFF6A61E9D0C2800DF88A1 /* c_org_ortc_RTCIceTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D961E96E97F008204EA /* c_org_ortc_RTCIceTransportStats.cpp */; };
+		52BFF6A71E9D0C2800DF88A1 /* c_org_ortc_RTCIdentity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D981E96E97F008204EA /* c_org_ortc_RTCIdentity.cpp */; };
+		52BFF6A81E9D0C2800DF88A1 /* c_org_ortc_RTCIdentityAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D9A1E96E97F008204EA /* c_org_ortc_RTCIdentityAssertion.cpp */; };
+		52BFF6A91E9D0C2800DF88A1 /* c_org_ortc_RTCIdentityError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D9C1E96E97F008204EA /* c_org_ortc_RTCIdentityError.cpp */; };
+		52BFF6AA1E9D0C2800DF88A1 /* c_org_ortc_RTCIdentityResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216D9E1E96E97F008204EA /* c_org_ortc_RTCIdentityResult.cpp */; };
+		52BFF6AB1E9D0C2800DF88A1 /* c_org_ortc_RTCInboundRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DA01E96E97F008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp */; };
+		52BFF6AC1E9D0C2800DF88A1 /* c_org_ortc_RTCMediaStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DA21E96E97F008204EA /* c_org_ortc_RTCMediaStreamStats.cpp */; };
+		52BFF6AD1E9D0C2800DF88A1 /* c_org_ortc_RTCMediaStreamTrackStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DA41E96E97F008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp */; };
+		52BFF6AE1E9D0C2800DF88A1 /* c_org_ortc_RTCMessageEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DA61E96E97F008204EA /* c_org_ortc_RTCMessageEvent.cpp */; };
+		52BFF6AF1E9D0C2900DF88A1 /* c_org_ortc_RTCOutboundRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DA81E96E97F008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp */; };
+		52BFF6B01E9D0C2900DF88A1 /* c_org_ortc_RTCRtcpFeedback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DAA1E96E97F008204EA /* c_org_ortc_RTCRtcpFeedback.cpp */; };
+		52BFF6B11E9D0C2900DF88A1 /* c_org_ortc_RTCRtcpParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DAC1E96E97F008204EA /* c_org_ortc_RTCRtcpParameters.cpp */; };
+		52BFF6B21E9D0C2900DF88A1 /* c_org_ortc_RTCRtcpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DAE1E96E97F008204EA /* c_org_ortc_RTCRtcpTransport.cpp */; };
+		52BFF6B31E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DB01E96E97F008204EA /* c_org_ortc_RTCRtpCapabilities.cpp */; };
+		52BFF6B41E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCodecCapability.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DB21E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp */; };
+		52BFF6B51E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DB41E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp */; };
+		52BFF6B61E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DB61E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp */; };
+		52BFF6B71E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCodecParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DB81E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp */; };
+		52BFF6B81E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DBA1E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp */; };
+		52BFF6B91E9D0C2900DF88A1 /* c_org_ortc_RTCRtpContributingSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DBC1E96E97F008204EA /* c_org_ortc_RTCRtpContributingSource.cpp */; };
+		52BFF6BA1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpEncodingParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DBE1E96E97F008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp */; };
+		52BFF6BB1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpFecParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DC01E96E97F008204EA /* c_org_ortc_RTCRtpFecParameters.cpp */; };
+		52BFF6BC1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DC21E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */; };
+		52BFF6BD1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DC41E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */; };
+		52BFF6BE1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DC61E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */; };
+		52BFF6BF1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DC81E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp */; };
+		52BFF6C01E9D0C2900DF88A1 /* c_org_ortc_RTCRtpHeaderExtension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DCA1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp */; };
+		52BFF6C11E9D0C2900DF88A1 /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DCC1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp */; };
+		52BFF6C21E9D0C2900DF88A1 /* c_org_ortc_RTCRtpListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DCE1E96E97F008204EA /* c_org_ortc_RTCRtpListener.cpp */; };
+		52BFF6C31E9D0C2900DF88A1 /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DD01E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */; };
+		52BFF6C41E9D0C2900DF88A1 /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DD21E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */; };
+		52BFF6C51E9D0C2900DF88A1 /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DD41E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */; };
+		52BFF6C61E9D0C2900DF88A1 /* c_org_ortc_RTCRtpParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DD61E96E97F008204EA /* c_org_ortc_RTCRtpParameters.cpp */; };
+		52BFF6C71E9D0C2900DF88A1 /* c_org_ortc_RTCRtpReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DD81E96E97F008204EA /* c_org_ortc_RTCRtpReceiver.cpp */; };
+		52BFF6C81E9D0C2900DF88A1 /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DDA1E96E97F008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp */; };
+		52BFF6C91E9D0C2900DF88A1 /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DDC1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */; };
+		52BFF6CA1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DDE1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */; };
+		52BFF6CB1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpRtxParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DE01E96E97F008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp */; };
+		52BFF6CC1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DE21E96E97F008204EA /* c_org_ortc_RTCRtpSender.cpp */; };
+		52BFF6CD1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DE41E96E97F008204EA /* c_org_ortc_RTCRtpStreamStats.cpp */; };
+		52BFF6CE1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DE61E96E97F008204EA /* c_org_ortc_RTCRtpTransport.cpp */; };
+		52BFF6CF1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpUnhandledEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DE81E96E97F008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp */; };
+		52BFF6D01E9D0C2900DF88A1 /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DEA1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */; };
+		52BFF6D11E9D0C2900DF88A1 /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DEC1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */; };
+		52BFF6D21E9D0C2900DF88A1 /* c_org_ortc_RTCSctpCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DEE1E96E97F008204EA /* c_org_ortc_RTCSctpCapabilities.cpp */; };
+		52BFF6D31E9D0C2900DF88A1 /* c_org_ortc_RTCSctpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DF01E96E97F008204EA /* c_org_ortc_RTCSctpTransport.cpp */; };
+		52BFF6D41E9D0C2900DF88A1 /* c_org_ortc_RTCSctpTransportListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DF21E96E97F008204EA /* c_org_ortc_RTCSctpTransportListener.cpp */; };
+		52BFF6D51E9D0C2900DF88A1 /* c_org_ortc_RTCSctpTransportListenerEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DF41E96E97F008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp */; };
+		52BFF6D61E9D0C2900DF88A1 /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DF61E96E97F008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp */; };
+		52BFF6D71E9D0C2900DF88A1 /* c_org_ortc_RTCSctpTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DF81E96E97F008204EA /* c_org_ortc_RTCSctpTransportStats.cpp */; };
+		52BFF6D81E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DFA1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp */; };
+		52BFF6D91E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DFC1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp */; };
+		52BFF6DA1E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpSdesParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216DFE1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp */; };
+		52BFF6DB1E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpSdesTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E001E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp */; };
+		52BFF6DC1E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E021E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */; };
+		52BFF6DD1E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E041E96E97F008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp */; };
+		52BFF6DE1E9D0C2900DF88A1 /* c_org_ortc_RTCSsrcConflictEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E061E96E97F008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp */; };
+		52BFF6DF1E9D0C2900DF88A1 /* c_org_ortc_RTCStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E081E96E97F008204EA /* c_org_ortc_RTCStats.cpp */; };
+		52BFF6E01E9D0C2900DF88A1 /* c_org_ortc_RTCStatsProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E0A1E96E97F008204EA /* c_org_ortc_RTCStatsProvider.cpp */; };
+		52BFF6E11E9D0C2900DF88A1 /* c_org_ortc_RTCStatsReport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E0C1E96E97F008204EA /* c_org_ortc_RTCStatsReport.cpp */; };
+		52BFF6E21E9D0C2900DF88A1 /* c_org_ortc_RTCStatsTypeSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E0E1E96E97F008204EA /* c_org_ortc_RTCStatsTypeSet.cpp */; };
+		52BFF6E31E9D0C2900DF88A1 /* c_org_ortc_Settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E101E96E97F008204EA /* c_org_ortc_Settings.cpp */; };
+		52BFF6E41E9D0C2900DF88A1 /* c_org_ortc_StringOrStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216E121E96E97F008204EA /* c_org_ortc_StringOrStringList.cpp */; };
+		52BFF6E51E9D0D6F00DF88A1 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6291E9CFC5500DF88A1 /* AudioToolbox.framework */; };
+		52BFF6E61E9D0D6F00DF88A1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62A1E9CFC5500DF88A1 /* AVFoundation.framework */; };
+		52BFF6E71E9D0D6F00DF88A1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62B1E9CFC5500DF88A1 /* CoreMedia.framework */; };
+		52BFF6E81E9D0D6F00DF88A1 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62C1E9CFC5500DF88A1 /* CoreVideo.framework */; };
+		52BFF6E91E9D0D6F00DF88A1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62D1E9CFC5500DF88A1 /* Foundation.framework */; };
+		52BFF6EA1E9D0D6F00DF88A1 /* libresolv.9.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62E1E9CFC5500DF88A1 /* libresolv.9.tbd */; };
+		52BFF6EB1E9D0D6F00DF88A1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF62F1E9CFC5500DF88A1 /* libz.tbd */; };
+		52BFF6EC1E9D0D6F00DF88A1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6301E9CFC5500DF88A1 /* Security.framework */; };
+		52BFF6ED1E9D0D6F00DF88A1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6311E9CFC5500DF88A1 /* UIKit.framework */; };
+		52BFF6EE1E9D0D6F00DF88A1 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6321E9CFC5500DF88A1 /* VideoToolbox.framework */; };
+		52BFF6F71E9D0D6F00DF88A1 /* libcryptopp-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6EF1E9D0D6F00DF88A1 /* libcryptopp-ios.a */; };
+		52BFF6F81E9D0D6F00DF88A1 /* libidnkit-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6F01E9D0D6F00DF88A1 /* libidnkit-ios.a */; };
+		52BFF6F91E9D0D6F00DF88A1 /* libortclib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6F11E9D0D6F00DF88A1 /* libortclib-ios.a */; };
+		52BFF6FA1E9D0D6F00DF88A1 /* libortclib-wrapper-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6F21E9D0D6F00DF88A1 /* libortclib-wrapper-ios.a */; };
+		52BFF6FB1E9D0D6F00DF88A1 /* libortclib.services-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6F31E9D0D6F00DF88A1 /* libortclib.services-ios.a */; };
+		52BFF6FC1E9D0D6F00DF88A1 /* libudns-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6F41E9D0D6F00DF88A1 /* libudns-ios.a */; };
+		52BFF6FD1E9D0D6F00DF88A1 /* libzsLib-eventing-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6F51E9D0D6F00DF88A1 /* libzsLib-eventing-ios.a */; };
+		52BFF6FE1E9D0D6F00DF88A1 /* libzsLib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF6F61E9D0D6F00DF88A1 /* libzsLib-ios.a */; };
+		52BFF6FF1E9D0D8300DF88A1 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF63D1E9D053900DF88A1 /* libcurl.a */; };
+		52BFF7001E9D0D9400DF88A1 /* webrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BFF63F1E9D0A1800DF88A1 /* webrtc.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		529AA64F1E9F90B8007ACFD2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 529AA64B1E9F90B8007ACFD2 /* webrtcWrapper_ios.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 9451F25C1BC54F57008CB8D7;
+			remoteInfo = webrtcWrapper_ios;
+		};
+		529AA6511E9F90C0007ACFD2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 529AA64B1E9F90B8007ACFD2 /* webrtcWrapper_ios.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 9451F25B1BC54F57008CB8D7;
+			remoteInfo = webrtcWrapper_ios;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		00216CCD1E96E939008204EA /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		00216CCF1E96E939008204EA /* libortclib-c-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libortclib-c-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		00216CDC1E96E97F008204EA /* c_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_helpers.cpp; sourceTree = "<group>"; };
+		00216CDD1E96E97F008204EA /* c_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_helpers.h; sourceTree = "<group>"; };
+		00216CDE1E96E97F008204EA /* c_org_ortc_adapter_MediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_MediaStream.cpp; sourceTree = "<group>"; };
+		00216CDF1E96E97F008204EA /* c_org_ortc_adapter_MediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_MediaStream.h; sourceTree = "<group>"; };
+		00216CE01E96E97F008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCAnswerOptions.cpp; sourceTree = "<group>"; };
+		00216CE11E96E97F008204EA /* c_org_ortc_adapter_RTCAnswerOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCAnswerOptions.h; sourceTree = "<group>"; };
+		00216CE21E96E97F008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCCapabilityOptions.cpp; sourceTree = "<group>"; };
+		00216CE31E96E97F008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCCapabilityOptions.h; sourceTree = "<group>"; };
+		00216CE41E96E97F008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCConfiguration.cpp; sourceTree = "<group>"; };
+		00216CE51E96E97F008204EA /* c_org_ortc_adapter_RTCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCConfiguration.h; sourceTree = "<group>"; };
+		00216CE61E96E97F008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCIceCandidate.cpp; sourceTree = "<group>"; };
+		00216CE71E96E97F008204EA /* c_org_ortc_adapter_RTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCIceCandidate.h; sourceTree = "<group>"; };
+		00216CE81E96E97F008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp; sourceTree = "<group>"; };
+		00216CE91E96E97F008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h; sourceTree = "<group>"; };
+		00216CEA1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCOfferAnswerOptions.cpp; sourceTree = "<group>"; };
+		00216CEB1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCOfferAnswerOptions.h; sourceTree = "<group>"; };
+		00216CEC1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCOfferOptions.cpp; sourceTree = "<group>"; };
+		00216CED1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCOfferOptions.h; sourceTree = "<group>"; };
+		00216CEE1E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCPeerConnection.cpp; sourceTree = "<group>"; };
+		00216CEF1E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCPeerConnection.h; sourceTree = "<group>"; };
+		00216CF01E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp; sourceTree = "<group>"; };
+		00216CF11E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h; sourceTree = "<group>"; };
+		00216CF21E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp; sourceTree = "<group>"; };
+		00216CF31E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCPeerConnectionIceEvent.h; sourceTree = "<group>"; };
+		00216CF41E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescription.cpp; sourceTree = "<group>"; };
+		00216CF51E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescription.h; sourceTree = "<group>"; };
+		00216CF61E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp; sourceTree = "<group>"; };
+		00216CF71E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h; sourceTree = "<group>"; };
+		00216CF81E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp; sourceTree = "<group>"; };
+		00216CF91E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h; sourceTree = "<group>"; };
+		00216CFA1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp; sourceTree = "<group>"; };
+		00216CFB1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionDescription.h; sourceTree = "<group>"; };
+		00216CFC1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp; sourceTree = "<group>"; };
+		00216CFD1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h; sourceTree = "<group>"; };
+		00216CFE1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp; sourceTree = "<group>"; };
+		00216CFF1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h; sourceTree = "<group>"; };
+		00216D001E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp; sourceTree = "<group>"; };
+		00216D011E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h; sourceTree = "<group>"; };
+		00216D021E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp; sourceTree = "<group>"; };
+		00216D031E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h; sourceTree = "<group>"; };
+		00216D041E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp; sourceTree = "<group>"; };
+		00216D051E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h; sourceTree = "<group>"; };
+		00216D061E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp; sourceTree = "<group>"; };
+		00216D071E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h; sourceTree = "<group>"; };
+		00216D081E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp; sourceTree = "<group>"; };
+		00216D091E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h; sourceTree = "<group>"; };
+		00216D0A1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp; sourceTree = "<group>"; };
+		00216D0B1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionTransport.h; sourceTree = "<group>"; };
+		00216D0C1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp; sourceTree = "<group>"; };
+		00216D0D1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h; sourceTree = "<group>"; };
+		00216D0E1E96E97F008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCTrackEvent.cpp; sourceTree = "<group>"; };
+		00216D0F1E96E97F008204EA /* c_org_ortc_adapter_RTCTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCTrackEvent.h; sourceTree = "<group>"; };
+		00216D101E96E97F008204EA /* c_org_ortc_ConstrainBoolean.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainBoolean.cpp; sourceTree = "<group>"; };
+		00216D111E96E97F008204EA /* c_org_ortc_ConstrainBoolean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainBoolean.h; sourceTree = "<group>"; };
+		00216D121E96E97F008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainBooleanParameters.cpp; sourceTree = "<group>"; };
+		00216D131E96E97F008204EA /* c_org_ortc_ConstrainBooleanParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainBooleanParameters.h; sourceTree = "<group>"; };
+		00216D141E96E97F008204EA /* c_org_ortc_ConstrainDouble.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainDouble.cpp; sourceTree = "<group>"; };
+		00216D151E96E97F008204EA /* c_org_ortc_ConstrainDouble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainDouble.h; sourceTree = "<group>"; };
+		00216D161E96E97F008204EA /* c_org_ortc_ConstrainDoubleRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainDoubleRange.cpp; sourceTree = "<group>"; };
+		00216D171E96E97F008204EA /* c_org_ortc_ConstrainDoubleRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainDoubleRange.h; sourceTree = "<group>"; };
+		00216D181E96E97F008204EA /* c_org_ortc_ConstrainLong.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainLong.cpp; sourceTree = "<group>"; };
+		00216D191E96E97F008204EA /* c_org_ortc_ConstrainLong.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainLong.h; sourceTree = "<group>"; };
+		00216D1A1E96E97F008204EA /* c_org_ortc_ConstrainLongRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainLongRange.cpp; sourceTree = "<group>"; };
+		00216D1B1E96E97F008204EA /* c_org_ortc_ConstrainLongRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainLongRange.h; sourceTree = "<group>"; };
+		00216D1C1E96E97F008204EA /* c_org_ortc_ConstrainString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainString.cpp; sourceTree = "<group>"; };
+		00216D1D1E96E97F008204EA /* c_org_ortc_ConstrainString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainString.h; sourceTree = "<group>"; };
+		00216D1E1E96E97F008204EA /* c_org_ortc_ConstrainStringParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainStringParameters.cpp; sourceTree = "<group>"; };
+		00216D1F1E96E97F008204EA /* c_org_ortc_ConstrainStringParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainStringParameters.h; sourceTree = "<group>"; };
+		00216D201E96E97F008204EA /* c_org_ortc_DoubleRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_DoubleRange.cpp; sourceTree = "<group>"; };
+		00216D211E96E97F008204EA /* c_org_ortc_DoubleRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_DoubleRange.h; sourceTree = "<group>"; };
+		00216D221E96E97F008204EA /* c_org_ortc_Error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_Error.cpp; sourceTree = "<group>"; };
+		00216D231E96E97F008204EA /* c_org_ortc_Error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_Error.h; sourceTree = "<group>"; };
+		00216D241E96E97F008204EA /* c_org_ortc_ErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ErrorEvent.cpp; sourceTree = "<group>"; };
+		00216D251E96E97F008204EA /* c_org_ortc_ErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ErrorEvent.h; sourceTree = "<group>"; };
+		00216D261E96E97F008204EA /* c_org_ortc_Json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_Json.cpp; sourceTree = "<group>"; };
+		00216D271E96E97F008204EA /* c_org_ortc_Json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_Json.h; sourceTree = "<group>"; };
+		00216D281E96E97F008204EA /* c_org_ortc_Logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_Logger.cpp; sourceTree = "<group>"; };
+		00216D291E96E97F008204EA /* c_org_ortc_Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_Logger.h; sourceTree = "<group>"; };
+		00216D2A1E96E97F008204EA /* c_org_ortc_LongRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_LongRange.cpp; sourceTree = "<group>"; };
+		00216D2B1E96E97F008204EA /* c_org_ortc_LongRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_LongRange.h; sourceTree = "<group>"; };
+		00216D2C1E96E97F008204EA /* c_org_ortc_MediaControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaControl.cpp; sourceTree = "<group>"; };
+		00216D2D1E96E97F008204EA /* c_org_ortc_MediaControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaControl.h; sourceTree = "<group>"; };
+		00216D2E1E96E97F008204EA /* c_org_ortc_MediaDeviceInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaDeviceInfo.cpp; sourceTree = "<group>"; };
+		00216D2F1E96E97F008204EA /* c_org_ortc_MediaDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaDeviceInfo.h; sourceTree = "<group>"; };
+		00216D301E96E97F008204EA /* c_org_ortc_MediaDevices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaDevices.cpp; sourceTree = "<group>"; };
+		00216D311E96E97F008204EA /* c_org_ortc_MediaDevices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaDevices.h; sourceTree = "<group>"; };
+		00216D321E96E97F008204EA /* c_org_ortc_MediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaSource.cpp; sourceTree = "<group>"; };
+		00216D331E96E97F008204EA /* c_org_ortc_MediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaSource.h; sourceTree = "<group>"; };
+		00216D341E96E97F008204EA /* c_org_ortc_MediaStreamConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaStreamConstraints.cpp; sourceTree = "<group>"; };
+		00216D351E96E97F008204EA /* c_org_ortc_MediaStreamConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaStreamConstraints.h; sourceTree = "<group>"; };
+		00216D361E96E97F008204EA /* c_org_ortc_MediaStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaStreamTrack.cpp; sourceTree = "<group>"; };
+		00216D371E96E97F008204EA /* c_org_ortc_MediaStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaStreamTrack.h; sourceTree = "<group>"; };
+		00216D381E96E97F008204EA /* c_org_ortc_MediaTrackCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaTrackCapabilities.cpp; sourceTree = "<group>"; };
+		00216D391E96E97F008204EA /* c_org_ortc_MediaTrackCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaTrackCapabilities.h; sourceTree = "<group>"; };
+		00216D3A1E96E97F008204EA /* c_org_ortc_MediaTrackConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaTrackConstraints.cpp; sourceTree = "<group>"; };
+		00216D3B1E96E97F008204EA /* c_org_ortc_MediaTrackConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaTrackConstraints.h; sourceTree = "<group>"; };
+		00216D3C1E96E97F008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaTrackConstraintSet.cpp; sourceTree = "<group>"; };
+		00216D3D1E96E97F008204EA /* c_org_ortc_MediaTrackConstraintSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaTrackConstraintSet.h; sourceTree = "<group>"; };
+		00216D3E1E96E97F008204EA /* c_org_ortc_MediaTrackSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaTrackSettings.cpp; sourceTree = "<group>"; };
+		00216D3F1E96E97F008204EA /* c_org_ortc_MediaTrackSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaTrackSettings.h; sourceTree = "<group>"; };
+		00216D401E96E97F008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaTrackSupportedConstraints.cpp; sourceTree = "<group>"; };
+		00216D411E96E97F008204EA /* c_org_ortc_MediaTrackSupportedConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaTrackSupportedConstraints.h; sourceTree = "<group>"; };
+		00216D421E96E97F008204EA /* c_org_ortc_MessageQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MessageQueue.cpp; sourceTree = "<group>"; };
+		00216D431E96E97F008204EA /* c_org_ortc_MessageQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MessageQueue.h; sourceTree = "<group>"; };
+		00216D441E96E97F008204EA /* c_org_ortc_OrtcLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_OrtcLib.cpp; sourceTree = "<group>"; };
+		00216D451E96E97F008204EA /* c_org_ortc_OrtcLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_OrtcLib.h; sourceTree = "<group>"; };
+		00216D461E96E97F008204EA /* c_org_ortc_OverconstrainedError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_OverconstrainedError.cpp; sourceTree = "<group>"; };
+		00216D471E96E97F008204EA /* c_org_ortc_OverconstrainedError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_OverconstrainedError.h; sourceTree = "<group>"; };
+		00216D481E96E97F008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_OverconstrainedErrorEvent.cpp; sourceTree = "<group>"; };
+		00216D491E96E97F008204EA /* c_org_ortc_OverconstrainedErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_OverconstrainedErrorEvent.h; sourceTree = "<group>"; };
+		00216D4A1E96E97F008204EA /* c_org_ortc_RTCCertificate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCCertificate.cpp; sourceTree = "<group>"; };
+		00216D4B1E96E97F008204EA /* c_org_ortc_RTCCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCCertificate.h; sourceTree = "<group>"; };
+		00216D4C1E96E97F008204EA /* c_org_ortc_RTCCertificateStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCCertificateStats.cpp; sourceTree = "<group>"; };
+		00216D4D1E96E97F008204EA /* c_org_ortc_RTCCertificateStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCCertificateStats.h; sourceTree = "<group>"; };
+		00216D4E1E96E97F008204EA /* c_org_ortc_RTCCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCCodec.cpp; sourceTree = "<group>"; };
+		00216D4F1E96E97F008204EA /* c_org_ortc_RTCCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCCodec.h; sourceTree = "<group>"; };
+		00216D501E96E97F008204EA /* c_org_ortc_RTCDataChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataChannel.cpp; sourceTree = "<group>"; };
+		00216D511E96E97F008204EA /* c_org_ortc_RTCDataChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataChannel.h; sourceTree = "<group>"; };
+		00216D521E96E97F008204EA /* c_org_ortc_RTCDataChannelEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataChannelEvent.cpp; sourceTree = "<group>"; };
+		00216D531E96E97F008204EA /* c_org_ortc_RTCDataChannelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataChannelEvent.h; sourceTree = "<group>"; };
+		00216D541E96E97F008204EA /* c_org_ortc_RTCDataChannelParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataChannelParameters.cpp; sourceTree = "<group>"; };
+		00216D551E96E97F008204EA /* c_org_ortc_RTCDataChannelParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataChannelParameters.h; sourceTree = "<group>"; };
+		00216D561E96E97F008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataChannelStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00216D571E96E97F008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataChannelStateChangeEvent.h; sourceTree = "<group>"; };
+		00216D581E96E97F008204EA /* c_org_ortc_RTCDataChannelStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataChannelStats.cpp; sourceTree = "<group>"; };
+		00216D591E96E97F008204EA /* c_org_ortc_RTCDataChannelStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataChannelStats.h; sourceTree = "<group>"; };
+		00216D5A1E96E97F008204EA /* c_org_ortc_RTCDataTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataTransport.cpp; sourceTree = "<group>"; };
+		00216D5B1E96E97F008204EA /* c_org_ortc_RTCDataTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataTransport.h; sourceTree = "<group>"; };
+		00216D5C1E96E97F008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsCertificateBinary.cpp; sourceTree = "<group>"; };
+		00216D5D1E96E97F008204EA /* c_org_ortc_RTCDtlsCertificateBinary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsCertificateBinary.h; sourceTree = "<group>"; };
+		00216D5E1E96E97F008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsFingerprint.cpp; sourceTree = "<group>"; };
+		00216D5F1E96E97F008204EA /* c_org_ortc_RTCDtlsFingerprint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsFingerprint.h; sourceTree = "<group>"; };
+		00216D601E96E97F008204EA /* c_org_ortc_RTCDtlsParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsParameters.cpp; sourceTree = "<group>"; };
+		00216D611E96E97F008204EA /* c_org_ortc_RTCDtlsParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsParameters.h; sourceTree = "<group>"; };
+		00216D621E96E97F008204EA /* c_org_ortc_RTCDtlsTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsTransport.cpp; sourceTree = "<group>"; };
+		00216D631E96E97F008204EA /* c_org_ortc_RTCDtlsTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsTransport.h; sourceTree = "<group>"; };
+		00216D641E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00216D651E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		00216D661E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsTransportStats.cpp; sourceTree = "<group>"; };
+		00216D671E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsTransportStats.h; sourceTree = "<group>"; };
+		00216D681E96E97F008204EA /* c_org_ortc_RTCDtmfSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtmfSender.cpp; sourceTree = "<group>"; };
+		00216D691E96E97F008204EA /* c_org_ortc_RTCDtmfSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtmfSender.h; sourceTree = "<group>"; };
+		00216D6A1E96E97F008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtmfToneChangeEvent.cpp; sourceTree = "<group>"; };
+		00216D6B1E96E97F008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtmfToneChangeEvent.h; sourceTree = "<group>"; };
+		00216D6C1E96E97F008204EA /* c_org_ortc_RTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidate.cpp; sourceTree = "<group>"; };
+		00216D6D1E96E97F008204EA /* c_org_ortc_RTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidate.h; sourceTree = "<group>"; };
+		00216D6E1E96E97F008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidateAttributes.cpp; sourceTree = "<group>"; };
+		00216D6F1E96E97F008204EA /* c_org_ortc_RTCIceCandidateAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidateAttributes.h; sourceTree = "<group>"; };
+		00216D701E96E97F008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidateComplete.cpp; sourceTree = "<group>"; };
+		00216D711E96E97F008204EA /* c_org_ortc_RTCIceCandidateComplete.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidateComplete.h; sourceTree = "<group>"; };
+		00216D721E96E97F008204EA /* c_org_ortc_RTCIceCandidatePair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidatePair.cpp; sourceTree = "<group>"; };
+		00216D731E96E97F008204EA /* c_org_ortc_RTCIceCandidatePair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidatePair.h; sourceTree = "<group>"; };
+		00216D741E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidatePairChangeEvent.cpp; sourceTree = "<group>"; };
+		00216D751E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidatePairChangeEvent.h; sourceTree = "<group>"; };
+		00216D761E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidatePairStats.cpp; sourceTree = "<group>"; };
+		00216D771E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidatePairStats.h; sourceTree = "<group>"; };
+		00216D781E96E97F008204EA /* c_org_ortc_RTCIceGatherer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGatherer.cpp; sourceTree = "<group>"; };
+		00216D791E96E97F008204EA /* c_org_ortc_RTCIceGatherer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGatherer.h; sourceTree = "<group>"; };
+		00216D7A1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererCandidate.cpp; sourceTree = "<group>"; };
+		00216D7B1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererCandidate.h; sourceTree = "<group>"; };
+		00216D7C1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp; sourceTree = "<group>"; };
+		00216D7D1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererCandidateCompleteEvent.h; sourceTree = "<group>"; };
+		00216D7E1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererCandidateEvent.cpp; sourceTree = "<group>"; };
+		00216D7F1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererCandidateEvent.h; sourceTree = "<group>"; };
+		00216D801E96E97F008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererIceErrorEvent.cpp; sourceTree = "<group>"; };
+		00216D811E96E97F008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererIceErrorEvent.h; sourceTree = "<group>"; };
+		00216D821E96E97F008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00216D831E96E97F008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererStateChangeEvent.h; sourceTree = "<group>"; };
+		00216D841E96E97F008204EA /* c_org_ortc_RTCIceGathererStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererStats.cpp; sourceTree = "<group>"; };
+		00216D851E96E97F008204EA /* c_org_ortc_RTCIceGathererStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererStats.h; sourceTree = "<group>"; };
+		00216D861E96E97F008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGatherInterfacePolicy.cpp; sourceTree = "<group>"; };
+		00216D871E96E97F008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGatherInterfacePolicy.h; sourceTree = "<group>"; };
+		00216D881E96E97F008204EA /* c_org_ortc_RTCIceGatherOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGatherOptions.cpp; sourceTree = "<group>"; };
+		00216D891E96E97F008204EA /* c_org_ortc_RTCIceGatherOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGatherOptions.h; sourceTree = "<group>"; };
+		00216D8A1E96E97F008204EA /* c_org_ortc_RTCIceParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceParameters.cpp; sourceTree = "<group>"; };
+		00216D8B1E96E97F008204EA /* c_org_ortc_RTCIceParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceParameters.h; sourceTree = "<group>"; };
+		00216D8C1E96E97F008204EA /* c_org_ortc_RTCIceServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceServer.cpp; sourceTree = "<group>"; };
+		00216D8D1E96E97F008204EA /* c_org_ortc_RTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceServer.h; sourceTree = "<group>"; };
+		00216D8E1E96E97F008204EA /* c_org_ortc_RTCIceTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceTransport.cpp; sourceTree = "<group>"; };
+		00216D8F1E96E97F008204EA /* c_org_ortc_RTCIceTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceTransport.h; sourceTree = "<group>"; };
+		00216D901E96E97F008204EA /* c_org_ortc_RTCIceTransportController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceTransportController.cpp; sourceTree = "<group>"; };
+		00216D911E96E97F008204EA /* c_org_ortc_RTCIceTransportController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceTransportController.h; sourceTree = "<group>"; };
+		00216D921E96E97F008204EA /* c_org_ortc_RTCIceTransportOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceTransportOptions.cpp; sourceTree = "<group>"; };
+		00216D931E96E97F008204EA /* c_org_ortc_RTCIceTransportOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceTransportOptions.h; sourceTree = "<group>"; };
+		00216D941E96E97F008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00216D951E96E97F008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		00216D961E96E97F008204EA /* c_org_ortc_RTCIceTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceTransportStats.cpp; sourceTree = "<group>"; };
+		00216D971E96E97F008204EA /* c_org_ortc_RTCIceTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceTransportStats.h; sourceTree = "<group>"; };
+		00216D981E96E97F008204EA /* c_org_ortc_RTCIdentity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIdentity.cpp; sourceTree = "<group>"; };
+		00216D991E96E97F008204EA /* c_org_ortc_RTCIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIdentity.h; sourceTree = "<group>"; };
+		00216D9A1E96E97F008204EA /* c_org_ortc_RTCIdentityAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIdentityAssertion.cpp; sourceTree = "<group>"; };
+		00216D9B1E96E97F008204EA /* c_org_ortc_RTCIdentityAssertion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIdentityAssertion.h; sourceTree = "<group>"; };
+		00216D9C1E96E97F008204EA /* c_org_ortc_RTCIdentityError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIdentityError.cpp; sourceTree = "<group>"; };
+		00216D9D1E96E97F008204EA /* c_org_ortc_RTCIdentityError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIdentityError.h; sourceTree = "<group>"; };
+		00216D9E1E96E97F008204EA /* c_org_ortc_RTCIdentityResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIdentityResult.cpp; sourceTree = "<group>"; };
+		00216D9F1E96E97F008204EA /* c_org_ortc_RTCIdentityResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIdentityResult.h; sourceTree = "<group>"; };
+		00216DA01E96E97F008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCInboundRtpStreamStats.cpp; sourceTree = "<group>"; };
+		00216DA11E96E97F008204EA /* c_org_ortc_RTCInboundRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCInboundRtpStreamStats.h; sourceTree = "<group>"; };
+		00216DA21E96E97F008204EA /* c_org_ortc_RTCMediaStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCMediaStreamStats.cpp; sourceTree = "<group>"; };
+		00216DA31E96E97F008204EA /* c_org_ortc_RTCMediaStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCMediaStreamStats.h; sourceTree = "<group>"; };
+		00216DA41E96E97F008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCMediaStreamTrackStats.cpp; sourceTree = "<group>"; };
+		00216DA51E96E97F008204EA /* c_org_ortc_RTCMediaStreamTrackStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCMediaStreamTrackStats.h; sourceTree = "<group>"; };
+		00216DA61E96E97F008204EA /* c_org_ortc_RTCMessageEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCMessageEvent.cpp; sourceTree = "<group>"; };
+		00216DA71E96E97F008204EA /* c_org_ortc_RTCMessageEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCMessageEvent.h; sourceTree = "<group>"; };
+		00216DA81E96E97F008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCOutboundRtpStreamStats.cpp; sourceTree = "<group>"; };
+		00216DA91E96E97F008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCOutboundRtpStreamStats.h; sourceTree = "<group>"; };
+		00216DAA1E96E97F008204EA /* c_org_ortc_RTCRtcpFeedback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtcpFeedback.cpp; sourceTree = "<group>"; };
+		00216DAB1E96E97F008204EA /* c_org_ortc_RTCRtcpFeedback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtcpFeedback.h; sourceTree = "<group>"; };
+		00216DAC1E96E97F008204EA /* c_org_ortc_RTCRtcpParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtcpParameters.cpp; sourceTree = "<group>"; };
+		00216DAD1E96E97F008204EA /* c_org_ortc_RTCRtcpParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtcpParameters.h; sourceTree = "<group>"; };
+		00216DAE1E96E97F008204EA /* c_org_ortc_RTCRtcpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtcpTransport.cpp; sourceTree = "<group>"; };
+		00216DAF1E96E97F008204EA /* c_org_ortc_RTCRtcpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtcpTransport.h; sourceTree = "<group>"; };
+		00216DB01E96E97F008204EA /* c_org_ortc_RTCRtpCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCapabilities.cpp; sourceTree = "<group>"; };
+		00216DB11E96E97F008204EA /* c_org_ortc_RTCRtpCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCapabilities.h; sourceTree = "<group>"; };
+		00216DB21E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCodecCapability.cpp; sourceTree = "<group>"; };
+		00216DB31E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCodecCapability.h; sourceTree = "<group>"; };
+		00216DB41E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCodecCapabilityOptions.cpp; sourceTree = "<group>"; };
+		00216DB51E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCodecCapabilityOptions.h; sourceTree = "<group>"; };
+		00216DB61E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216DB71E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216DB81E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCodecParameters.cpp; sourceTree = "<group>"; };
+		00216DB91E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCodecParameters.h; sourceTree = "<group>"; };
+		00216DBA1E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216DBB1E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCodecParameterSettings.h; sourceTree = "<group>"; };
+		00216DBC1E96E97F008204EA /* c_org_ortc_RTCRtpContributingSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpContributingSource.cpp; sourceTree = "<group>"; };
+		00216DBD1E96E97F008204EA /* c_org_ortc_RTCRtpContributingSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpContributingSource.h; sourceTree = "<group>"; };
+		00216DBE1E96E97F008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpEncodingParameters.cpp; sourceTree = "<group>"; };
+		00216DBF1E96E97F008204EA /* c_org_ortc_RTCRtpEncodingParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpEncodingParameters.h; sourceTree = "<group>"; };
+		00216DC01E96E97F008204EA /* c_org_ortc_RTCRtpFecParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpFecParameters.cpp; sourceTree = "<group>"; };
+		00216DC11E96E97F008204EA /* c_org_ortc_RTCRtpFecParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpFecParameters.h; sourceTree = "<group>"; };
+		00216DC21E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216DC31E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216DC41E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216DC51E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h; sourceTree = "<group>"; };
+		00216DC61E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216DC71E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpH264CodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216DC81E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpH264CodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216DC91E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpH264CodecParameterSettings.h; sourceTree = "<group>"; };
+		00216DCA1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpHeaderExtension.cpp; sourceTree = "<group>"; };
+		00216DCB1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpHeaderExtension.h; sourceTree = "<group>"; };
+		00216DCC1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpHeaderExtensionParameters.cpp; sourceTree = "<group>"; };
+		00216DCD1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpHeaderExtensionParameters.h; sourceTree = "<group>"; };
+		00216DCE1E96E97F008204EA /* c_org_ortc_RTCRtpListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpListener.cpp; sourceTree = "<group>"; };
+		00216DCF1E96E97F008204EA /* c_org_ortc_RTCRtpListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpListener.h; sourceTree = "<group>"; };
+		00216DD01E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp; sourceTree = "<group>"; };
+		00216DD11E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h; sourceTree = "<group>"; };
+		00216DD21E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216DD31E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216DD41E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216DD51E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpOpusCodecParameterSettings.h; sourceTree = "<group>"; };
+		00216DD61E96E97F008204EA /* c_org_ortc_RTCRtpParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpParameters.cpp; sourceTree = "<group>"; };
+		00216DD71E96E97F008204EA /* c_org_ortc_RTCRtpParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpParameters.h; sourceTree = "<group>"; };
+		00216DD81E96E97F008204EA /* c_org_ortc_RTCRtpReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpReceiver.cpp; sourceTree = "<group>"; };
+		00216DD91E96E97F008204EA /* c_org_ortc_RTCRtpReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpReceiver.h; sourceTree = "<group>"; };
+		00216DDA1E96E97F008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpRedCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216DDB1E96E97F008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpRedCodecParameterSettings.h; sourceTree = "<group>"; };
+		00216DDC1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216DDD1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216DDE1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216DDF1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpRtxCodecParameterSettings.h; sourceTree = "<group>"; };
+		00216DE01E96E97F008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpRtxParameters.cpp; sourceTree = "<group>"; };
+		00216DE11E96E97F008204EA /* c_org_ortc_RTCRtpRtxParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpRtxParameters.h; sourceTree = "<group>"; };
+		00216DE21E96E97F008204EA /* c_org_ortc_RTCRtpSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpSender.cpp; sourceTree = "<group>"; };
+		00216DE31E96E97F008204EA /* c_org_ortc_RTCRtpSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpSender.h; sourceTree = "<group>"; };
+		00216DE41E96E97F008204EA /* c_org_ortc_RTCRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpStreamStats.cpp; sourceTree = "<group>"; };
+		00216DE51E96E97F008204EA /* c_org_ortc_RTCRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpStreamStats.h; sourceTree = "<group>"; };
+		00216DE61E96E97F008204EA /* c_org_ortc_RTCRtpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpTransport.cpp; sourceTree = "<group>"; };
+		00216DE71E96E97F008204EA /* c_org_ortc_RTCRtpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpTransport.h; sourceTree = "<group>"; };
+		00216DE81E96E97F008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpUnhandledEvent.cpp; sourceTree = "<group>"; };
+		00216DE91E96E97F008204EA /* c_org_ortc_RTCRtpUnhandledEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpUnhandledEvent.h; sourceTree = "<group>"; };
+		00216DEA1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216DEB1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216DEC1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216DED1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpVp8CodecParameterSettings.h; sourceTree = "<group>"; };
+		00216DEE1E96E97F008204EA /* c_org_ortc_RTCSctpCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpCapabilities.cpp; sourceTree = "<group>"; };
+		00216DEF1E96E97F008204EA /* c_org_ortc_RTCSctpCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpCapabilities.h; sourceTree = "<group>"; };
+		00216DF01E96E97F008204EA /* c_org_ortc_RTCSctpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpTransport.cpp; sourceTree = "<group>"; };
+		00216DF11E96E97F008204EA /* c_org_ortc_RTCSctpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpTransport.h; sourceTree = "<group>"; };
+		00216DF21E96E97F008204EA /* c_org_ortc_RTCSctpTransportListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpTransportListener.cpp; sourceTree = "<group>"; };
+		00216DF31E96E97F008204EA /* c_org_ortc_RTCSctpTransportListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpTransportListener.h; sourceTree = "<group>"; };
+		00216DF41E96E97F008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpTransportListenerEvent.cpp; sourceTree = "<group>"; };
+		00216DF51E96E97F008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpTransportListenerEvent.h; sourceTree = "<group>"; };
+		00216DF61E96E97F008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00216DF71E96E97F008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		00216DF81E96E97F008204EA /* c_org_ortc_RTCSctpTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpTransportStats.cpp; sourceTree = "<group>"; };
+		00216DF91E96E97F008204EA /* c_org_ortc_RTCSctpTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpTransportStats.h; sourceTree = "<group>"; };
+		00216DFA1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpSdesCryptoParameters.cpp; sourceTree = "<group>"; };
+		00216DFB1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpSdesCryptoParameters.h; sourceTree = "<group>"; };
+		00216DFC1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpSdesKeyParameters.cpp; sourceTree = "<group>"; };
+		00216DFD1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpSdesKeyParameters.h; sourceTree = "<group>"; };
+		00216DFE1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpSdesParameters.cpp; sourceTree = "<group>"; };
+		00216DFF1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpSdesParameters.h; sourceTree = "<group>"; };
+		00216E001E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpSdesTransport.cpp; sourceTree = "<group>"; };
+		00216E011E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpSdesTransport.h; sourceTree = "<group>"; };
+		00216E021E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp; sourceTree = "<group>"; };
+		00216E031E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h; sourceTree = "<group>"; };
+		00216E041E96E97F008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpTransportStats.cpp; sourceTree = "<group>"; };
+		00216E051E96E97F008204EA /* c_org_ortc_RTCSrtpTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpTransportStats.h; sourceTree = "<group>"; };
+		00216E061E96E97F008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSsrcConflictEvent.cpp; sourceTree = "<group>"; };
+		00216E071E96E97F008204EA /* c_org_ortc_RTCSsrcConflictEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSsrcConflictEvent.h; sourceTree = "<group>"; };
+		00216E081E96E97F008204EA /* c_org_ortc_RTCStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCStats.cpp; sourceTree = "<group>"; };
+		00216E091E96E97F008204EA /* c_org_ortc_RTCStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCStats.h; sourceTree = "<group>"; };
+		00216E0A1E96E97F008204EA /* c_org_ortc_RTCStatsProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCStatsProvider.cpp; sourceTree = "<group>"; };
+		00216E0B1E96E97F008204EA /* c_org_ortc_RTCStatsProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCStatsProvider.h; sourceTree = "<group>"; };
+		00216E0C1E96E97F008204EA /* c_org_ortc_RTCStatsReport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCStatsReport.cpp; sourceTree = "<group>"; };
+		00216E0D1E96E97F008204EA /* c_org_ortc_RTCStatsReport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCStatsReport.h; sourceTree = "<group>"; };
+		00216E0E1E96E97F008204EA /* c_org_ortc_RTCStatsTypeSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCStatsTypeSet.cpp; sourceTree = "<group>"; };
+		00216E0F1E96E97F008204EA /* c_org_ortc_RTCStatsTypeSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCStatsTypeSet.h; sourceTree = "<group>"; };
+		00216E101E96E97F008204EA /* c_org_ortc_Settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_Settings.cpp; sourceTree = "<group>"; };
+		00216E111E96E97F008204EA /* c_org_ortc_Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_Settings.h; sourceTree = "<group>"; };
+		00216E121E96E97F008204EA /* c_org_ortc_StringOrStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_StringOrStringList.cpp; sourceTree = "<group>"; };
+		00216E131E96E97F008204EA /* c_org_ortc_StringOrStringList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_StringOrStringList.h; sourceTree = "<group>"; };
+		00216E141E96E97F008204EA /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
+		529AA64B1E9F90B8007ACFD2 /* webrtcWrapper_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = webrtcWrapper_ios.xcodeproj; path = "/Users/sergejjovanovic/Work/Projects/opticaltone/dylib_test/ortclib-sdk/ortc/apple/workspaces/xcode/../../projects/xcode/webrtcWrappers/webrtcWrapper_ios/webrtcWrapper_ios.xcodeproj"; sourceTree = "<absolute>"; };
+		52BFF6191E9CFBEE00DF88A1 /* libcryptopp-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libcryptopp-ios.a"; path = "../../../../cryptopp/projects/xcode/cryptopp-ios/build/Debug-iphoneos/libcryptopp-ios.a"; sourceTree = "<group>"; };
+		52BFF61A1E9CFBEE00DF88A1 /* libidnkit-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libidnkit-ios.a"; path = "../../../../idnkit/projects/xcode/idnkit-ios/build/Debug-iphoneos/libidnkit-ios.a"; sourceTree = "<group>"; };
+		52BFF61B1E9CFBEE00DF88A1 /* libortclib-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libortclib-ios.a"; path = "../ortclib-ios/build/Debug-iphoneos/libortclib-ios.a"; sourceTree = "<group>"; };
+		52BFF61C1E9CFBEE00DF88A1 /* libortclib-wrapper-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libortclib-wrapper-ios.a"; path = "../ortclib-wrapper-ios/build/Debug-iphoneos/libortclib-wrapper-ios.a"; sourceTree = "<group>"; };
+		52BFF61D1E9CFBEE00DF88A1 /* libortclib.services-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libortclib.services-ios.a"; path = "../../../../ortclib-services-cpp/projects/xcode/ortclib.services-ios/build/Debug-iphoneos/libortclib.services-ios.a"; sourceTree = "<group>"; };
+		52BFF61E1E9CFBEE00DF88A1 /* libudns-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libudns-ios.a"; path = "../../../../udns/projects/xcode/udns-ios/build/Debug-iphoneos/libudns-ios.a"; sourceTree = "<group>"; };
+		52BFF61F1E9CFBEE00DF88A1 /* libzsLib-eventing-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libzsLib-eventing-ios.a"; path = "../../../../zsLib-eventing/projects/xcode/zsLib-eventing-ios/build/Debug-iphoneos/libzsLib-eventing-ios.a"; sourceTree = "<group>"; };
+		52BFF6201E9CFBEE00DF88A1 /* libzsLib-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libzsLib-ios.a"; path = "../../../../zsLib/projects/xcode/zsLib-ios/build/Debug-iphoneos/libzsLib-ios.a"; sourceTree = "<group>"; };
+		52BFF6291E9CFC5500DF88A1 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		52BFF62A1E9CFC5500DF88A1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		52BFF62B1E9CFC5500DF88A1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
+		52BFF62C1E9CFC5500DF88A1 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
+		52BFF62D1E9CFC5500DF88A1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		52BFF62E1E9CFC5500DF88A1 /* libresolv.9.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.9.tbd; path = usr/lib/libresolv.9.tbd; sourceTree = SDKROOT; };
+		52BFF62F1E9CFC5500DF88A1 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		52BFF6301E9CFC5500DF88A1 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		52BFF6311E9CFC5500DF88A1 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		52BFF6321E9CFC5500DF88A1 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
+		52BFF63D1E9D053900DF88A1 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../../../curl/curl/ios-appstore/lib/libcurl.a"; sourceTree = "<group>"; };
+		52BFF63F1E9D0A1800DF88A1 /* webrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = webrtc.a; path = ../../../../../../webrtc/xplatform/webrtc/out_ios/webrtc.a; sourceTree = "<group>"; };
+		52BFF6451E9D0B9200DF88A1 /* libOrtc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libOrtc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		52BFF6EF1E9D0D6F00DF88A1 /* libcryptopp-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libcryptopp-ios.a"; path = "../../../../cryptopp/projects/xcode/cryptopp-ios/build/Debug-iphoneos/libcryptopp-ios.a"; sourceTree = "<group>"; };
+		52BFF6F01E9D0D6F00DF88A1 /* libidnkit-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libidnkit-ios.a"; path = "../../../../idnkit/projects/xcode/idnkit-ios/build/Debug-iphoneos/libidnkit-ios.a"; sourceTree = "<group>"; };
+		52BFF6F11E9D0D6F00DF88A1 /* libortclib-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libortclib-ios.a"; path = "../ortclib-ios/build/Debug-iphoneos/libortclib-ios.a"; sourceTree = "<group>"; };
+		52BFF6F21E9D0D6F00DF88A1 /* libortclib-wrapper-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libortclib-wrapper-ios.a"; path = "../ortclib-wrapper-ios/build/Debug-iphoneos/libortclib-wrapper-ios.a"; sourceTree = "<group>"; };
+		52BFF6F31E9D0D6F00DF88A1 /* libortclib.services-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libortclib.services-ios.a"; path = "../../../../ortclib-services-cpp/projects/xcode/ortclib.services-ios/build/Debug-iphoneos/libortclib.services-ios.a"; sourceTree = "<group>"; };
+		52BFF6F41E9D0D6F00DF88A1 /* libudns-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libudns-ios.a"; path = "../../../../udns/projects/xcode/udns-ios/build/Debug-iphoneos/libudns-ios.a"; sourceTree = "<group>"; };
+		52BFF6F51E9D0D6F00DF88A1 /* libzsLib-eventing-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libzsLib-eventing-ios.a"; path = "../../../../zsLib-eventing/projects/xcode/zsLib-eventing-ios/build/Debug-iphoneos/libzsLib-eventing-ios.a"; sourceTree = "<group>"; };
+		52BFF6F61E9D0D6F00DF88A1 /* libzsLib-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libzsLib-ios.a"; path = "../../../../zsLib/projects/xcode/zsLib-ios/build/Debug-iphoneos/libzsLib-ios.a"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		00216CCC1E96E939008204EA /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				52BFF6401E9D0A1800DF88A1 /* webrtc.a in Frameworks */,
+				52BFF63E1E9D053900DF88A1 /* libcurl.a in Frameworks */,
+				52BFF6331E9CFC5500DF88A1 /* AudioToolbox.framework in Frameworks */,
+				52BFF6341E9CFC5500DF88A1 /* AVFoundation.framework in Frameworks */,
+				52BFF6351E9CFC5500DF88A1 /* CoreMedia.framework in Frameworks */,
+				52BFF6361E9CFC5500DF88A1 /* CoreVideo.framework in Frameworks */,
+				52BFF6371E9CFC5500DF88A1 /* Foundation.framework in Frameworks */,
+				52BFF6381E9CFC5500DF88A1 /* libresolv.9.tbd in Frameworks */,
+				52BFF6391E9CFC5500DF88A1 /* libz.tbd in Frameworks */,
+				52BFF63A1E9CFC5500DF88A1 /* Security.framework in Frameworks */,
+				52BFF63B1E9CFC5500DF88A1 /* UIKit.framework in Frameworks */,
+				52BFF63C1E9CFC5500DF88A1 /* VideoToolbox.framework in Frameworks */,
+				52BFF6211E9CFBEE00DF88A1 /* libcryptopp-ios.a in Frameworks */,
+				52BFF6221E9CFBEE00DF88A1 /* libidnkit-ios.a in Frameworks */,
+				52BFF6231E9CFBEE00DF88A1 /* libortclib-ios.a in Frameworks */,
+				52BFF6241E9CFBEE00DF88A1 /* libortclib-wrapper-ios.a in Frameworks */,
+				52BFF6251E9CFBEE00DF88A1 /* libortclib.services-ios.a in Frameworks */,
+				52BFF6261E9CFBEE00DF88A1 /* libudns-ios.a in Frameworks */,
+				52BFF6271E9CFBEE00DF88A1 /* libzsLib-eventing-ios.a in Frameworks */,
+				52BFF6281E9CFBEE00DF88A1 /* libzsLib-ios.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		52BFF6421E9D0B9200DF88A1 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				52BFF7001E9D0D9400DF88A1 /* webrtc.a in Frameworks */,
+				52BFF6FF1E9D0D8300DF88A1 /* libcurl.a in Frameworks */,
+				52BFF6F71E9D0D6F00DF88A1 /* libcryptopp-ios.a in Frameworks */,
+				52BFF6F81E9D0D6F00DF88A1 /* libidnkit-ios.a in Frameworks */,
+				52BFF6F91E9D0D6F00DF88A1 /* libortclib-ios.a in Frameworks */,
+				52BFF6FA1E9D0D6F00DF88A1 /* libortclib-wrapper-ios.a in Frameworks */,
+				52BFF6FB1E9D0D6F00DF88A1 /* libortclib.services-ios.a in Frameworks */,
+				52BFF6FC1E9D0D6F00DF88A1 /* libudns-ios.a in Frameworks */,
+				52BFF6FD1E9D0D6F00DF88A1 /* libzsLib-eventing-ios.a in Frameworks */,
+				52BFF6FE1E9D0D6F00DF88A1 /* libzsLib-ios.a in Frameworks */,
+				52BFF6E51E9D0D6F00DF88A1 /* AudioToolbox.framework in Frameworks */,
+				52BFF6E61E9D0D6F00DF88A1 /* AVFoundation.framework in Frameworks */,
+				52BFF6E71E9D0D6F00DF88A1 /* CoreMedia.framework in Frameworks */,
+				52BFF6E81E9D0D6F00DF88A1 /* CoreVideo.framework in Frameworks */,
+				52BFF6E91E9D0D6F00DF88A1 /* Foundation.framework in Frameworks */,
+				52BFF6EA1E9D0D6F00DF88A1 /* libresolv.9.tbd in Frameworks */,
+				52BFF6EB1E9D0D6F00DF88A1 /* libz.tbd in Frameworks */,
+				52BFF6EC1E9D0D6F00DF88A1 /* Security.framework in Frameworks */,
+				52BFF6ED1E9D0D6F00DF88A1 /* UIKit.framework in Frameworks */,
+				52BFF6EE1E9D0D6F00DF88A1 /* VideoToolbox.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		00216CC61E96E939008204EA = {
+			isa = PBXGroup;
+			children = (
+				529AA64B1E9F90B8007ACFD2 /* webrtcWrapper_ios.xcodeproj */,
+				00216CDB1E96E97F008204EA /* c */,
+				00216CD01E96E939008204EA /* Products */,
+				52BFF6181E9CFBEC00DF88A1 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		00216CD01E96E939008204EA /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				00216CCF1E96E939008204EA /* libortclib-c-ios.a */,
+				52BFF6451E9D0B9200DF88A1 /* libOrtc.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		00216CDB1E96E97F008204EA /* c */ = {
+			isa = PBXGroup;
+			children = (
+				00216CDC1E96E97F008204EA /* c_helpers.cpp */,
+				00216CDD1E96E97F008204EA /* c_helpers.h */,
+				00216CDE1E96E97F008204EA /* c_org_ortc_adapter_MediaStream.cpp */,
+				00216CDF1E96E97F008204EA /* c_org_ortc_adapter_MediaStream.h */,
+				00216CE01E96E97F008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp */,
+				00216CE11E96E97F008204EA /* c_org_ortc_adapter_RTCAnswerOptions.h */,
+				00216CE21E96E97F008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp */,
+				00216CE31E96E97F008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.h */,
+				00216CE41E96E97F008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp */,
+				00216CE51E96E97F008204EA /* c_org_ortc_adapter_RTCConfiguration.h */,
+				00216CE61E96E97F008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp */,
+				00216CE71E96E97F008204EA /* c_org_ortc_adapter_RTCIceCandidate.h */,
+				00216CE81E96E97F008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */,
+				00216CE91E96E97F008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h */,
+				00216CEA1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp */,
+				00216CEB1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.h */,
+				00216CEC1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp */,
+				00216CED1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferOptions.h */,
+				00216CEE1E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp */,
+				00216CEF1E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnection.h */,
+				00216CF01E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */,
+				00216CF11E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h */,
+				00216CF21E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */,
+				00216CF31E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.h */,
+				00216CF41E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp */,
+				00216CF51E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescription.h */,
+				00216CF61E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */,
+				00216CF71E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h */,
+				00216CF81E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */,
+				00216CF91E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h */,
+				00216CFA1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */,
+				00216CFB1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.h */,
+				00216CFC1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */,
+				00216CFD1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h */,
+				00216CFE1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */,
+				00216CFF1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h */,
+				00216D001E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */,
+				00216D011E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h */,
+				00216D021E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */,
+				00216D031E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h */,
+				00216D041E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */,
+				00216D051E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h */,
+				00216D061E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */,
+				00216D071E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h */,
+				00216D081E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */,
+				00216D091E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h */,
+				00216D0A1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */,
+				00216D0B1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.h */,
+				00216D0C1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */,
+				00216D0D1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h */,
+				00216D0E1E96E97F008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp */,
+				00216D0F1E96E97F008204EA /* c_org_ortc_adapter_RTCTrackEvent.h */,
+				00216D101E96E97F008204EA /* c_org_ortc_ConstrainBoolean.cpp */,
+				00216D111E96E97F008204EA /* c_org_ortc_ConstrainBoolean.h */,
+				00216D121E96E97F008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp */,
+				00216D131E96E97F008204EA /* c_org_ortc_ConstrainBooleanParameters.h */,
+				00216D141E96E97F008204EA /* c_org_ortc_ConstrainDouble.cpp */,
+				00216D151E96E97F008204EA /* c_org_ortc_ConstrainDouble.h */,
+				00216D161E96E97F008204EA /* c_org_ortc_ConstrainDoubleRange.cpp */,
+				00216D171E96E97F008204EA /* c_org_ortc_ConstrainDoubleRange.h */,
+				00216D181E96E97F008204EA /* c_org_ortc_ConstrainLong.cpp */,
+				00216D191E96E97F008204EA /* c_org_ortc_ConstrainLong.h */,
+				00216D1A1E96E97F008204EA /* c_org_ortc_ConstrainLongRange.cpp */,
+				00216D1B1E96E97F008204EA /* c_org_ortc_ConstrainLongRange.h */,
+				00216D1C1E96E97F008204EA /* c_org_ortc_ConstrainString.cpp */,
+				00216D1D1E96E97F008204EA /* c_org_ortc_ConstrainString.h */,
+				00216D1E1E96E97F008204EA /* c_org_ortc_ConstrainStringParameters.cpp */,
+				00216D1F1E96E97F008204EA /* c_org_ortc_ConstrainStringParameters.h */,
+				00216D201E96E97F008204EA /* c_org_ortc_DoubleRange.cpp */,
+				00216D211E96E97F008204EA /* c_org_ortc_DoubleRange.h */,
+				00216D221E96E97F008204EA /* c_org_ortc_Error.cpp */,
+				00216D231E96E97F008204EA /* c_org_ortc_Error.h */,
+				00216D241E96E97F008204EA /* c_org_ortc_ErrorEvent.cpp */,
+				00216D251E96E97F008204EA /* c_org_ortc_ErrorEvent.h */,
+				00216D261E96E97F008204EA /* c_org_ortc_Json.cpp */,
+				00216D271E96E97F008204EA /* c_org_ortc_Json.h */,
+				00216D281E96E97F008204EA /* c_org_ortc_Logger.cpp */,
+				00216D291E96E97F008204EA /* c_org_ortc_Logger.h */,
+				00216D2A1E96E97F008204EA /* c_org_ortc_LongRange.cpp */,
+				00216D2B1E96E97F008204EA /* c_org_ortc_LongRange.h */,
+				00216D2C1E96E97F008204EA /* c_org_ortc_MediaControl.cpp */,
+				00216D2D1E96E97F008204EA /* c_org_ortc_MediaControl.h */,
+				00216D2E1E96E97F008204EA /* c_org_ortc_MediaDeviceInfo.cpp */,
+				00216D2F1E96E97F008204EA /* c_org_ortc_MediaDeviceInfo.h */,
+				00216D301E96E97F008204EA /* c_org_ortc_MediaDevices.cpp */,
+				00216D311E96E97F008204EA /* c_org_ortc_MediaDevices.h */,
+				00216D321E96E97F008204EA /* c_org_ortc_MediaSource.cpp */,
+				00216D331E96E97F008204EA /* c_org_ortc_MediaSource.h */,
+				00216D341E96E97F008204EA /* c_org_ortc_MediaStreamConstraints.cpp */,
+				00216D351E96E97F008204EA /* c_org_ortc_MediaStreamConstraints.h */,
+				00216D361E96E97F008204EA /* c_org_ortc_MediaStreamTrack.cpp */,
+				00216D371E96E97F008204EA /* c_org_ortc_MediaStreamTrack.h */,
+				00216D381E96E97F008204EA /* c_org_ortc_MediaTrackCapabilities.cpp */,
+				00216D391E96E97F008204EA /* c_org_ortc_MediaTrackCapabilities.h */,
+				00216D3A1E96E97F008204EA /* c_org_ortc_MediaTrackConstraints.cpp */,
+				00216D3B1E96E97F008204EA /* c_org_ortc_MediaTrackConstraints.h */,
+				00216D3C1E96E97F008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp */,
+				00216D3D1E96E97F008204EA /* c_org_ortc_MediaTrackConstraintSet.h */,
+				00216D3E1E96E97F008204EA /* c_org_ortc_MediaTrackSettings.cpp */,
+				00216D3F1E96E97F008204EA /* c_org_ortc_MediaTrackSettings.h */,
+				00216D401E96E97F008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp */,
+				00216D411E96E97F008204EA /* c_org_ortc_MediaTrackSupportedConstraints.h */,
+				00216D421E96E97F008204EA /* c_org_ortc_MessageQueue.cpp */,
+				00216D431E96E97F008204EA /* c_org_ortc_MessageQueue.h */,
+				00216D441E96E97F008204EA /* c_org_ortc_OrtcLib.cpp */,
+				00216D451E96E97F008204EA /* c_org_ortc_OrtcLib.h */,
+				00216D461E96E97F008204EA /* c_org_ortc_OverconstrainedError.cpp */,
+				00216D471E96E97F008204EA /* c_org_ortc_OverconstrainedError.h */,
+				00216D481E96E97F008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp */,
+				00216D491E96E97F008204EA /* c_org_ortc_OverconstrainedErrorEvent.h */,
+				00216D4A1E96E97F008204EA /* c_org_ortc_RTCCertificate.cpp */,
+				00216D4B1E96E97F008204EA /* c_org_ortc_RTCCertificate.h */,
+				00216D4C1E96E97F008204EA /* c_org_ortc_RTCCertificateStats.cpp */,
+				00216D4D1E96E97F008204EA /* c_org_ortc_RTCCertificateStats.h */,
+				00216D4E1E96E97F008204EA /* c_org_ortc_RTCCodec.cpp */,
+				00216D4F1E96E97F008204EA /* c_org_ortc_RTCCodec.h */,
+				00216D501E96E97F008204EA /* c_org_ortc_RTCDataChannel.cpp */,
+				00216D511E96E97F008204EA /* c_org_ortc_RTCDataChannel.h */,
+				00216D521E96E97F008204EA /* c_org_ortc_RTCDataChannelEvent.cpp */,
+				00216D531E96E97F008204EA /* c_org_ortc_RTCDataChannelEvent.h */,
+				00216D541E96E97F008204EA /* c_org_ortc_RTCDataChannelParameters.cpp */,
+				00216D551E96E97F008204EA /* c_org_ortc_RTCDataChannelParameters.h */,
+				00216D561E96E97F008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp */,
+				00216D571E96E97F008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.h */,
+				00216D581E96E97F008204EA /* c_org_ortc_RTCDataChannelStats.cpp */,
+				00216D591E96E97F008204EA /* c_org_ortc_RTCDataChannelStats.h */,
+				00216D5A1E96E97F008204EA /* c_org_ortc_RTCDataTransport.cpp */,
+				00216D5B1E96E97F008204EA /* c_org_ortc_RTCDataTransport.h */,
+				00216D5C1E96E97F008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp */,
+				00216D5D1E96E97F008204EA /* c_org_ortc_RTCDtlsCertificateBinary.h */,
+				00216D5E1E96E97F008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp */,
+				00216D5F1E96E97F008204EA /* c_org_ortc_RTCDtlsFingerprint.h */,
+				00216D601E96E97F008204EA /* c_org_ortc_RTCDtlsParameters.cpp */,
+				00216D611E96E97F008204EA /* c_org_ortc_RTCDtlsParameters.h */,
+				00216D621E96E97F008204EA /* c_org_ortc_RTCDtlsTransport.cpp */,
+				00216D631E96E97F008204EA /* c_org_ortc_RTCDtlsTransport.h */,
+				00216D641E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */,
+				00216D651E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.h */,
+				00216D661E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp */,
+				00216D671E96E97F008204EA /* c_org_ortc_RTCDtlsTransportStats.h */,
+				00216D681E96E97F008204EA /* c_org_ortc_RTCDtmfSender.cpp */,
+				00216D691E96E97F008204EA /* c_org_ortc_RTCDtmfSender.h */,
+				00216D6A1E96E97F008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp */,
+				00216D6B1E96E97F008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.h */,
+				00216D6C1E96E97F008204EA /* c_org_ortc_RTCIceCandidate.cpp */,
+				00216D6D1E96E97F008204EA /* c_org_ortc_RTCIceCandidate.h */,
+				00216D6E1E96E97F008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp */,
+				00216D6F1E96E97F008204EA /* c_org_ortc_RTCIceCandidateAttributes.h */,
+				00216D701E96E97F008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp */,
+				00216D711E96E97F008204EA /* c_org_ortc_RTCIceCandidateComplete.h */,
+				00216D721E96E97F008204EA /* c_org_ortc_RTCIceCandidatePair.cpp */,
+				00216D731E96E97F008204EA /* c_org_ortc_RTCIceCandidatePair.h */,
+				00216D741E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp */,
+				00216D751E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.h */,
+				00216D761E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp */,
+				00216D771E96E97F008204EA /* c_org_ortc_RTCIceCandidatePairStats.h */,
+				00216D781E96E97F008204EA /* c_org_ortc_RTCIceGatherer.cpp */,
+				00216D791E96E97F008204EA /* c_org_ortc_RTCIceGatherer.h */,
+				00216D7A1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp */,
+				00216D7B1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidate.h */,
+				00216D7C1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */,
+				00216D7D1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.h */,
+				00216D7E1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp */,
+				00216D7F1E96E97F008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.h */,
+				00216D801E96E97F008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp */,
+				00216D811E96E97F008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.h */,
+				00216D821E96E97F008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp */,
+				00216D831E96E97F008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.h */,
+				00216D841E96E97F008204EA /* c_org_ortc_RTCIceGathererStats.cpp */,
+				00216D851E96E97F008204EA /* c_org_ortc_RTCIceGathererStats.h */,
+				00216D861E96E97F008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp */,
+				00216D871E96E97F008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.h */,
+				00216D881E96E97F008204EA /* c_org_ortc_RTCIceGatherOptions.cpp */,
+				00216D891E96E97F008204EA /* c_org_ortc_RTCIceGatherOptions.h */,
+				00216D8A1E96E97F008204EA /* c_org_ortc_RTCIceParameters.cpp */,
+				00216D8B1E96E97F008204EA /* c_org_ortc_RTCIceParameters.h */,
+				00216D8C1E96E97F008204EA /* c_org_ortc_RTCIceServer.cpp */,
+				00216D8D1E96E97F008204EA /* c_org_ortc_RTCIceServer.h */,
+				00216D8E1E96E97F008204EA /* c_org_ortc_RTCIceTransport.cpp */,
+				00216D8F1E96E97F008204EA /* c_org_ortc_RTCIceTransport.h */,
+				00216D901E96E97F008204EA /* c_org_ortc_RTCIceTransportController.cpp */,
+				00216D911E96E97F008204EA /* c_org_ortc_RTCIceTransportController.h */,
+				00216D921E96E97F008204EA /* c_org_ortc_RTCIceTransportOptions.cpp */,
+				00216D931E96E97F008204EA /* c_org_ortc_RTCIceTransportOptions.h */,
+				00216D941E96E97F008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp */,
+				00216D951E96E97F008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.h */,
+				00216D961E96E97F008204EA /* c_org_ortc_RTCIceTransportStats.cpp */,
+				00216D971E96E97F008204EA /* c_org_ortc_RTCIceTransportStats.h */,
+				00216D981E96E97F008204EA /* c_org_ortc_RTCIdentity.cpp */,
+				00216D991E96E97F008204EA /* c_org_ortc_RTCIdentity.h */,
+				00216D9A1E96E97F008204EA /* c_org_ortc_RTCIdentityAssertion.cpp */,
+				00216D9B1E96E97F008204EA /* c_org_ortc_RTCIdentityAssertion.h */,
+				00216D9C1E96E97F008204EA /* c_org_ortc_RTCIdentityError.cpp */,
+				00216D9D1E96E97F008204EA /* c_org_ortc_RTCIdentityError.h */,
+				00216D9E1E96E97F008204EA /* c_org_ortc_RTCIdentityResult.cpp */,
+				00216D9F1E96E97F008204EA /* c_org_ortc_RTCIdentityResult.h */,
+				00216DA01E96E97F008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp */,
+				00216DA11E96E97F008204EA /* c_org_ortc_RTCInboundRtpStreamStats.h */,
+				00216DA21E96E97F008204EA /* c_org_ortc_RTCMediaStreamStats.cpp */,
+				00216DA31E96E97F008204EA /* c_org_ortc_RTCMediaStreamStats.h */,
+				00216DA41E96E97F008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp */,
+				00216DA51E96E97F008204EA /* c_org_ortc_RTCMediaStreamTrackStats.h */,
+				00216DA61E96E97F008204EA /* c_org_ortc_RTCMessageEvent.cpp */,
+				00216DA71E96E97F008204EA /* c_org_ortc_RTCMessageEvent.h */,
+				00216DA81E96E97F008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp */,
+				00216DA91E96E97F008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.h */,
+				00216DAA1E96E97F008204EA /* c_org_ortc_RTCRtcpFeedback.cpp */,
+				00216DAB1E96E97F008204EA /* c_org_ortc_RTCRtcpFeedback.h */,
+				00216DAC1E96E97F008204EA /* c_org_ortc_RTCRtcpParameters.cpp */,
+				00216DAD1E96E97F008204EA /* c_org_ortc_RTCRtcpParameters.h */,
+				00216DAE1E96E97F008204EA /* c_org_ortc_RTCRtcpTransport.cpp */,
+				00216DAF1E96E97F008204EA /* c_org_ortc_RTCRtcpTransport.h */,
+				00216DB01E96E97F008204EA /* c_org_ortc_RTCRtpCapabilities.cpp */,
+				00216DB11E96E97F008204EA /* c_org_ortc_RTCRtpCapabilities.h */,
+				00216DB21E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp */,
+				00216DB31E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapability.h */,
+				00216DB41E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp */,
+				00216DB51E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.h */,
+				00216DB61E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp */,
+				00216DB71E96E97F008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.h */,
+				00216DB81E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp */,
+				00216DB91E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameters.h */,
+				00216DBA1E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp */,
+				00216DBB1E96E97F008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.h */,
+				00216DBC1E96E97F008204EA /* c_org_ortc_RTCRtpContributingSource.cpp */,
+				00216DBD1E96E97F008204EA /* c_org_ortc_RTCRtpContributingSource.h */,
+				00216DBE1E96E97F008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp */,
+				00216DBF1E96E97F008204EA /* c_org_ortc_RTCRtpEncodingParameters.h */,
+				00216DC01E96E97F008204EA /* c_org_ortc_RTCRtpFecParameters.cpp */,
+				00216DC11E96E97F008204EA /* c_org_ortc_RTCRtpFecParameters.h */,
+				00216DC21E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */,
+				00216DC31E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h */,
+				00216DC41E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */,
+				00216DC51E96E97F008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h */,
+				00216DC61E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */,
+				00216DC71E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.h */,
+				00216DC81E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp */,
+				00216DC91E96E97F008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.h */,
+				00216DCA1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp */,
+				00216DCB1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtension.h */,
+				00216DCC1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp */,
+				00216DCD1E96E97F008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.h */,
+				00216DCE1E96E97F008204EA /* c_org_ortc_RTCRtpListener.cpp */,
+				00216DCF1E96E97F008204EA /* c_org_ortc_RTCRtpListener.h */,
+				00216DD01E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */,
+				00216DD11E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h */,
+				00216DD21E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */,
+				00216DD31E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h */,
+				00216DD41E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */,
+				00216DD51E96E97F008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.h */,
+				00216DD61E96E97F008204EA /* c_org_ortc_RTCRtpParameters.cpp */,
+				00216DD71E96E97F008204EA /* c_org_ortc_RTCRtpParameters.h */,
+				00216DD81E96E97F008204EA /* c_org_ortc_RTCRtpReceiver.cpp */,
+				00216DD91E96E97F008204EA /* c_org_ortc_RTCRtpReceiver.h */,
+				00216DDA1E96E97F008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp */,
+				00216DDB1E96E97F008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.h */,
+				00216DDC1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */,
+				00216DDD1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h */,
+				00216DDE1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */,
+				00216DDF1E96E97F008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.h */,
+				00216DE01E96E97F008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp */,
+				00216DE11E96E97F008204EA /* c_org_ortc_RTCRtpRtxParameters.h */,
+				00216DE21E96E97F008204EA /* c_org_ortc_RTCRtpSender.cpp */,
+				00216DE31E96E97F008204EA /* c_org_ortc_RTCRtpSender.h */,
+				00216DE41E96E97F008204EA /* c_org_ortc_RTCRtpStreamStats.cpp */,
+				00216DE51E96E97F008204EA /* c_org_ortc_RTCRtpStreamStats.h */,
+				00216DE61E96E97F008204EA /* c_org_ortc_RTCRtpTransport.cpp */,
+				00216DE71E96E97F008204EA /* c_org_ortc_RTCRtpTransport.h */,
+				00216DE81E96E97F008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp */,
+				00216DE91E96E97F008204EA /* c_org_ortc_RTCRtpUnhandledEvent.h */,
+				00216DEA1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */,
+				00216DEB1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h */,
+				00216DEC1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */,
+				00216DED1E96E97F008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.h */,
+				00216DEE1E96E97F008204EA /* c_org_ortc_RTCSctpCapabilities.cpp */,
+				00216DEF1E96E97F008204EA /* c_org_ortc_RTCSctpCapabilities.h */,
+				00216DF01E96E97F008204EA /* c_org_ortc_RTCSctpTransport.cpp */,
+				00216DF11E96E97F008204EA /* c_org_ortc_RTCSctpTransport.h */,
+				00216DF21E96E97F008204EA /* c_org_ortc_RTCSctpTransportListener.cpp */,
+				00216DF31E96E97F008204EA /* c_org_ortc_RTCSctpTransportListener.h */,
+				00216DF41E96E97F008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp */,
+				00216DF51E96E97F008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.h */,
+				00216DF61E96E97F008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp */,
+				00216DF71E96E97F008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.h */,
+				00216DF81E96E97F008204EA /* c_org_ortc_RTCSctpTransportStats.cpp */,
+				00216DF91E96E97F008204EA /* c_org_ortc_RTCSctpTransportStats.h */,
+				00216DFA1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp */,
+				00216DFB1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.h */,
+				00216DFC1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp */,
+				00216DFD1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.h */,
+				00216DFE1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp */,
+				00216DFF1E96E97F008204EA /* c_org_ortc_RTCSrtpSdesParameters.h */,
+				00216E001E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp */,
+				00216E011E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransport.h */,
+				00216E021E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */,
+				00216E031E96E97F008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h */,
+				00216E041E96E97F008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp */,
+				00216E051E96E97F008204EA /* c_org_ortc_RTCSrtpTransportStats.h */,
+				00216E061E96E97F008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp */,
+				00216E071E96E97F008204EA /* c_org_ortc_RTCSsrcConflictEvent.h */,
+				00216E081E96E97F008204EA /* c_org_ortc_RTCStats.cpp */,
+				00216E091E96E97F008204EA /* c_org_ortc_RTCStats.h */,
+				00216E0A1E96E97F008204EA /* c_org_ortc_RTCStatsProvider.cpp */,
+				00216E0B1E96E97F008204EA /* c_org_ortc_RTCStatsProvider.h */,
+				00216E0C1E96E97F008204EA /* c_org_ortc_RTCStatsReport.cpp */,
+				00216E0D1E96E97F008204EA /* c_org_ortc_RTCStatsReport.h */,
+				00216E0E1E96E97F008204EA /* c_org_ortc_RTCStatsTypeSet.cpp */,
+				00216E0F1E96E97F008204EA /* c_org_ortc_RTCStatsTypeSet.h */,
+				00216E101E96E97F008204EA /* c_org_ortc_Settings.cpp */,
+				00216E111E96E97F008204EA /* c_org_ortc_Settings.h */,
+				00216E121E96E97F008204EA /* c_org_ortc_StringOrStringList.cpp */,
+				00216E131E96E97F008204EA /* c_org_ortc_StringOrStringList.h */,
+				00216E141E96E97F008204EA /* types.h */,
+			);
+			name = c;
+			path = ../../../ortc/idl/wrapper/generated/c;
+			sourceTree = "<group>";
+		};
+		529AA64C1E9F90B8007ACFD2 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				529AA6501E9F90B8007ACFD2 /* libwebrtcWrapper_ios.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		52BFF6181E9CFBEC00DF88A1 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				52BFF6EF1E9D0D6F00DF88A1 /* libcryptopp-ios.a */,
+				52BFF6F01E9D0D6F00DF88A1 /* libidnkit-ios.a */,
+				52BFF6F11E9D0D6F00DF88A1 /* libortclib-ios.a */,
+				52BFF6F21E9D0D6F00DF88A1 /* libortclib-wrapper-ios.a */,
+				52BFF6F31E9D0D6F00DF88A1 /* libortclib.services-ios.a */,
+				52BFF6F41E9D0D6F00DF88A1 /* libudns-ios.a */,
+				52BFF6F51E9D0D6F00DF88A1 /* libzsLib-eventing-ios.a */,
+				52BFF6F61E9D0D6F00DF88A1 /* libzsLib-ios.a */,
+				52BFF63F1E9D0A1800DF88A1 /* webrtc.a */,
+				52BFF63D1E9D053900DF88A1 /* libcurl.a */,
+				52BFF6291E9CFC5500DF88A1 /* AudioToolbox.framework */,
+				52BFF62A1E9CFC5500DF88A1 /* AVFoundation.framework */,
+				52BFF62B1E9CFC5500DF88A1 /* CoreMedia.framework */,
+				52BFF62C1E9CFC5500DF88A1 /* CoreVideo.framework */,
+				52BFF62D1E9CFC5500DF88A1 /* Foundation.framework */,
+				52BFF62E1E9CFC5500DF88A1 /* libresolv.9.tbd */,
+				52BFF62F1E9CFC5500DF88A1 /* libz.tbd */,
+				52BFF6301E9CFC5500DF88A1 /* Security.framework */,
+				52BFF6311E9CFC5500DF88A1 /* UIKit.framework */,
+				52BFF6321E9CFC5500DF88A1 /* VideoToolbox.framework */,
+				52BFF6191E9CFBEE00DF88A1 /* libcryptopp-ios.a */,
+				52BFF61A1E9CFBEE00DF88A1 /* libidnkit-ios.a */,
+				52BFF61B1E9CFBEE00DF88A1 /* libortclib-ios.a */,
+				52BFF61C1E9CFBEE00DF88A1 /* libortclib-wrapper-ios.a */,
+				52BFF61D1E9CFBEE00DF88A1 /* libortclib.services-ios.a */,
+				52BFF61E1E9CFBEE00DF88A1 /* libudns-ios.a */,
+				52BFF61F1E9CFBEE00DF88A1 /* libzsLib-eventing-ios.a */,
+				52BFF6201E9CFBEE00DF88A1 /* libzsLib-ios.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		52BFF6431E9D0B9200DF88A1 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		00216CCE1E96E939008204EA /* ortclib-c-ios */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 00216CD81E96E939008204EA /* Build configuration list for PBXNativeTarget "ortclib-c-ios" */;
+			buildPhases = (
+				00216CCB1E96E939008204EA /* Sources */,
+				00216CCC1E96E939008204EA /* Frameworks */,
+				00216CCD1E96E939008204EA /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "ortclib-c-ios";
+			productName = "ortclib-c-ios";
+			productReference = 00216CCF1E96E939008204EA /* libortclib-c-ios.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		52BFF6441E9D0B9200DF88A1 /* Ortc */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 52BFF6461E9D0B9200DF88A1 /* Build configuration list for PBXNativeTarget "Ortc" */;
+			buildPhases = (
+				52BFF6411E9D0B9200DF88A1 /* Sources */,
+				52BFF6421E9D0B9200DF88A1 /* Frameworks */,
+				52BFF6431E9D0B9200DF88A1 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				529AA6521E9F90C0007ACFD2 /* PBXTargetDependency */,
+			);
+			name = Ortc;
+			productName = "ortclib-c-ios-wrapper";
+			productReference = 52BFF6451E9D0B9200DF88A1 /* libOrtc.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		00216CC71E96E939008204EA /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0830;
+				ORGANIZATIONNAME = "Open Peer Foundation";
+				TargetAttributes = {
+					00216CCE1E96E939008204EA = {
+						CreatedOnToolsVersion = 8.3;
+						ProvisioningStyle = Automatic;
+					};
+					52BFF6441E9D0B9200DF88A1 = {
+						CreatedOnToolsVersion = 8.3.1;
+						DevelopmentTeam = QE9E5R8GUP;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 00216CCA1E96E939008204EA /* Build configuration list for PBXProject "ortclib-c-ios" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 00216CC61E96E939008204EA;
+			productRefGroup = 00216CD01E96E939008204EA /* Products */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 529AA64C1E9F90B8007ACFD2 /* Products */;
+					ProjectRef = 529AA64B1E9F90B8007ACFD2 /* webrtcWrapper_ios.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				00216CCE1E96E939008204EA /* ortclib-c-ios */,
+				52BFF6441E9D0B9200DF88A1 /* Ortc */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		529AA6501E9F90B8007ACFD2 /* libwebrtcWrapper_ios.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libwebrtcWrapper_ios.a;
+			remoteRef = 529AA64F1E9F90B8007ACFD2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
+/* Begin PBXSourcesBuildPhase section */
+		00216CCB1E96E939008204EA /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				00216E741E96E980008204EA /* c_org_ortc_RTCIdentityAssertion.cpp in Sources */,
+				00216E2E1E96E97F008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp in Sources */,
+				00216E6D1E96E980008204EA /* c_org_ortc_RTCIceServer.cpp in Sources */,
+				00216E481E96E980008204EA /* c_org_ortc_MessageQueue.cpp in Sources */,
+				00216E7A1E96E980008204EA /* c_org_ortc_RTCMessageEvent.cpp in Sources */,
+				00216E5B1E96E980008204EA /* c_org_ortc_RTCDtmfSender.cpp in Sources */,
+				00216EB01E96E980008204EA /* c_org_ortc_StringOrStringList.cpp in Sources */,
+				00216E3D1E96E97F008204EA /* c_org_ortc_MediaControl.cpp in Sources */,
+				00216EA01E96E980008204EA /* c_org_ortc_RTCSctpTransportListener.cpp in Sources */,
+				00216E581E96E980008204EA /* c_org_ortc_RTCDtlsTransport.cpp in Sources */,
+				00216E641E96E980008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp in Sources */,
+				00216E591E96E980008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp in Sources */,
+				00216E411E96E980008204EA /* c_org_ortc_MediaStreamConstraints.cpp in Sources */,
+				00216E811E96E980008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp in Sources */,
+				00216E871E96E980008204EA /* c_org_ortc_RTCRtpFecParameters.cpp in Sources */,
+				00216E7B1E96E980008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp in Sources */,
+				00216E9C1E96E980008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp in Sources */,
+				00216E5F1E96E980008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp in Sources */,
+				00216E281E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp in Sources */,
+				00216E3F1E96E980008204EA /* c_org_ortc_MediaDevices.cpp in Sources */,
+				00216EA11E96E980008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp in Sources */,
+				00216E221E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp in Sources */,
+				00216E4A1E96E980008204EA /* c_org_ortc_OverconstrainedError.cpp in Sources */,
+				00216E511E96E980008204EA /* c_org_ortc_RTCDataChannelParameters.cpp in Sources */,
+				00216E7C1E96E980008204EA /* c_org_ortc_RTCRtcpFeedback.cpp in Sources */,
+				00216EAB1E96E980008204EA /* c_org_ortc_RTCStats.cpp in Sources */,
+				00216E2D1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp in Sources */,
+				00216E771E96E980008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp in Sources */,
+				00216E401E96E980008204EA /* c_org_ortc_MediaSource.cpp in Sources */,
+				00216E711E96E980008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp in Sources */,
+				00216E891E96E980008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp in Sources */,
+				00216E3E1E96E980008204EA /* c_org_ortc_MediaDeviceInfo.cpp in Sources */,
+				00216E5E1E96E980008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp in Sources */,
+				00216E541E96E980008204EA /* c_org_ortc_RTCDataTransport.cpp in Sources */,
+				00216E8E1E96E980008204EA /* c_org_ortc_RTCRtpListener.cpp in Sources */,
+				00216E421E96E980008204EA /* c_org_ortc_MediaStreamTrack.cpp in Sources */,
+				00216EA71E96E980008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp in Sources */,
+				00216E501E96E980008204EA /* c_org_ortc_RTCDataChannelEvent.cpp in Sources */,
+				00216E661E96E980008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp in Sources */,
+				00216E951E96E980008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp in Sources */,
+				00216E521E96E980008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp in Sources */,
+				00216E9F1E96E980008204EA /* c_org_ortc_RTCSctpTransport.cpp in Sources */,
+				00216E7D1E96E980008204EA /* c_org_ortc_RTCRtcpParameters.cpp in Sources */,
+				00216EA61E96E980008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp in Sources */,
+				00216E971E96E980008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp in Sources */,
+				00216E391E96E97F008204EA /* c_org_ortc_ErrorEvent.cpp in Sources */,
+				00216E1D1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp in Sources */,
+				00216E251E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp in Sources */,
+				00216E621E96E980008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp in Sources */,
+				00216E1A1E96E97F008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp in Sources */,
+				00216E6B1E96E980008204EA /* c_org_ortc_RTCIceGatherOptions.cpp in Sources */,
+				00216EA41E96E980008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp in Sources */,
+				00216EAE1E96E980008204EA /* c_org_ortc_RTCStatsTypeSet.cpp in Sources */,
+				00216E631E96E980008204EA /* c_org_ortc_RTCIceGatherer.cpp in Sources */,
+				00216E161E96E97F008204EA /* c_org_ortc_adapter_MediaStream.cpp in Sources */,
+				00216E1B1E96E97F008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp in Sources */,
+				00216E311E96E97F008204EA /* c_org_ortc_ConstrainDouble.cpp in Sources */,
+				00216E301E96E97F008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp in Sources */,
+				00216E371E96E97F008204EA /* c_org_ortc_DoubleRange.cpp in Sources */,
+				00216E2F1E96E97F008204EA /* c_org_ortc_ConstrainBoolean.cpp in Sources */,
+				00216E961E96E980008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp in Sources */,
+				00216E441E96E980008204EA /* c_org_ortc_MediaTrackConstraints.cpp in Sources */,
+				00216E471E96E980008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp in Sources */,
+				00216E3B1E96E97F008204EA /* c_org_ortc_Logger.cpp in Sources */,
+				00216E861E96E980008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp in Sources */,
+				00216E431E96E980008204EA /* c_org_ortc_MediaTrackCapabilities.cpp in Sources */,
+				00216E8D1E96E980008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp in Sources */,
+				00216E4F1E96E980008204EA /* c_org_ortc_RTCDataChannel.cpp in Sources */,
+				00216E881E96E980008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp in Sources */,
+				00216E461E96E980008204EA /* c_org_ortc_MediaTrackSettings.cpp in Sources */,
+				00216E4B1E96E980008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp in Sources */,
+				00216E6A1E96E980008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp in Sources */,
+				00216E921E96E980008204EA /* c_org_ortc_RTCRtpParameters.cpp in Sources */,
+				00216E8C1E96E980008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp in Sources */,
+				00216E9B1E96E980008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp in Sources */,
+				00216E491E96E980008204EA /* c_org_ortc_OrtcLib.cpp in Sources */,
+				00216E181E96E97F008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp in Sources */,
+				00216E8B1E96E980008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp in Sources */,
+				00216E6E1E96E980008204EA /* c_org_ortc_RTCIceTransport.cpp in Sources */,
+				00216E4D1E96E980008204EA /* c_org_ortc_RTCCertificateStats.cpp in Sources */,
+				00216E291E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp in Sources */,
+				00216E8A1E96E980008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp in Sources */,
+				00216E691E96E980008204EA /* c_org_ortc_RTCIceGathererStats.cpp in Sources */,
+				00216E9D1E96E980008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp in Sources */,
+				00216E331E96E97F008204EA /* c_org_ortc_ConstrainLong.cpp in Sources */,
+				00216E651E96E980008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp in Sources */,
+				00216E381E96E97F008204EA /* c_org_ortc_Error.cpp in Sources */,
+				00216E3A1E96E97F008204EA /* c_org_ortc_Json.cpp in Sources */,
+				00216E681E96E980008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp in Sources */,
+				00216E171E96E97F008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp in Sources */,
+				00216E8F1E96E980008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp in Sources */,
+				00216E201E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp in Sources */,
+				00216E801E96E980008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp in Sources */,
+				00216E7F1E96E980008204EA /* c_org_ortc_RTCRtpCapabilities.cpp in Sources */,
+				00216E751E96E980008204EA /* c_org_ortc_RTCIdentityError.cpp in Sources */,
+				00216E831E96E980008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp in Sources */,
+				00216E231E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp in Sources */,
+				00216EA91E96E980008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp in Sources */,
+				00216E851E96E980008204EA /* c_org_ortc_RTCRtpContributingSource.cpp in Sources */,
+				00216E7E1E96E980008204EA /* c_org_ortc_RTCRtcpTransport.cpp in Sources */,
+				00216E9A1E96E980008204EA /* c_org_ortc_RTCRtpTransport.cpp in Sources */,
+				00216E341E96E97F008204EA /* c_org_ortc_ConstrainLongRange.cpp in Sources */,
+				00216E781E96E980008204EA /* c_org_ortc_RTCMediaStreamStats.cpp in Sources */,
+				00216E2B1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp in Sources */,
+				00216EAC1E96E980008204EA /* c_org_ortc_RTCStatsProvider.cpp in Sources */,
+				00216EAF1E96E980008204EA /* c_org_ortc_Settings.cpp in Sources */,
+				00216EAD1E96E980008204EA /* c_org_ortc_RTCStatsReport.cpp in Sources */,
+				00216EAA1E96E980008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp in Sources */,
+				00216E551E96E980008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp in Sources */,
+				00216E821E96E980008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp in Sources */,
+				00216E941E96E980008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp in Sources */,
+				00216E351E96E97F008204EA /* c_org_ortc_ConstrainString.cpp in Sources */,
+				00216E561E96E980008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp in Sources */,
+				00216E2A1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp in Sources */,
+				00216E1C1E96E97F008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp in Sources */,
+				00216E4E1E96E980008204EA /* c_org_ortc_RTCCodec.cpp in Sources */,
+				00216E9E1E96E980008204EA /* c_org_ortc_RTCSctpCapabilities.cpp in Sources */,
+				00216E4C1E96E980008204EA /* c_org_ortc_RTCCertificate.cpp in Sources */,
+				00216E5A1E96E980008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp in Sources */,
+				00216E911E96E980008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp in Sources */,
+				00216E931E96E980008204EA /* c_org_ortc_RTCRtpReceiver.cpp in Sources */,
+				00216E701E96E980008204EA /* c_org_ortc_RTCIceTransportOptions.cpp in Sources */,
+				00216E611E96E980008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp in Sources */,
+				00216EA51E96E980008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp in Sources */,
+				00216EA21E96E980008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp in Sources */,
+				00216E321E96E97F008204EA /* c_org_ortc_ConstrainDoubleRange.cpp in Sources */,
+				00216E5D1E96E980008204EA /* c_org_ortc_RTCIceCandidate.cpp in Sources */,
+				00216EA31E96E980008204EA /* c_org_ortc_RTCSctpTransportStats.cpp in Sources */,
+				00216E791E96E980008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp in Sources */,
+				00216E1F1E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp in Sources */,
+				00216E151E96E97F008204EA /* c_helpers.cpp in Sources */,
+				00216E761E96E980008204EA /* c_org_ortc_RTCIdentityResult.cpp in Sources */,
+				00216E841E96E980008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp in Sources */,
+				00216E191E96E97F008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp in Sources */,
+				00216E531E96E980008204EA /* c_org_ortc_RTCDataChannelStats.cpp in Sources */,
+				00216EA81E96E980008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp in Sources */,
+				00216E721E96E980008204EA /* c_org_ortc_RTCIceTransportStats.cpp in Sources */,
+				00216E6C1E96E980008204EA /* c_org_ortc_RTCIceParameters.cpp in Sources */,
+				00216E2C1E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp in Sources */,
+				00216E241E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp in Sources */,
+				00216E451E96E980008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp in Sources */,
+				00216E901E96E980008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp in Sources */,
+				00216E991E96E980008204EA /* c_org_ortc_RTCRtpStreamStats.cpp in Sources */,
+				00216E981E96E980008204EA /* c_org_ortc_RTCRtpSender.cpp in Sources */,
+				00216E271E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp in Sources */,
+				00216E571E96E980008204EA /* c_org_ortc_RTCDtlsParameters.cpp in Sources */,
+				00216E671E96E980008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp in Sources */,
+				00216E261E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp in Sources */,
+				00216E5C1E96E980008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp in Sources */,
+				00216E3C1E96E97F008204EA /* c_org_ortc_LongRange.cpp in Sources */,
+				00216E601E96E980008204EA /* c_org_ortc_RTCIceCandidatePair.cpp in Sources */,
+				00216E6F1E96E980008204EA /* c_org_ortc_RTCIceTransportController.cpp in Sources */,
+				00216E361E96E97F008204EA /* c_org_ortc_ConstrainStringParameters.cpp in Sources */,
+				00216E211E96E97F008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp in Sources */,
+				00216E731E96E980008204EA /* c_org_ortc_RTCIdentity.cpp in Sources */,
+				00216E1E1E96E97F008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		52BFF6411E9D0B9200DF88A1 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				52BFF6491E9D0C2800DF88A1 /* c_helpers.cpp in Sources */,
+				52BFF64A1E9D0C2800DF88A1 /* c_org_ortc_adapter_MediaStream.cpp in Sources */,
+				52BFF64B1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCAnswerOptions.cpp in Sources */,
+				52BFF64C1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCCapabilityOptions.cpp in Sources */,
+				52BFF64D1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCConfiguration.cpp in Sources */,
+				52BFF64E1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCIceCandidate.cpp in Sources */,
+				52BFF64F1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp in Sources */,
+				52BFF6501E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp in Sources */,
+				52BFF6511E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCOfferOptions.cpp in Sources */,
+				52BFF6521E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCPeerConnection.cpp in Sources */,
+				52BFF6531E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp in Sources */,
+				52BFF6541E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp in Sources */,
+				52BFF6551E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescription.cpp in Sources */,
+				52BFF6561E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp in Sources */,
+				52BFF6571E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp in Sources */,
+				52BFF6581E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp in Sources */,
+				52BFF6591E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp in Sources */,
+				52BFF65A1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp in Sources */,
+				52BFF65B1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp in Sources */,
+				52BFF65C1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp in Sources */,
+				52BFF65D1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp in Sources */,
+				52BFF65E1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp in Sources */,
+				52BFF65F1E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp in Sources */,
+				52BFF6601E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp in Sources */,
+				52BFF6611E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp in Sources */,
+				52BFF6621E9D0C2800DF88A1 /* c_org_ortc_adapter_RTCTrackEvent.cpp in Sources */,
+				52BFF6631E9D0C2800DF88A1 /* c_org_ortc_ConstrainBoolean.cpp in Sources */,
+				52BFF6641E9D0C2800DF88A1 /* c_org_ortc_ConstrainBooleanParameters.cpp in Sources */,
+				52BFF6651E9D0C2800DF88A1 /* c_org_ortc_ConstrainDouble.cpp in Sources */,
+				52BFF6661E9D0C2800DF88A1 /* c_org_ortc_ConstrainDoubleRange.cpp in Sources */,
+				52BFF6671E9D0C2800DF88A1 /* c_org_ortc_ConstrainLong.cpp in Sources */,
+				52BFF6681E9D0C2800DF88A1 /* c_org_ortc_ConstrainLongRange.cpp in Sources */,
+				52BFF6691E9D0C2800DF88A1 /* c_org_ortc_ConstrainString.cpp in Sources */,
+				52BFF66A1E9D0C2800DF88A1 /* c_org_ortc_ConstrainStringParameters.cpp in Sources */,
+				52BFF66B1E9D0C2800DF88A1 /* c_org_ortc_DoubleRange.cpp in Sources */,
+				52BFF66C1E9D0C2800DF88A1 /* c_org_ortc_Error.cpp in Sources */,
+				52BFF66D1E9D0C2800DF88A1 /* c_org_ortc_ErrorEvent.cpp in Sources */,
+				52BFF66E1E9D0C2800DF88A1 /* c_org_ortc_Json.cpp in Sources */,
+				52BFF66F1E9D0C2800DF88A1 /* c_org_ortc_Logger.cpp in Sources */,
+				52BFF6701E9D0C2800DF88A1 /* c_org_ortc_LongRange.cpp in Sources */,
+				52BFF6711E9D0C2800DF88A1 /* c_org_ortc_MediaControl.cpp in Sources */,
+				52BFF6721E9D0C2800DF88A1 /* c_org_ortc_MediaDeviceInfo.cpp in Sources */,
+				52BFF6731E9D0C2800DF88A1 /* c_org_ortc_MediaDevices.cpp in Sources */,
+				52BFF6741E9D0C2800DF88A1 /* c_org_ortc_MediaSource.cpp in Sources */,
+				52BFF6751E9D0C2800DF88A1 /* c_org_ortc_MediaStreamConstraints.cpp in Sources */,
+				52BFF6761E9D0C2800DF88A1 /* c_org_ortc_MediaStreamTrack.cpp in Sources */,
+				52BFF6771E9D0C2800DF88A1 /* c_org_ortc_MediaTrackCapabilities.cpp in Sources */,
+				52BFF6781E9D0C2800DF88A1 /* c_org_ortc_MediaTrackConstraints.cpp in Sources */,
+				52BFF6791E9D0C2800DF88A1 /* c_org_ortc_MediaTrackConstraintSet.cpp in Sources */,
+				52BFF67A1E9D0C2800DF88A1 /* c_org_ortc_MediaTrackSettings.cpp in Sources */,
+				52BFF67B1E9D0C2800DF88A1 /* c_org_ortc_MediaTrackSupportedConstraints.cpp in Sources */,
+				52BFF67C1E9D0C2800DF88A1 /* c_org_ortc_MessageQueue.cpp in Sources */,
+				52BFF67D1E9D0C2800DF88A1 /* c_org_ortc_OrtcLib.cpp in Sources */,
+				52BFF67E1E9D0C2800DF88A1 /* c_org_ortc_OverconstrainedError.cpp in Sources */,
+				52BFF67F1E9D0C2800DF88A1 /* c_org_ortc_OverconstrainedErrorEvent.cpp in Sources */,
+				52BFF6801E9D0C2800DF88A1 /* c_org_ortc_RTCCertificate.cpp in Sources */,
+				52BFF6811E9D0C2800DF88A1 /* c_org_ortc_RTCCertificateStats.cpp in Sources */,
+				52BFF6821E9D0C2800DF88A1 /* c_org_ortc_RTCCodec.cpp in Sources */,
+				52BFF6831E9D0C2800DF88A1 /* c_org_ortc_RTCDataChannel.cpp in Sources */,
+				52BFF6841E9D0C2800DF88A1 /* c_org_ortc_RTCDataChannelEvent.cpp in Sources */,
+				52BFF6851E9D0C2800DF88A1 /* c_org_ortc_RTCDataChannelParameters.cpp in Sources */,
+				52BFF6861E9D0C2800DF88A1 /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp in Sources */,
+				52BFF6871E9D0C2800DF88A1 /* c_org_ortc_RTCDataChannelStats.cpp in Sources */,
+				52BFF6881E9D0C2800DF88A1 /* c_org_ortc_RTCDataTransport.cpp in Sources */,
+				52BFF6891E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsCertificateBinary.cpp in Sources */,
+				52BFF68A1E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsFingerprint.cpp in Sources */,
+				52BFF68B1E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsParameters.cpp in Sources */,
+				52BFF68C1E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsTransport.cpp in Sources */,
+				52BFF68D1E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp in Sources */,
+				52BFF68E1E9D0C2800DF88A1 /* c_org_ortc_RTCDtlsTransportStats.cpp in Sources */,
+				52BFF68F1E9D0C2800DF88A1 /* c_org_ortc_RTCDtmfSender.cpp in Sources */,
+				52BFF6901E9D0C2800DF88A1 /* c_org_ortc_RTCDtmfToneChangeEvent.cpp in Sources */,
+				52BFF6911E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidate.cpp in Sources */,
+				52BFF6921E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidateAttributes.cpp in Sources */,
+				52BFF6931E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidateComplete.cpp in Sources */,
+				52BFF6941E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidatePair.cpp in Sources */,
+				52BFF6951E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp in Sources */,
+				52BFF6961E9D0C2800DF88A1 /* c_org_ortc_RTCIceCandidatePairStats.cpp in Sources */,
+				52BFF6971E9D0C2800DF88A1 /* c_org_ortc_RTCIceGatherer.cpp in Sources */,
+				52BFF6981E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererCandidate.cpp in Sources */,
+				52BFF6991E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp in Sources */,
+				52BFF69A1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererCandidateEvent.cpp in Sources */,
+				52BFF69B1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp in Sources */,
+				52BFF69C1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp in Sources */,
+				52BFF69D1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGathererStats.cpp in Sources */,
+				52BFF69E1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp in Sources */,
+				52BFF69F1E9D0C2800DF88A1 /* c_org_ortc_RTCIceGatherOptions.cpp in Sources */,
+				52BFF6A01E9D0C2800DF88A1 /* c_org_ortc_RTCIceParameters.cpp in Sources */,
+				52BFF6A11E9D0C2800DF88A1 /* c_org_ortc_RTCIceServer.cpp in Sources */,
+				52BFF6A21E9D0C2800DF88A1 /* c_org_ortc_RTCIceTransport.cpp in Sources */,
+				52BFF6A31E9D0C2800DF88A1 /* c_org_ortc_RTCIceTransportController.cpp in Sources */,
+				52BFF6A41E9D0C2800DF88A1 /* c_org_ortc_RTCIceTransportOptions.cpp in Sources */,
+				52BFF6A51E9D0C2800DF88A1 /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp in Sources */,
+				52BFF6A61E9D0C2800DF88A1 /* c_org_ortc_RTCIceTransportStats.cpp in Sources */,
+				52BFF6A71E9D0C2800DF88A1 /* c_org_ortc_RTCIdentity.cpp in Sources */,
+				52BFF6A81E9D0C2800DF88A1 /* c_org_ortc_RTCIdentityAssertion.cpp in Sources */,
+				52BFF6A91E9D0C2800DF88A1 /* c_org_ortc_RTCIdentityError.cpp in Sources */,
+				52BFF6AA1E9D0C2800DF88A1 /* c_org_ortc_RTCIdentityResult.cpp in Sources */,
+				52BFF6AB1E9D0C2800DF88A1 /* c_org_ortc_RTCInboundRtpStreamStats.cpp in Sources */,
+				52BFF6AC1E9D0C2800DF88A1 /* c_org_ortc_RTCMediaStreamStats.cpp in Sources */,
+				52BFF6AD1E9D0C2800DF88A1 /* c_org_ortc_RTCMediaStreamTrackStats.cpp in Sources */,
+				52BFF6AE1E9D0C2800DF88A1 /* c_org_ortc_RTCMessageEvent.cpp in Sources */,
+				52BFF6AF1E9D0C2900DF88A1 /* c_org_ortc_RTCOutboundRtpStreamStats.cpp in Sources */,
+				52BFF6B01E9D0C2900DF88A1 /* c_org_ortc_RTCRtcpFeedback.cpp in Sources */,
+				52BFF6B11E9D0C2900DF88A1 /* c_org_ortc_RTCRtcpParameters.cpp in Sources */,
+				52BFF6B21E9D0C2900DF88A1 /* c_org_ortc_RTCRtcpTransport.cpp in Sources */,
+				52BFF6B31E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCapabilities.cpp in Sources */,
+				52BFF6B41E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCodecCapability.cpp in Sources */,
+				52BFF6B51E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp in Sources */,
+				52BFF6B61E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp in Sources */,
+				52BFF6B71E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCodecParameters.cpp in Sources */,
+				52BFF6B81E9D0C2900DF88A1 /* c_org_ortc_RTCRtpCodecParameterSettings.cpp in Sources */,
+				52BFF6B91E9D0C2900DF88A1 /* c_org_ortc_RTCRtpContributingSource.cpp in Sources */,
+				52BFF6BA1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpEncodingParameters.cpp in Sources */,
+				52BFF6BB1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpFecParameters.cpp in Sources */,
+				52BFF6BC1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp in Sources */,
+				52BFF6BD1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp in Sources */,
+				52BFF6BE1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp in Sources */,
+				52BFF6BF1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp in Sources */,
+				52BFF6C01E9D0C2900DF88A1 /* c_org_ortc_RTCRtpHeaderExtension.cpp in Sources */,
+				52BFF6C11E9D0C2900DF88A1 /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp in Sources */,
+				52BFF6C21E9D0C2900DF88A1 /* c_org_ortc_RTCRtpListener.cpp in Sources */,
+				52BFF6C31E9D0C2900DF88A1 /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp in Sources */,
+				52BFF6C41E9D0C2900DF88A1 /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp in Sources */,
+				52BFF6C51E9D0C2900DF88A1 /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp in Sources */,
+				52BFF6C61E9D0C2900DF88A1 /* c_org_ortc_RTCRtpParameters.cpp in Sources */,
+				52BFF6C71E9D0C2900DF88A1 /* c_org_ortc_RTCRtpReceiver.cpp in Sources */,
+				52BFF6C81E9D0C2900DF88A1 /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp in Sources */,
+				52BFF6C91E9D0C2900DF88A1 /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp in Sources */,
+				52BFF6CA1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp in Sources */,
+				52BFF6CB1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpRtxParameters.cpp in Sources */,
+				52BFF6CC1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpSender.cpp in Sources */,
+				52BFF6CD1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpStreamStats.cpp in Sources */,
+				52BFF6CE1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpTransport.cpp in Sources */,
+				52BFF6CF1E9D0C2900DF88A1 /* c_org_ortc_RTCRtpUnhandledEvent.cpp in Sources */,
+				52BFF6D01E9D0C2900DF88A1 /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp in Sources */,
+				52BFF6D11E9D0C2900DF88A1 /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp in Sources */,
+				52BFF6D21E9D0C2900DF88A1 /* c_org_ortc_RTCSctpCapabilities.cpp in Sources */,
+				52BFF6D31E9D0C2900DF88A1 /* c_org_ortc_RTCSctpTransport.cpp in Sources */,
+				52BFF6D41E9D0C2900DF88A1 /* c_org_ortc_RTCSctpTransportListener.cpp in Sources */,
+				52BFF6D51E9D0C2900DF88A1 /* c_org_ortc_RTCSctpTransportListenerEvent.cpp in Sources */,
+				52BFF6D61E9D0C2900DF88A1 /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp in Sources */,
+				52BFF6D71E9D0C2900DF88A1 /* c_org_ortc_RTCSctpTransportStats.cpp in Sources */,
+				52BFF6D81E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp in Sources */,
+				52BFF6D91E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp in Sources */,
+				52BFF6DA1E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpSdesParameters.cpp in Sources */,
+				52BFF6DB1E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpSdesTransport.cpp in Sources */,
+				52BFF6DC1E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp in Sources */,
+				52BFF6DD1E9D0C2900DF88A1 /* c_org_ortc_RTCSrtpTransportStats.cpp in Sources */,
+				52BFF6DE1E9D0C2900DF88A1 /* c_org_ortc_RTCSsrcConflictEvent.cpp in Sources */,
+				52BFF6DF1E9D0C2900DF88A1 /* c_org_ortc_RTCStats.cpp in Sources */,
+				52BFF6E01E9D0C2900DF88A1 /* c_org_ortc_RTCStatsProvider.cpp in Sources */,
+				52BFF6E11E9D0C2900DF88A1 /* c_org_ortc_RTCStatsReport.cpp in Sources */,
+				52BFF6E21E9D0C2900DF88A1 /* c_org_ortc_RTCStatsTypeSet.cpp in Sources */,
+				52BFF6E31E9D0C2900DF88A1 /* c_org_ortc_Settings.cpp in Sources */,
+				52BFF6E41E9D0C2900DF88A1 /* c_org_ortc_StringOrStringList.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		529AA6521E9F90C0007ACFD2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = webrtcWrapper_ios;
+			targetProxy = 529AA6511E9F90C0007ACFD2 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		00216CD61E96E939008204EA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../../../zsLib,
+					"../../../../zsLib-eventing",
+					../../../..,
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		00216CD71E96E939008204EA /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../../../zsLib,
+					"../../../../zsLib-eventing",
+					../../../..,
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		00216CD91E96E939008204EA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ENABLE_BITCODE = NO;
+				LIBRARY_SEARCH_PATHS = "../../../../curl/curl/ios-appstore/lib";
+				MACH_O_TYPE = mh_dylib;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		00216CDA1E96E939008204EA /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ENABLE_BITCODE = NO;
+				LIBRARY_SEARCH_PATHS = "../../../../curl/curl/ios-appstore/lib";
+				MACH_O_TYPE = mh_dylib;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		52BFF6471E9D0B9200DF88A1 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DEVELOPMENT_TEAM = QE9E5R8GUP;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				ENABLE_BITCODE = NO;
+				EXECUTABLE_PREFIX = lib;
+				LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
+				LIBRARY_SEARCH_PATHS = "../../../../curl/curl/ios-appstore/lib";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SDKROOT = iphoneos;
+				VALID_ARCHS = "arm64 armv7s armv7";
+			};
+			name = Debug;
+		};
+		52BFF6481E9D0B9200DF88A1 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				DEVELOPMENT_TEAM = QE9E5R8GUP;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				ENABLE_BITCODE = NO;
+				EXECUTABLE_PREFIX = lib;
+				LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
+				LIBRARY_SEARCH_PATHS = "../../../../curl/curl/ios-appstore/lib";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SDKROOT = iphoneos;
+				VALID_ARCHS = "arm64 armv7s armv7";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		00216CCA1E96E939008204EA /* Build configuration list for PBXProject "ortclib-c-ios" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				00216CD61E96E939008204EA /* Debug */,
+				00216CD71E96E939008204EA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		00216CD81E96E939008204EA /* Build configuration list for PBXNativeTarget "ortclib-c-ios" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				00216CD91E96E939008204EA /* Debug */,
+				00216CDA1E96E939008204EA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		52BFF6461E9D0B9200DF88A1 /* Build configuration list for PBXNativeTarget "Ortc" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				52BFF6471E9D0B9200DF88A1 /* Debug */,
+				52BFF6481E9D0B9200DF88A1 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 00216CC71E96E939008204EA /* Project object */;
+}
diff --git a/projects/xcode/ortclib-c-osx/ortclib-c-osx.xcodeproj/project.pbxproj b/projects/xcode/ortclib-c-osx/ortclib-c-osx.xcodeproj/project.pbxproj
new file mode 100644
index 00000000..1e7ba39a
--- /dev/null
+++ b/projects/xcode/ortclib-c-osx/ortclib-c-osx.xcodeproj/project.pbxproj
@@ -0,0 +1,1524 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		00216FFB1E970056008204EA /* c_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EC21E970056008204EA /* c_helpers.cpp */; };
+		00216FFC1E970056008204EA /* c_helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EC31E970056008204EA /* c_helpers.h */; };
+		00216FFD1E970056008204EA /* c_org_ortc_adapter_MediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EC41E970056008204EA /* c_org_ortc_adapter_MediaStream.cpp */; };
+		00216FFE1E970056008204EA /* c_org_ortc_adapter_MediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EC51E970056008204EA /* c_org_ortc_adapter_MediaStream.h */; };
+		00216FFF1E970056008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EC61E970056008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp */; };
+		002170001E970056008204EA /* c_org_ortc_adapter_RTCAnswerOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EC71E970056008204EA /* c_org_ortc_adapter_RTCAnswerOptions.h */; };
+		002170011E970056008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EC81E970056008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp */; };
+		002170021E970056008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EC91E970056008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.h */; };
+		002170031E970056008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216ECA1E970056008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp */; };
+		002170041E970056008204EA /* c_org_ortc_adapter_RTCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216ECB1E970056008204EA /* c_org_ortc_adapter_RTCConfiguration.h */; };
+		002170051E970056008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216ECC1E970056008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp */; };
+		002170061E970056008204EA /* c_org_ortc_adapter_RTCIceCandidate.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216ECD1E970056008204EA /* c_org_ortc_adapter_RTCIceCandidate.h */; };
+		002170071E970056008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216ECE1E970056008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */; };
+		002170081E970056008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216ECF1E970056008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h */; };
+		002170091E970056008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216ED01E970056008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp */; };
+		0021700A1E970056008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216ED11E970056008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.h */; };
+		0021700B1E970056008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216ED21E970056008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp */; };
+		0021700C1E970056008204EA /* c_org_ortc_adapter_RTCOfferOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216ED31E970056008204EA /* c_org_ortc_adapter_RTCOfferOptions.h */; };
+		0021700D1E970056008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216ED41E970056008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp */; };
+		0021700E1E970056008204EA /* c_org_ortc_adapter_RTCPeerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216ED51E970056008204EA /* c_org_ortc_adapter_RTCPeerConnection.h */; };
+		0021700F1E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216ED61E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */; };
+		002170101E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216ED71E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h */; };
+		002170111E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216ED81E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */; };
+		002170121E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216ED91E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.h */; };
+		002170131E970056008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EDA1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp */; };
+		002170141E970056008204EA /* c_org_ortc_adapter_RTCSessionDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EDB1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescription.h */; };
+		002170151E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EDC1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */; };
+		002170161E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EDD1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h */; };
+		002170171E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EDE1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */; };
+		002170181E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EDF1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h */; };
+		002170191E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EE01E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */; };
+		0021701A1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EE11E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.h */; };
+		0021701B1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EE21E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */; };
+		0021701C1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EE31E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h */; };
+		0021701D1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EE41E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */; };
+		0021701E1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EE51E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h */; };
+		0021701F1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EE61E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */; };
+		002170201E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EE71E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h */; };
+		002170211E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EE81E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */; };
+		002170221E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EE91E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h */; };
+		002170231E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EEA1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */; };
+		002170241E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EEB1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h */; };
+		002170251E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EEC1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */; };
+		002170261E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EED1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h */; };
+		002170271E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EEE1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */; };
+		002170281E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EEF1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h */; };
+		002170291E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EF01E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */; };
+		0021702A1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EF11E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.h */; };
+		0021702B1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EF21E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */; };
+		0021702C1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EF31E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h */; };
+		0021702D1E970056008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EF41E970056008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp */; };
+		0021702E1E970056008204EA /* c_org_ortc_adapter_RTCTrackEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EF51E970056008204EA /* c_org_ortc_adapter_RTCTrackEvent.h */; };
+		0021702F1E970056008204EA /* c_org_ortc_ConstrainBoolean.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EF61E970056008204EA /* c_org_ortc_ConstrainBoolean.cpp */; };
+		002170301E970056008204EA /* c_org_ortc_ConstrainBoolean.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EF71E970056008204EA /* c_org_ortc_ConstrainBoolean.h */; };
+		002170311E970056008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EF81E970056008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp */; };
+		002170321E970056008204EA /* c_org_ortc_ConstrainBooleanParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EF91E970056008204EA /* c_org_ortc_ConstrainBooleanParameters.h */; };
+		002170331E970056008204EA /* c_org_ortc_ConstrainDouble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EFA1E970056008204EA /* c_org_ortc_ConstrainDouble.cpp */; };
+		002170341E970056008204EA /* c_org_ortc_ConstrainDouble.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EFB1E970056008204EA /* c_org_ortc_ConstrainDouble.h */; };
+		002170351E970056008204EA /* c_org_ortc_ConstrainDoubleRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EFC1E970056008204EA /* c_org_ortc_ConstrainDoubleRange.cpp */; };
+		002170361E970056008204EA /* c_org_ortc_ConstrainDoubleRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EFD1E970056008204EA /* c_org_ortc_ConstrainDoubleRange.h */; };
+		002170371E970056008204EA /* c_org_ortc_ConstrainLong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216EFE1E970056008204EA /* c_org_ortc_ConstrainLong.cpp */; };
+		002170381E970056008204EA /* c_org_ortc_ConstrainLong.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216EFF1E970056008204EA /* c_org_ortc_ConstrainLong.h */; };
+		002170391E970056008204EA /* c_org_ortc_ConstrainLongRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F001E970056008204EA /* c_org_ortc_ConstrainLongRange.cpp */; };
+		0021703A1E970056008204EA /* c_org_ortc_ConstrainLongRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F011E970056008204EA /* c_org_ortc_ConstrainLongRange.h */; };
+		0021703B1E970056008204EA /* c_org_ortc_ConstrainString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F021E970056008204EA /* c_org_ortc_ConstrainString.cpp */; };
+		0021703C1E970056008204EA /* c_org_ortc_ConstrainString.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F031E970056008204EA /* c_org_ortc_ConstrainString.h */; };
+		0021703D1E970056008204EA /* c_org_ortc_ConstrainStringParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F041E970056008204EA /* c_org_ortc_ConstrainStringParameters.cpp */; };
+		0021703E1E970056008204EA /* c_org_ortc_ConstrainStringParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F051E970056008204EA /* c_org_ortc_ConstrainStringParameters.h */; };
+		0021703F1E970056008204EA /* c_org_ortc_DoubleRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F061E970056008204EA /* c_org_ortc_DoubleRange.cpp */; };
+		002170401E970056008204EA /* c_org_ortc_DoubleRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F071E970056008204EA /* c_org_ortc_DoubleRange.h */; };
+		002170411E970056008204EA /* c_org_ortc_Error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F081E970056008204EA /* c_org_ortc_Error.cpp */; };
+		002170421E970056008204EA /* c_org_ortc_Error.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F091E970056008204EA /* c_org_ortc_Error.h */; };
+		002170431E970056008204EA /* c_org_ortc_ErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F0A1E970056008204EA /* c_org_ortc_ErrorEvent.cpp */; };
+		002170441E970056008204EA /* c_org_ortc_ErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F0B1E970056008204EA /* c_org_ortc_ErrorEvent.h */; };
+		002170451E970056008204EA /* c_org_ortc_Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F0C1E970056008204EA /* c_org_ortc_Json.cpp */; };
+		002170461E970056008204EA /* c_org_ortc_Json.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F0D1E970056008204EA /* c_org_ortc_Json.h */; };
+		002170471E970056008204EA /* c_org_ortc_Logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F0E1E970056008204EA /* c_org_ortc_Logger.cpp */; };
+		002170481E970056008204EA /* c_org_ortc_Logger.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F0F1E970056008204EA /* c_org_ortc_Logger.h */; };
+		002170491E970056008204EA /* c_org_ortc_LongRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F101E970056008204EA /* c_org_ortc_LongRange.cpp */; };
+		0021704A1E970056008204EA /* c_org_ortc_LongRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F111E970056008204EA /* c_org_ortc_LongRange.h */; };
+		0021704B1E970056008204EA /* c_org_ortc_MediaControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F121E970056008204EA /* c_org_ortc_MediaControl.cpp */; };
+		0021704C1E970056008204EA /* c_org_ortc_MediaControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F131E970056008204EA /* c_org_ortc_MediaControl.h */; };
+		0021704D1E970056008204EA /* c_org_ortc_MediaDeviceInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F141E970056008204EA /* c_org_ortc_MediaDeviceInfo.cpp */; };
+		0021704E1E970056008204EA /* c_org_ortc_MediaDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F151E970056008204EA /* c_org_ortc_MediaDeviceInfo.h */; };
+		0021704F1E970056008204EA /* c_org_ortc_MediaDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F161E970056008204EA /* c_org_ortc_MediaDevices.cpp */; };
+		002170501E970056008204EA /* c_org_ortc_MediaDevices.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F171E970056008204EA /* c_org_ortc_MediaDevices.h */; };
+		002170511E970056008204EA /* c_org_ortc_MediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F181E970056008204EA /* c_org_ortc_MediaSource.cpp */; };
+		002170521E970056008204EA /* c_org_ortc_MediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F191E970056008204EA /* c_org_ortc_MediaSource.h */; };
+		002170531E970056008204EA /* c_org_ortc_MediaStreamConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F1A1E970056008204EA /* c_org_ortc_MediaStreamConstraints.cpp */; };
+		002170541E970056008204EA /* c_org_ortc_MediaStreamConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F1B1E970056008204EA /* c_org_ortc_MediaStreamConstraints.h */; };
+		002170551E970056008204EA /* c_org_ortc_MediaStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F1C1E970056008204EA /* c_org_ortc_MediaStreamTrack.cpp */; };
+		002170561E970056008204EA /* c_org_ortc_MediaStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F1D1E970056008204EA /* c_org_ortc_MediaStreamTrack.h */; };
+		002170571E970056008204EA /* c_org_ortc_MediaTrackCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F1E1E970056008204EA /* c_org_ortc_MediaTrackCapabilities.cpp */; };
+		002170581E970056008204EA /* c_org_ortc_MediaTrackCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F1F1E970056008204EA /* c_org_ortc_MediaTrackCapabilities.h */; };
+		002170591E970056008204EA /* c_org_ortc_MediaTrackConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F201E970056008204EA /* c_org_ortc_MediaTrackConstraints.cpp */; };
+		0021705A1E970056008204EA /* c_org_ortc_MediaTrackConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F211E970056008204EA /* c_org_ortc_MediaTrackConstraints.h */; };
+		0021705B1E970056008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F221E970056008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp */; };
+		0021705C1E970056008204EA /* c_org_ortc_MediaTrackConstraintSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F231E970056008204EA /* c_org_ortc_MediaTrackConstraintSet.h */; };
+		0021705D1E970056008204EA /* c_org_ortc_MediaTrackSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F241E970056008204EA /* c_org_ortc_MediaTrackSettings.cpp */; };
+		0021705E1E970056008204EA /* c_org_ortc_MediaTrackSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F251E970056008204EA /* c_org_ortc_MediaTrackSettings.h */; };
+		0021705F1E970056008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F261E970056008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp */; };
+		002170601E970056008204EA /* c_org_ortc_MediaTrackSupportedConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F271E970056008204EA /* c_org_ortc_MediaTrackSupportedConstraints.h */; };
+		002170611E970056008204EA /* c_org_ortc_MessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F281E970056008204EA /* c_org_ortc_MessageQueue.cpp */; };
+		002170621E970056008204EA /* c_org_ortc_MessageQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F291E970056008204EA /* c_org_ortc_MessageQueue.h */; };
+		002170631E970056008204EA /* c_org_ortc_OrtcLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F2A1E970056008204EA /* c_org_ortc_OrtcLib.cpp */; };
+		002170641E970056008204EA /* c_org_ortc_OrtcLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F2B1E970056008204EA /* c_org_ortc_OrtcLib.h */; };
+		002170651E970056008204EA /* c_org_ortc_OverconstrainedError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F2C1E970056008204EA /* c_org_ortc_OverconstrainedError.cpp */; };
+		002170661E970056008204EA /* c_org_ortc_OverconstrainedError.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F2D1E970056008204EA /* c_org_ortc_OverconstrainedError.h */; };
+		002170671E970056008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F2E1E970056008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp */; };
+		002170681E970056008204EA /* c_org_ortc_OverconstrainedErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F2F1E970056008204EA /* c_org_ortc_OverconstrainedErrorEvent.h */; };
+		002170691E970056008204EA /* c_org_ortc_RTCCertificate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F301E970056008204EA /* c_org_ortc_RTCCertificate.cpp */; };
+		0021706A1E970056008204EA /* c_org_ortc_RTCCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F311E970056008204EA /* c_org_ortc_RTCCertificate.h */; };
+		0021706B1E970056008204EA /* c_org_ortc_RTCCertificateStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F321E970056008204EA /* c_org_ortc_RTCCertificateStats.cpp */; };
+		0021706C1E970056008204EA /* c_org_ortc_RTCCertificateStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F331E970056008204EA /* c_org_ortc_RTCCertificateStats.h */; };
+		0021706D1E970056008204EA /* c_org_ortc_RTCCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F341E970056008204EA /* c_org_ortc_RTCCodec.cpp */; };
+		0021706E1E970056008204EA /* c_org_ortc_RTCCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F351E970056008204EA /* c_org_ortc_RTCCodec.h */; };
+		0021706F1E970056008204EA /* c_org_ortc_RTCDataChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F361E970056008204EA /* c_org_ortc_RTCDataChannel.cpp */; };
+		002170701E970056008204EA /* c_org_ortc_RTCDataChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F371E970056008204EA /* c_org_ortc_RTCDataChannel.h */; };
+		002170711E970056008204EA /* c_org_ortc_RTCDataChannelEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F381E970056008204EA /* c_org_ortc_RTCDataChannelEvent.cpp */; };
+		002170721E970056008204EA /* c_org_ortc_RTCDataChannelEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F391E970056008204EA /* c_org_ortc_RTCDataChannelEvent.h */; };
+		002170731E970056008204EA /* c_org_ortc_RTCDataChannelParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F3A1E970056008204EA /* c_org_ortc_RTCDataChannelParameters.cpp */; };
+		002170741E970056008204EA /* c_org_ortc_RTCDataChannelParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F3B1E970056008204EA /* c_org_ortc_RTCDataChannelParameters.h */; };
+		002170751E970056008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F3C1E970056008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp */; };
+		002170761E970056008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F3D1E970056008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.h */; };
+		002170771E970056008204EA /* c_org_ortc_RTCDataChannelStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F3E1E970056008204EA /* c_org_ortc_RTCDataChannelStats.cpp */; };
+		002170781E970056008204EA /* c_org_ortc_RTCDataChannelStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F3F1E970056008204EA /* c_org_ortc_RTCDataChannelStats.h */; };
+		002170791E970056008204EA /* c_org_ortc_RTCDataTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F401E970056008204EA /* c_org_ortc_RTCDataTransport.cpp */; };
+		0021707A1E970056008204EA /* c_org_ortc_RTCDataTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F411E970056008204EA /* c_org_ortc_RTCDataTransport.h */; };
+		0021707B1E970056008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F421E970056008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp */; };
+		0021707C1E970056008204EA /* c_org_ortc_RTCDtlsCertificateBinary.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F431E970056008204EA /* c_org_ortc_RTCDtlsCertificateBinary.h */; };
+		0021707D1E970056008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F441E970056008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp */; };
+		0021707E1E970056008204EA /* c_org_ortc_RTCDtlsFingerprint.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F451E970056008204EA /* c_org_ortc_RTCDtlsFingerprint.h */; };
+		0021707F1E970056008204EA /* c_org_ortc_RTCDtlsParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F461E970056008204EA /* c_org_ortc_RTCDtlsParameters.cpp */; };
+		002170801E970056008204EA /* c_org_ortc_RTCDtlsParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F471E970056008204EA /* c_org_ortc_RTCDtlsParameters.h */; };
+		002170811E970056008204EA /* c_org_ortc_RTCDtlsTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F481E970056008204EA /* c_org_ortc_RTCDtlsTransport.cpp */; };
+		002170821E970056008204EA /* c_org_ortc_RTCDtlsTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F491E970056008204EA /* c_org_ortc_RTCDtlsTransport.h */; };
+		002170831E970056008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F4A1E970056008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */; };
+		002170841E970056008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F4B1E970056008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.h */; };
+		002170851E970056008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F4C1E970056008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp */; };
+		002170861E970056008204EA /* c_org_ortc_RTCDtlsTransportStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F4D1E970056008204EA /* c_org_ortc_RTCDtlsTransportStats.h */; };
+		002170871E970056008204EA /* c_org_ortc_RTCDtmfSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F4E1E970056008204EA /* c_org_ortc_RTCDtmfSender.cpp */; };
+		002170881E970056008204EA /* c_org_ortc_RTCDtmfSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F4F1E970056008204EA /* c_org_ortc_RTCDtmfSender.h */; };
+		002170891E970056008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F501E970056008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp */; };
+		0021708A1E970056008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F511E970056008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.h */; };
+		0021708B1E970056008204EA /* c_org_ortc_RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F521E970056008204EA /* c_org_ortc_RTCIceCandidate.cpp */; };
+		0021708C1E970056008204EA /* c_org_ortc_RTCIceCandidate.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F531E970056008204EA /* c_org_ortc_RTCIceCandidate.h */; };
+		0021708D1E970056008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F541E970056008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp */; };
+		0021708E1E970056008204EA /* c_org_ortc_RTCIceCandidateAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F551E970056008204EA /* c_org_ortc_RTCIceCandidateAttributes.h */; };
+		0021708F1E970056008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F561E970056008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp */; };
+		002170901E970056008204EA /* c_org_ortc_RTCIceCandidateComplete.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F571E970056008204EA /* c_org_ortc_RTCIceCandidateComplete.h */; };
+		002170911E970056008204EA /* c_org_ortc_RTCIceCandidatePair.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F581E970056008204EA /* c_org_ortc_RTCIceCandidatePair.cpp */; };
+		002170921E970056008204EA /* c_org_ortc_RTCIceCandidatePair.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F591E970056008204EA /* c_org_ortc_RTCIceCandidatePair.h */; };
+		002170931E970056008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F5A1E970056008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp */; };
+		002170941E970056008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F5B1E970056008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.h */; };
+		002170951E970056008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F5C1E970056008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp */; };
+		002170961E970056008204EA /* c_org_ortc_RTCIceCandidatePairStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F5D1E970056008204EA /* c_org_ortc_RTCIceCandidatePairStats.h */; };
+		002170971E970056008204EA /* c_org_ortc_RTCIceGatherer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F5E1E970056008204EA /* c_org_ortc_RTCIceGatherer.cpp */; };
+		002170981E970056008204EA /* c_org_ortc_RTCIceGatherer.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F5F1E970056008204EA /* c_org_ortc_RTCIceGatherer.h */; };
+		002170991E970056008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F601E970056008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp */; };
+		0021709A1E970056008204EA /* c_org_ortc_RTCIceGathererCandidate.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F611E970056008204EA /* c_org_ortc_RTCIceGathererCandidate.h */; };
+		0021709B1E970056008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F621E970056008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */; };
+		0021709C1E970056008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F631E970056008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.h */; };
+		0021709D1E970056008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F641E970056008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp */; };
+		0021709E1E970056008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F651E970056008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.h */; };
+		0021709F1E970056008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F661E970056008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp */; };
+		002170A01E970056008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F671E970056008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.h */; };
+		002170A11E970056008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F681E970056008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp */; };
+		002170A21E970056008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F691E970056008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.h */; };
+		002170A31E970056008204EA /* c_org_ortc_RTCIceGathererStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F6A1E970056008204EA /* c_org_ortc_RTCIceGathererStats.cpp */; };
+		002170A41E970056008204EA /* c_org_ortc_RTCIceGathererStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F6B1E970056008204EA /* c_org_ortc_RTCIceGathererStats.h */; };
+		002170A51E970056008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F6C1E970056008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp */; };
+		002170A61E970056008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F6D1E970056008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.h */; };
+		002170A71E970056008204EA /* c_org_ortc_RTCIceGatherOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F6E1E970056008204EA /* c_org_ortc_RTCIceGatherOptions.cpp */; };
+		002170A81E970056008204EA /* c_org_ortc_RTCIceGatherOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F6F1E970056008204EA /* c_org_ortc_RTCIceGatherOptions.h */; };
+		002170A91E970056008204EA /* c_org_ortc_RTCIceParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F701E970056008204EA /* c_org_ortc_RTCIceParameters.cpp */; };
+		002170AA1E970056008204EA /* c_org_ortc_RTCIceParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F711E970056008204EA /* c_org_ortc_RTCIceParameters.h */; };
+		002170AB1E970056008204EA /* c_org_ortc_RTCIceServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F721E970056008204EA /* c_org_ortc_RTCIceServer.cpp */; };
+		002170AC1E970056008204EA /* c_org_ortc_RTCIceServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F731E970056008204EA /* c_org_ortc_RTCIceServer.h */; };
+		002170AD1E970056008204EA /* c_org_ortc_RTCIceTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F741E970056008204EA /* c_org_ortc_RTCIceTransport.cpp */; };
+		002170AE1E970056008204EA /* c_org_ortc_RTCIceTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F751E970056008204EA /* c_org_ortc_RTCIceTransport.h */; };
+		002170AF1E970056008204EA /* c_org_ortc_RTCIceTransportController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F761E970056008204EA /* c_org_ortc_RTCIceTransportController.cpp */; };
+		002170B01E970056008204EA /* c_org_ortc_RTCIceTransportController.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F771E970056008204EA /* c_org_ortc_RTCIceTransportController.h */; };
+		002170B11E970056008204EA /* c_org_ortc_RTCIceTransportOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F781E970056008204EA /* c_org_ortc_RTCIceTransportOptions.cpp */; };
+		002170B21E970056008204EA /* c_org_ortc_RTCIceTransportOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F791E970056008204EA /* c_org_ortc_RTCIceTransportOptions.h */; };
+		002170B31E970056008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F7A1E970056008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp */; };
+		002170B41E970056008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F7B1E970056008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.h */; };
+		002170B51E970056008204EA /* c_org_ortc_RTCIceTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F7C1E970056008204EA /* c_org_ortc_RTCIceTransportStats.cpp */; };
+		002170B61E970056008204EA /* c_org_ortc_RTCIceTransportStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F7D1E970056008204EA /* c_org_ortc_RTCIceTransportStats.h */; };
+		002170B71E970056008204EA /* c_org_ortc_RTCIdentity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F7E1E970056008204EA /* c_org_ortc_RTCIdentity.cpp */; };
+		002170B81E970056008204EA /* c_org_ortc_RTCIdentity.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F7F1E970056008204EA /* c_org_ortc_RTCIdentity.h */; };
+		002170B91E970056008204EA /* c_org_ortc_RTCIdentityAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F801E970056008204EA /* c_org_ortc_RTCIdentityAssertion.cpp */; };
+		002170BA1E970056008204EA /* c_org_ortc_RTCIdentityAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F811E970056008204EA /* c_org_ortc_RTCIdentityAssertion.h */; };
+		002170BB1E970056008204EA /* c_org_ortc_RTCIdentityError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F821E970056008204EA /* c_org_ortc_RTCIdentityError.cpp */; };
+		002170BC1E970056008204EA /* c_org_ortc_RTCIdentityError.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F831E970056008204EA /* c_org_ortc_RTCIdentityError.h */; };
+		002170BD1E970056008204EA /* c_org_ortc_RTCIdentityResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F841E970056008204EA /* c_org_ortc_RTCIdentityResult.cpp */; };
+		002170BE1E970056008204EA /* c_org_ortc_RTCIdentityResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F851E970056008204EA /* c_org_ortc_RTCIdentityResult.h */; };
+		002170BF1E970056008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F861E970056008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp */; };
+		002170C01E970056008204EA /* c_org_ortc_RTCInboundRtpStreamStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F871E970056008204EA /* c_org_ortc_RTCInboundRtpStreamStats.h */; };
+		002170C11E970056008204EA /* c_org_ortc_RTCMediaStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F881E970056008204EA /* c_org_ortc_RTCMediaStreamStats.cpp */; };
+		002170C21E970056008204EA /* c_org_ortc_RTCMediaStreamStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F891E970056008204EA /* c_org_ortc_RTCMediaStreamStats.h */; };
+		002170C31E970056008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F8A1E970056008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp */; };
+		002170C41E970056008204EA /* c_org_ortc_RTCMediaStreamTrackStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F8B1E970056008204EA /* c_org_ortc_RTCMediaStreamTrackStats.h */; };
+		002170C51E970056008204EA /* c_org_ortc_RTCMessageEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F8C1E970056008204EA /* c_org_ortc_RTCMessageEvent.cpp */; };
+		002170C61E970056008204EA /* c_org_ortc_RTCMessageEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F8D1E970056008204EA /* c_org_ortc_RTCMessageEvent.h */; };
+		002170C71E970056008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F8E1E970056008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp */; };
+		002170C81E970056008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F8F1E970056008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.h */; };
+		002170C91E970056008204EA /* c_org_ortc_RTCRtcpFeedback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F901E970056008204EA /* c_org_ortc_RTCRtcpFeedback.cpp */; };
+		002170CA1E970056008204EA /* c_org_ortc_RTCRtcpFeedback.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F911E970056008204EA /* c_org_ortc_RTCRtcpFeedback.h */; };
+		002170CB1E970056008204EA /* c_org_ortc_RTCRtcpParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F921E970056008204EA /* c_org_ortc_RTCRtcpParameters.cpp */; };
+		002170CC1E970056008204EA /* c_org_ortc_RTCRtcpParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F931E970056008204EA /* c_org_ortc_RTCRtcpParameters.h */; };
+		002170CD1E970056008204EA /* c_org_ortc_RTCRtcpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F941E970056008204EA /* c_org_ortc_RTCRtcpTransport.cpp */; };
+		002170CE1E970056008204EA /* c_org_ortc_RTCRtcpTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F951E970056008204EA /* c_org_ortc_RTCRtcpTransport.h */; };
+		002170CF1E970056008204EA /* c_org_ortc_RTCRtpCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F961E970056008204EA /* c_org_ortc_RTCRtpCapabilities.cpp */; };
+		002170D01E970056008204EA /* c_org_ortc_RTCRtpCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F971E970056008204EA /* c_org_ortc_RTCRtpCapabilities.h */; };
+		002170D11E970056008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F981E970056008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp */; };
+		002170D21E970056008204EA /* c_org_ortc_RTCRtpCodecCapability.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F991E970056008204EA /* c_org_ortc_RTCRtpCodecCapability.h */; };
+		002170D31E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F9A1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp */; };
+		002170D41E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F9B1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.h */; };
+		002170D51E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F9C1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp */; };
+		002170D61E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F9D1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.h */; };
+		002170D71E970056008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216F9E1E970056008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp */; };
+		002170D81E970056008204EA /* c_org_ortc_RTCRtpCodecParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216F9F1E970056008204EA /* c_org_ortc_RTCRtpCodecParameters.h */; };
+		002170D91E970056008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FA01E970056008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp */; };
+		002170DA1E970056008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FA11E970056008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.h */; };
+		002170DB1E970056008204EA /* c_org_ortc_RTCRtpContributingSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FA21E970056008204EA /* c_org_ortc_RTCRtpContributingSource.cpp */; };
+		002170DC1E970056008204EA /* c_org_ortc_RTCRtpContributingSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FA31E970056008204EA /* c_org_ortc_RTCRtpContributingSource.h */; };
+		002170DD1E970056008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FA41E970056008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp */; };
+		002170DE1E970056008204EA /* c_org_ortc_RTCRtpEncodingParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FA51E970056008204EA /* c_org_ortc_RTCRtpEncodingParameters.h */; };
+		002170DF1E970056008204EA /* c_org_ortc_RTCRtpFecParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FA61E970056008204EA /* c_org_ortc_RTCRtpFecParameters.cpp */; };
+		002170E01E970056008204EA /* c_org_ortc_RTCRtpFecParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FA71E970056008204EA /* c_org_ortc_RTCRtpFecParameters.h */; };
+		002170E11E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FA81E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */; };
+		002170E21E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FA91E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h */; };
+		002170E31E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FAA1E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */; };
+		002170E41E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FAB1E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h */; };
+		002170E51E970056008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FAC1E970056008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */; };
+		002170E61E970056008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FAD1E970056008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.h */; };
+		002170E71E970056008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FAE1E970056008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp */; };
+		002170E81E970056008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FAF1E970056008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.h */; };
+		002170E91E970056008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FB01E970056008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp */; };
+		002170EA1E970056008204EA /* c_org_ortc_RTCRtpHeaderExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FB11E970056008204EA /* c_org_ortc_RTCRtpHeaderExtension.h */; };
+		002170EB1E970056008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FB21E970056008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp */; };
+		002170EC1E970056008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FB31E970056008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.h */; };
+		002170ED1E970056008204EA /* c_org_ortc_RTCRtpListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FB41E970056008204EA /* c_org_ortc_RTCRtpListener.cpp */; };
+		002170EE1E970056008204EA /* c_org_ortc_RTCRtpListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FB51E970056008204EA /* c_org_ortc_RTCRtpListener.h */; };
+		002170EF1E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FB61E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */; };
+		002170F01E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FB71E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h */; };
+		002170F11E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FB81E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */; };
+		002170F21E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FB91E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h */; };
+		002170F31E970056008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FBA1E970056008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */; };
+		002170F41E970056008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FBB1E970056008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.h */; };
+		002170F51E970056008204EA /* c_org_ortc_RTCRtpParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FBC1E970056008204EA /* c_org_ortc_RTCRtpParameters.cpp */; };
+		002170F61E970056008204EA /* c_org_ortc_RTCRtpParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FBD1E970056008204EA /* c_org_ortc_RTCRtpParameters.h */; };
+		002170F71E970056008204EA /* c_org_ortc_RTCRtpReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FBE1E970056008204EA /* c_org_ortc_RTCRtpReceiver.cpp */; };
+		002170F81E970056008204EA /* c_org_ortc_RTCRtpReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FBF1E970056008204EA /* c_org_ortc_RTCRtpReceiver.h */; };
+		002170F91E970056008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FC01E970056008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp */; };
+		002170FA1E970056008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FC11E970056008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.h */; };
+		002170FB1E970056008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FC21E970056008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */; };
+		002170FC1E970056008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FC31E970056008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h */; };
+		002170FD1E970056008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FC41E970056008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */; };
+		002170FE1E970056008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FC51E970056008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.h */; };
+		002170FF1E970056008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FC61E970056008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp */; };
+		002171001E970056008204EA /* c_org_ortc_RTCRtpRtxParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FC71E970056008204EA /* c_org_ortc_RTCRtpRtxParameters.h */; };
+		002171011E970056008204EA /* c_org_ortc_RTCRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FC81E970056008204EA /* c_org_ortc_RTCRtpSender.cpp */; };
+		002171021E970056008204EA /* c_org_ortc_RTCRtpSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FC91E970056008204EA /* c_org_ortc_RTCRtpSender.h */; };
+		002171031E970056008204EA /* c_org_ortc_RTCRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FCA1E970056008204EA /* c_org_ortc_RTCRtpStreamStats.cpp */; };
+		002171041E970056008204EA /* c_org_ortc_RTCRtpStreamStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FCB1E970056008204EA /* c_org_ortc_RTCRtpStreamStats.h */; };
+		002171051E970056008204EA /* c_org_ortc_RTCRtpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FCC1E970056008204EA /* c_org_ortc_RTCRtpTransport.cpp */; };
+		002171061E970056008204EA /* c_org_ortc_RTCRtpTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FCD1E970056008204EA /* c_org_ortc_RTCRtpTransport.h */; };
+		002171071E970056008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FCE1E970056008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp */; };
+		002171081E970056008204EA /* c_org_ortc_RTCRtpUnhandledEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FCF1E970056008204EA /* c_org_ortc_RTCRtpUnhandledEvent.h */; };
+		002171091E970056008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FD01E970056008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */; };
+		0021710A1E970056008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FD11E970056008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h */; };
+		0021710B1E970056008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FD21E970056008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */; };
+		0021710C1E970056008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FD31E970056008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.h */; };
+		0021710D1E970056008204EA /* c_org_ortc_RTCSctpCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FD41E970056008204EA /* c_org_ortc_RTCSctpCapabilities.cpp */; };
+		0021710E1E970056008204EA /* c_org_ortc_RTCSctpCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FD51E970056008204EA /* c_org_ortc_RTCSctpCapabilities.h */; };
+		0021710F1E970056008204EA /* c_org_ortc_RTCSctpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FD61E970056008204EA /* c_org_ortc_RTCSctpTransport.cpp */; };
+		002171101E970056008204EA /* c_org_ortc_RTCSctpTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FD71E970056008204EA /* c_org_ortc_RTCSctpTransport.h */; };
+		002171111E970056008204EA /* c_org_ortc_RTCSctpTransportListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FD81E970056008204EA /* c_org_ortc_RTCSctpTransportListener.cpp */; };
+		002171121E970056008204EA /* c_org_ortc_RTCSctpTransportListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FD91E970056008204EA /* c_org_ortc_RTCSctpTransportListener.h */; };
+		002171131E970056008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FDA1E970056008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp */; };
+		002171141E970056008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FDB1E970056008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.h */; };
+		002171151E970056008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FDC1E970056008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp */; };
+		002171161E970056008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FDD1E970056008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.h */; };
+		002171171E970056008204EA /* c_org_ortc_RTCSctpTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FDE1E970056008204EA /* c_org_ortc_RTCSctpTransportStats.cpp */; };
+		002171181E970056008204EA /* c_org_ortc_RTCSctpTransportStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FDF1E970056008204EA /* c_org_ortc_RTCSctpTransportStats.h */; };
+		002171191E970056008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FE01E970056008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp */; };
+		0021711A1E970056008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FE11E970056008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.h */; };
+		0021711B1E970056008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FE21E970056008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp */; };
+		0021711C1E970056008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FE31E970056008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.h */; };
+		0021711D1E970056008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FE41E970056008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp */; };
+		0021711E1E970056008204EA /* c_org_ortc_RTCSrtpSdesParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FE51E970056008204EA /* c_org_ortc_RTCSrtpSdesParameters.h */; };
+		0021711F1E970056008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FE61E970056008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp */; };
+		002171201E970056008204EA /* c_org_ortc_RTCSrtpSdesTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FE71E970056008204EA /* c_org_ortc_RTCSrtpSdesTransport.h */; };
+		002171211E970056008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FE81E970056008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */; };
+		002171221E970056008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FE91E970056008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h */; };
+		002171231E970056008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FEA1E970056008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp */; };
+		002171241E970056008204EA /* c_org_ortc_RTCSrtpTransportStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FEB1E970056008204EA /* c_org_ortc_RTCSrtpTransportStats.h */; };
+		002171251E970056008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FEC1E970056008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp */; };
+		002171261E970056008204EA /* c_org_ortc_RTCSsrcConflictEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FED1E970056008204EA /* c_org_ortc_RTCSsrcConflictEvent.h */; };
+		002171271E970056008204EA /* c_org_ortc_RTCStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FEE1E970056008204EA /* c_org_ortc_RTCStats.cpp */; };
+		002171281E970056008204EA /* c_org_ortc_RTCStats.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FEF1E970056008204EA /* c_org_ortc_RTCStats.h */; };
+		002171291E970056008204EA /* c_org_ortc_RTCStatsProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FF01E970056008204EA /* c_org_ortc_RTCStatsProvider.cpp */; };
+		0021712A1E970056008204EA /* c_org_ortc_RTCStatsProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FF11E970056008204EA /* c_org_ortc_RTCStatsProvider.h */; };
+		0021712B1E970056008204EA /* c_org_ortc_RTCStatsReport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FF21E970056008204EA /* c_org_ortc_RTCStatsReport.cpp */; };
+		0021712C1E970056008204EA /* c_org_ortc_RTCStatsReport.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FF31E970056008204EA /* c_org_ortc_RTCStatsReport.h */; };
+		0021712D1E970056008204EA /* c_org_ortc_RTCStatsTypeSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FF41E970056008204EA /* c_org_ortc_RTCStatsTypeSet.cpp */; };
+		0021712E1E970056008204EA /* c_org_ortc_RTCStatsTypeSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FF51E970056008204EA /* c_org_ortc_RTCStatsTypeSet.h */; };
+		0021712F1E970056008204EA /* c_org_ortc_Settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FF61E970056008204EA /* c_org_ortc_Settings.cpp */; };
+		002171301E970056008204EA /* c_org_ortc_Settings.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FF71E970056008204EA /* c_org_ortc_Settings.h */; };
+		002171311E970056008204EA /* c_org_ortc_StringOrStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00216FF81E970056008204EA /* c_org_ortc_StringOrStringList.cpp */; };
+		002171321E970056008204EA /* c_org_ortc_StringOrStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FF91E970056008204EA /* c_org_ortc_StringOrStringList.h */; };
+		002171331E970056008204EA /* types.h in Headers */ = {isa = PBXBuildFile; fileRef = 00216FFA1E970056008204EA /* types.h */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		00216EBA1E970020008204EA /* libortclib-c-osx.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libortclib-c-osx.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
+		00216EC21E970056008204EA /* c_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_helpers.cpp; sourceTree = "<group>"; };
+		00216EC31E970056008204EA /* c_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_helpers.h; sourceTree = "<group>"; };
+		00216EC41E970056008204EA /* c_org_ortc_adapter_MediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_MediaStream.cpp; sourceTree = "<group>"; };
+		00216EC51E970056008204EA /* c_org_ortc_adapter_MediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_MediaStream.h; sourceTree = "<group>"; };
+		00216EC61E970056008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCAnswerOptions.cpp; sourceTree = "<group>"; };
+		00216EC71E970056008204EA /* c_org_ortc_adapter_RTCAnswerOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCAnswerOptions.h; sourceTree = "<group>"; };
+		00216EC81E970056008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCCapabilityOptions.cpp; sourceTree = "<group>"; };
+		00216EC91E970056008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCCapabilityOptions.h; sourceTree = "<group>"; };
+		00216ECA1E970056008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCConfiguration.cpp; sourceTree = "<group>"; };
+		00216ECB1E970056008204EA /* c_org_ortc_adapter_RTCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCConfiguration.h; sourceTree = "<group>"; };
+		00216ECC1E970056008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCIceCandidate.cpp; sourceTree = "<group>"; };
+		00216ECD1E970056008204EA /* c_org_ortc_adapter_RTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCIceCandidate.h; sourceTree = "<group>"; };
+		00216ECE1E970056008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp; sourceTree = "<group>"; };
+		00216ECF1E970056008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h; sourceTree = "<group>"; };
+		00216ED01E970056008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCOfferAnswerOptions.cpp; sourceTree = "<group>"; };
+		00216ED11E970056008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCOfferAnswerOptions.h; sourceTree = "<group>"; };
+		00216ED21E970056008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCOfferOptions.cpp; sourceTree = "<group>"; };
+		00216ED31E970056008204EA /* c_org_ortc_adapter_RTCOfferOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCOfferOptions.h; sourceTree = "<group>"; };
+		00216ED41E970056008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCPeerConnection.cpp; sourceTree = "<group>"; };
+		00216ED51E970056008204EA /* c_org_ortc_adapter_RTCPeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCPeerConnection.h; sourceTree = "<group>"; };
+		00216ED61E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp; sourceTree = "<group>"; };
+		00216ED71E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h; sourceTree = "<group>"; };
+		00216ED81E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp; sourceTree = "<group>"; };
+		00216ED91E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCPeerConnectionIceEvent.h; sourceTree = "<group>"; };
+		00216EDA1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescription.cpp; sourceTree = "<group>"; };
+		00216EDB1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescription.h; sourceTree = "<group>"; };
+		00216EDC1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp; sourceTree = "<group>"; };
+		00216EDD1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h; sourceTree = "<group>"; };
+		00216EDE1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp; sourceTree = "<group>"; };
+		00216EDF1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h; sourceTree = "<group>"; };
+		00216EE01E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp; sourceTree = "<group>"; };
+		00216EE11E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionDescription.h; sourceTree = "<group>"; };
+		00216EE21E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp; sourceTree = "<group>"; };
+		00216EE31E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h; sourceTree = "<group>"; };
+		00216EE41E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp; sourceTree = "<group>"; };
+		00216EE51E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h; sourceTree = "<group>"; };
+		00216EE61E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp; sourceTree = "<group>"; };
+		00216EE71E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h; sourceTree = "<group>"; };
+		00216EE81E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp; sourceTree = "<group>"; };
+		00216EE91E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h; sourceTree = "<group>"; };
+		00216EEA1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp; sourceTree = "<group>"; };
+		00216EEB1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h; sourceTree = "<group>"; };
+		00216EEC1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp; sourceTree = "<group>"; };
+		00216EED1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h; sourceTree = "<group>"; };
+		00216EEE1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp; sourceTree = "<group>"; };
+		00216EEF1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h; sourceTree = "<group>"; };
+		00216EF01E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp; sourceTree = "<group>"; };
+		00216EF11E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionTransport.h; sourceTree = "<group>"; };
+		00216EF21E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp; sourceTree = "<group>"; };
+		00216EF31E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h; sourceTree = "<group>"; };
+		00216EF41E970056008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_adapter_RTCTrackEvent.cpp; sourceTree = "<group>"; };
+		00216EF51E970056008204EA /* c_org_ortc_adapter_RTCTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_adapter_RTCTrackEvent.h; sourceTree = "<group>"; };
+		00216EF61E970056008204EA /* c_org_ortc_ConstrainBoolean.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainBoolean.cpp; sourceTree = "<group>"; };
+		00216EF71E970056008204EA /* c_org_ortc_ConstrainBoolean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainBoolean.h; sourceTree = "<group>"; };
+		00216EF81E970056008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainBooleanParameters.cpp; sourceTree = "<group>"; };
+		00216EF91E970056008204EA /* c_org_ortc_ConstrainBooleanParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainBooleanParameters.h; sourceTree = "<group>"; };
+		00216EFA1E970056008204EA /* c_org_ortc_ConstrainDouble.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainDouble.cpp; sourceTree = "<group>"; };
+		00216EFB1E970056008204EA /* c_org_ortc_ConstrainDouble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainDouble.h; sourceTree = "<group>"; };
+		00216EFC1E970056008204EA /* c_org_ortc_ConstrainDoubleRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainDoubleRange.cpp; sourceTree = "<group>"; };
+		00216EFD1E970056008204EA /* c_org_ortc_ConstrainDoubleRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainDoubleRange.h; sourceTree = "<group>"; };
+		00216EFE1E970056008204EA /* c_org_ortc_ConstrainLong.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainLong.cpp; sourceTree = "<group>"; };
+		00216EFF1E970056008204EA /* c_org_ortc_ConstrainLong.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainLong.h; sourceTree = "<group>"; };
+		00216F001E970056008204EA /* c_org_ortc_ConstrainLongRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainLongRange.cpp; sourceTree = "<group>"; };
+		00216F011E970056008204EA /* c_org_ortc_ConstrainLongRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainLongRange.h; sourceTree = "<group>"; };
+		00216F021E970056008204EA /* c_org_ortc_ConstrainString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainString.cpp; sourceTree = "<group>"; };
+		00216F031E970056008204EA /* c_org_ortc_ConstrainString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainString.h; sourceTree = "<group>"; };
+		00216F041E970056008204EA /* c_org_ortc_ConstrainStringParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ConstrainStringParameters.cpp; sourceTree = "<group>"; };
+		00216F051E970056008204EA /* c_org_ortc_ConstrainStringParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ConstrainStringParameters.h; sourceTree = "<group>"; };
+		00216F061E970056008204EA /* c_org_ortc_DoubleRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_DoubleRange.cpp; sourceTree = "<group>"; };
+		00216F071E970056008204EA /* c_org_ortc_DoubleRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_DoubleRange.h; sourceTree = "<group>"; };
+		00216F081E970056008204EA /* c_org_ortc_Error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_Error.cpp; sourceTree = "<group>"; };
+		00216F091E970056008204EA /* c_org_ortc_Error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_Error.h; sourceTree = "<group>"; };
+		00216F0A1E970056008204EA /* c_org_ortc_ErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_ErrorEvent.cpp; sourceTree = "<group>"; };
+		00216F0B1E970056008204EA /* c_org_ortc_ErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_ErrorEvent.h; sourceTree = "<group>"; };
+		00216F0C1E970056008204EA /* c_org_ortc_Json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_Json.cpp; sourceTree = "<group>"; };
+		00216F0D1E970056008204EA /* c_org_ortc_Json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_Json.h; sourceTree = "<group>"; };
+		00216F0E1E970056008204EA /* c_org_ortc_Logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_Logger.cpp; sourceTree = "<group>"; };
+		00216F0F1E970056008204EA /* c_org_ortc_Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_Logger.h; sourceTree = "<group>"; };
+		00216F101E970056008204EA /* c_org_ortc_LongRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_LongRange.cpp; sourceTree = "<group>"; };
+		00216F111E970056008204EA /* c_org_ortc_LongRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_LongRange.h; sourceTree = "<group>"; };
+		00216F121E970056008204EA /* c_org_ortc_MediaControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaControl.cpp; sourceTree = "<group>"; };
+		00216F131E970056008204EA /* c_org_ortc_MediaControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaControl.h; sourceTree = "<group>"; };
+		00216F141E970056008204EA /* c_org_ortc_MediaDeviceInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaDeviceInfo.cpp; sourceTree = "<group>"; };
+		00216F151E970056008204EA /* c_org_ortc_MediaDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaDeviceInfo.h; sourceTree = "<group>"; };
+		00216F161E970056008204EA /* c_org_ortc_MediaDevices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaDevices.cpp; sourceTree = "<group>"; };
+		00216F171E970056008204EA /* c_org_ortc_MediaDevices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaDevices.h; sourceTree = "<group>"; };
+		00216F181E970056008204EA /* c_org_ortc_MediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaSource.cpp; sourceTree = "<group>"; };
+		00216F191E970056008204EA /* c_org_ortc_MediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaSource.h; sourceTree = "<group>"; };
+		00216F1A1E970056008204EA /* c_org_ortc_MediaStreamConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaStreamConstraints.cpp; sourceTree = "<group>"; };
+		00216F1B1E970056008204EA /* c_org_ortc_MediaStreamConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaStreamConstraints.h; sourceTree = "<group>"; };
+		00216F1C1E970056008204EA /* c_org_ortc_MediaStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaStreamTrack.cpp; sourceTree = "<group>"; };
+		00216F1D1E970056008204EA /* c_org_ortc_MediaStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaStreamTrack.h; sourceTree = "<group>"; };
+		00216F1E1E970056008204EA /* c_org_ortc_MediaTrackCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaTrackCapabilities.cpp; sourceTree = "<group>"; };
+		00216F1F1E970056008204EA /* c_org_ortc_MediaTrackCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaTrackCapabilities.h; sourceTree = "<group>"; };
+		00216F201E970056008204EA /* c_org_ortc_MediaTrackConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaTrackConstraints.cpp; sourceTree = "<group>"; };
+		00216F211E970056008204EA /* c_org_ortc_MediaTrackConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaTrackConstraints.h; sourceTree = "<group>"; };
+		00216F221E970056008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaTrackConstraintSet.cpp; sourceTree = "<group>"; };
+		00216F231E970056008204EA /* c_org_ortc_MediaTrackConstraintSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaTrackConstraintSet.h; sourceTree = "<group>"; };
+		00216F241E970056008204EA /* c_org_ortc_MediaTrackSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaTrackSettings.cpp; sourceTree = "<group>"; };
+		00216F251E970056008204EA /* c_org_ortc_MediaTrackSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaTrackSettings.h; sourceTree = "<group>"; };
+		00216F261E970056008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MediaTrackSupportedConstraints.cpp; sourceTree = "<group>"; };
+		00216F271E970056008204EA /* c_org_ortc_MediaTrackSupportedConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MediaTrackSupportedConstraints.h; sourceTree = "<group>"; };
+		00216F281E970056008204EA /* c_org_ortc_MessageQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_MessageQueue.cpp; sourceTree = "<group>"; };
+		00216F291E970056008204EA /* c_org_ortc_MessageQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_MessageQueue.h; sourceTree = "<group>"; };
+		00216F2A1E970056008204EA /* c_org_ortc_OrtcLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_OrtcLib.cpp; sourceTree = "<group>"; };
+		00216F2B1E970056008204EA /* c_org_ortc_OrtcLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_OrtcLib.h; sourceTree = "<group>"; };
+		00216F2C1E970056008204EA /* c_org_ortc_OverconstrainedError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_OverconstrainedError.cpp; sourceTree = "<group>"; };
+		00216F2D1E970056008204EA /* c_org_ortc_OverconstrainedError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_OverconstrainedError.h; sourceTree = "<group>"; };
+		00216F2E1E970056008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_OverconstrainedErrorEvent.cpp; sourceTree = "<group>"; };
+		00216F2F1E970056008204EA /* c_org_ortc_OverconstrainedErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_OverconstrainedErrorEvent.h; sourceTree = "<group>"; };
+		00216F301E970056008204EA /* c_org_ortc_RTCCertificate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCCertificate.cpp; sourceTree = "<group>"; };
+		00216F311E970056008204EA /* c_org_ortc_RTCCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCCertificate.h; sourceTree = "<group>"; };
+		00216F321E970056008204EA /* c_org_ortc_RTCCertificateStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCCertificateStats.cpp; sourceTree = "<group>"; };
+		00216F331E970056008204EA /* c_org_ortc_RTCCertificateStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCCertificateStats.h; sourceTree = "<group>"; };
+		00216F341E970056008204EA /* c_org_ortc_RTCCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCCodec.cpp; sourceTree = "<group>"; };
+		00216F351E970056008204EA /* c_org_ortc_RTCCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCCodec.h; sourceTree = "<group>"; };
+		00216F361E970056008204EA /* c_org_ortc_RTCDataChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataChannel.cpp; sourceTree = "<group>"; };
+		00216F371E970056008204EA /* c_org_ortc_RTCDataChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataChannel.h; sourceTree = "<group>"; };
+		00216F381E970056008204EA /* c_org_ortc_RTCDataChannelEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataChannelEvent.cpp; sourceTree = "<group>"; };
+		00216F391E970056008204EA /* c_org_ortc_RTCDataChannelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataChannelEvent.h; sourceTree = "<group>"; };
+		00216F3A1E970056008204EA /* c_org_ortc_RTCDataChannelParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataChannelParameters.cpp; sourceTree = "<group>"; };
+		00216F3B1E970056008204EA /* c_org_ortc_RTCDataChannelParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataChannelParameters.h; sourceTree = "<group>"; };
+		00216F3C1E970056008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataChannelStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00216F3D1E970056008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataChannelStateChangeEvent.h; sourceTree = "<group>"; };
+		00216F3E1E970056008204EA /* c_org_ortc_RTCDataChannelStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataChannelStats.cpp; sourceTree = "<group>"; };
+		00216F3F1E970056008204EA /* c_org_ortc_RTCDataChannelStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataChannelStats.h; sourceTree = "<group>"; };
+		00216F401E970056008204EA /* c_org_ortc_RTCDataTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDataTransport.cpp; sourceTree = "<group>"; };
+		00216F411E970056008204EA /* c_org_ortc_RTCDataTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDataTransport.h; sourceTree = "<group>"; };
+		00216F421E970056008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsCertificateBinary.cpp; sourceTree = "<group>"; };
+		00216F431E970056008204EA /* c_org_ortc_RTCDtlsCertificateBinary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsCertificateBinary.h; sourceTree = "<group>"; };
+		00216F441E970056008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsFingerprint.cpp; sourceTree = "<group>"; };
+		00216F451E970056008204EA /* c_org_ortc_RTCDtlsFingerprint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsFingerprint.h; sourceTree = "<group>"; };
+		00216F461E970056008204EA /* c_org_ortc_RTCDtlsParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsParameters.cpp; sourceTree = "<group>"; };
+		00216F471E970056008204EA /* c_org_ortc_RTCDtlsParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsParameters.h; sourceTree = "<group>"; };
+		00216F481E970056008204EA /* c_org_ortc_RTCDtlsTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsTransport.cpp; sourceTree = "<group>"; };
+		00216F491E970056008204EA /* c_org_ortc_RTCDtlsTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsTransport.h; sourceTree = "<group>"; };
+		00216F4A1E970056008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00216F4B1E970056008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		00216F4C1E970056008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtlsTransportStats.cpp; sourceTree = "<group>"; };
+		00216F4D1E970056008204EA /* c_org_ortc_RTCDtlsTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtlsTransportStats.h; sourceTree = "<group>"; };
+		00216F4E1E970056008204EA /* c_org_ortc_RTCDtmfSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtmfSender.cpp; sourceTree = "<group>"; };
+		00216F4F1E970056008204EA /* c_org_ortc_RTCDtmfSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtmfSender.h; sourceTree = "<group>"; };
+		00216F501E970056008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCDtmfToneChangeEvent.cpp; sourceTree = "<group>"; };
+		00216F511E970056008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCDtmfToneChangeEvent.h; sourceTree = "<group>"; };
+		00216F521E970056008204EA /* c_org_ortc_RTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidate.cpp; sourceTree = "<group>"; };
+		00216F531E970056008204EA /* c_org_ortc_RTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidate.h; sourceTree = "<group>"; };
+		00216F541E970056008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidateAttributes.cpp; sourceTree = "<group>"; };
+		00216F551E970056008204EA /* c_org_ortc_RTCIceCandidateAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidateAttributes.h; sourceTree = "<group>"; };
+		00216F561E970056008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidateComplete.cpp; sourceTree = "<group>"; };
+		00216F571E970056008204EA /* c_org_ortc_RTCIceCandidateComplete.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidateComplete.h; sourceTree = "<group>"; };
+		00216F581E970056008204EA /* c_org_ortc_RTCIceCandidatePair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidatePair.cpp; sourceTree = "<group>"; };
+		00216F591E970056008204EA /* c_org_ortc_RTCIceCandidatePair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidatePair.h; sourceTree = "<group>"; };
+		00216F5A1E970056008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidatePairChangeEvent.cpp; sourceTree = "<group>"; };
+		00216F5B1E970056008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidatePairChangeEvent.h; sourceTree = "<group>"; };
+		00216F5C1E970056008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceCandidatePairStats.cpp; sourceTree = "<group>"; };
+		00216F5D1E970056008204EA /* c_org_ortc_RTCIceCandidatePairStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceCandidatePairStats.h; sourceTree = "<group>"; };
+		00216F5E1E970056008204EA /* c_org_ortc_RTCIceGatherer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGatherer.cpp; sourceTree = "<group>"; };
+		00216F5F1E970056008204EA /* c_org_ortc_RTCIceGatherer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGatherer.h; sourceTree = "<group>"; };
+		00216F601E970056008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererCandidate.cpp; sourceTree = "<group>"; };
+		00216F611E970056008204EA /* c_org_ortc_RTCIceGathererCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererCandidate.h; sourceTree = "<group>"; };
+		00216F621E970056008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp; sourceTree = "<group>"; };
+		00216F631E970056008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererCandidateCompleteEvent.h; sourceTree = "<group>"; };
+		00216F641E970056008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererCandidateEvent.cpp; sourceTree = "<group>"; };
+		00216F651E970056008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererCandidateEvent.h; sourceTree = "<group>"; };
+		00216F661E970056008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererIceErrorEvent.cpp; sourceTree = "<group>"; };
+		00216F671E970056008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererIceErrorEvent.h; sourceTree = "<group>"; };
+		00216F681E970056008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00216F691E970056008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererStateChangeEvent.h; sourceTree = "<group>"; };
+		00216F6A1E970056008204EA /* c_org_ortc_RTCIceGathererStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGathererStats.cpp; sourceTree = "<group>"; };
+		00216F6B1E970056008204EA /* c_org_ortc_RTCIceGathererStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGathererStats.h; sourceTree = "<group>"; };
+		00216F6C1E970056008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGatherInterfacePolicy.cpp; sourceTree = "<group>"; };
+		00216F6D1E970056008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGatherInterfacePolicy.h; sourceTree = "<group>"; };
+		00216F6E1E970056008204EA /* c_org_ortc_RTCIceGatherOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceGatherOptions.cpp; sourceTree = "<group>"; };
+		00216F6F1E970056008204EA /* c_org_ortc_RTCIceGatherOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceGatherOptions.h; sourceTree = "<group>"; };
+		00216F701E970056008204EA /* c_org_ortc_RTCIceParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceParameters.cpp; sourceTree = "<group>"; };
+		00216F711E970056008204EA /* c_org_ortc_RTCIceParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceParameters.h; sourceTree = "<group>"; };
+		00216F721E970056008204EA /* c_org_ortc_RTCIceServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceServer.cpp; sourceTree = "<group>"; };
+		00216F731E970056008204EA /* c_org_ortc_RTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceServer.h; sourceTree = "<group>"; };
+		00216F741E970056008204EA /* c_org_ortc_RTCIceTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceTransport.cpp; sourceTree = "<group>"; };
+		00216F751E970056008204EA /* c_org_ortc_RTCIceTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceTransport.h; sourceTree = "<group>"; };
+		00216F761E970056008204EA /* c_org_ortc_RTCIceTransportController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceTransportController.cpp; sourceTree = "<group>"; };
+		00216F771E970056008204EA /* c_org_ortc_RTCIceTransportController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceTransportController.h; sourceTree = "<group>"; };
+		00216F781E970056008204EA /* c_org_ortc_RTCIceTransportOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceTransportOptions.cpp; sourceTree = "<group>"; };
+		00216F791E970056008204EA /* c_org_ortc_RTCIceTransportOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceTransportOptions.h; sourceTree = "<group>"; };
+		00216F7A1E970056008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00216F7B1E970056008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		00216F7C1E970056008204EA /* c_org_ortc_RTCIceTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIceTransportStats.cpp; sourceTree = "<group>"; };
+		00216F7D1E970056008204EA /* c_org_ortc_RTCIceTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIceTransportStats.h; sourceTree = "<group>"; };
+		00216F7E1E970056008204EA /* c_org_ortc_RTCIdentity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIdentity.cpp; sourceTree = "<group>"; };
+		00216F7F1E970056008204EA /* c_org_ortc_RTCIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIdentity.h; sourceTree = "<group>"; };
+		00216F801E970056008204EA /* c_org_ortc_RTCIdentityAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIdentityAssertion.cpp; sourceTree = "<group>"; };
+		00216F811E970056008204EA /* c_org_ortc_RTCIdentityAssertion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIdentityAssertion.h; sourceTree = "<group>"; };
+		00216F821E970056008204EA /* c_org_ortc_RTCIdentityError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIdentityError.cpp; sourceTree = "<group>"; };
+		00216F831E970056008204EA /* c_org_ortc_RTCIdentityError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIdentityError.h; sourceTree = "<group>"; };
+		00216F841E970056008204EA /* c_org_ortc_RTCIdentityResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCIdentityResult.cpp; sourceTree = "<group>"; };
+		00216F851E970056008204EA /* c_org_ortc_RTCIdentityResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCIdentityResult.h; sourceTree = "<group>"; };
+		00216F861E970056008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCInboundRtpStreamStats.cpp; sourceTree = "<group>"; };
+		00216F871E970056008204EA /* c_org_ortc_RTCInboundRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCInboundRtpStreamStats.h; sourceTree = "<group>"; };
+		00216F881E970056008204EA /* c_org_ortc_RTCMediaStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCMediaStreamStats.cpp; sourceTree = "<group>"; };
+		00216F891E970056008204EA /* c_org_ortc_RTCMediaStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCMediaStreamStats.h; sourceTree = "<group>"; };
+		00216F8A1E970056008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCMediaStreamTrackStats.cpp; sourceTree = "<group>"; };
+		00216F8B1E970056008204EA /* c_org_ortc_RTCMediaStreamTrackStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCMediaStreamTrackStats.h; sourceTree = "<group>"; };
+		00216F8C1E970056008204EA /* c_org_ortc_RTCMessageEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCMessageEvent.cpp; sourceTree = "<group>"; };
+		00216F8D1E970056008204EA /* c_org_ortc_RTCMessageEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCMessageEvent.h; sourceTree = "<group>"; };
+		00216F8E1E970056008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCOutboundRtpStreamStats.cpp; sourceTree = "<group>"; };
+		00216F8F1E970056008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCOutboundRtpStreamStats.h; sourceTree = "<group>"; };
+		00216F901E970056008204EA /* c_org_ortc_RTCRtcpFeedback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtcpFeedback.cpp; sourceTree = "<group>"; };
+		00216F911E970056008204EA /* c_org_ortc_RTCRtcpFeedback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtcpFeedback.h; sourceTree = "<group>"; };
+		00216F921E970056008204EA /* c_org_ortc_RTCRtcpParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtcpParameters.cpp; sourceTree = "<group>"; };
+		00216F931E970056008204EA /* c_org_ortc_RTCRtcpParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtcpParameters.h; sourceTree = "<group>"; };
+		00216F941E970056008204EA /* c_org_ortc_RTCRtcpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtcpTransport.cpp; sourceTree = "<group>"; };
+		00216F951E970056008204EA /* c_org_ortc_RTCRtcpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtcpTransport.h; sourceTree = "<group>"; };
+		00216F961E970056008204EA /* c_org_ortc_RTCRtpCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCapabilities.cpp; sourceTree = "<group>"; };
+		00216F971E970056008204EA /* c_org_ortc_RTCRtpCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCapabilities.h; sourceTree = "<group>"; };
+		00216F981E970056008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCodecCapability.cpp; sourceTree = "<group>"; };
+		00216F991E970056008204EA /* c_org_ortc_RTCRtpCodecCapability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCodecCapability.h; sourceTree = "<group>"; };
+		00216F9A1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCodecCapabilityOptions.cpp; sourceTree = "<group>"; };
+		00216F9B1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCodecCapabilityOptions.h; sourceTree = "<group>"; };
+		00216F9C1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216F9D1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216F9E1E970056008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCodecParameters.cpp; sourceTree = "<group>"; };
+		00216F9F1E970056008204EA /* c_org_ortc_RTCRtpCodecParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCodecParameters.h; sourceTree = "<group>"; };
+		00216FA01E970056008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216FA11E970056008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpCodecParameterSettings.h; sourceTree = "<group>"; };
+		00216FA21E970056008204EA /* c_org_ortc_RTCRtpContributingSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpContributingSource.cpp; sourceTree = "<group>"; };
+		00216FA31E970056008204EA /* c_org_ortc_RTCRtpContributingSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpContributingSource.h; sourceTree = "<group>"; };
+		00216FA41E970056008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpEncodingParameters.cpp; sourceTree = "<group>"; };
+		00216FA51E970056008204EA /* c_org_ortc_RTCRtpEncodingParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpEncodingParameters.h; sourceTree = "<group>"; };
+		00216FA61E970056008204EA /* c_org_ortc_RTCRtpFecParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpFecParameters.cpp; sourceTree = "<group>"; };
+		00216FA71E970056008204EA /* c_org_ortc_RTCRtpFecParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpFecParameters.h; sourceTree = "<group>"; };
+		00216FA81E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216FA91E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216FAA1E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216FAB1E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h; sourceTree = "<group>"; };
+		00216FAC1E970056008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216FAD1E970056008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpH264CodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216FAE1E970056008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpH264CodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216FAF1E970056008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpH264CodecParameterSettings.h; sourceTree = "<group>"; };
+		00216FB01E970056008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpHeaderExtension.cpp; sourceTree = "<group>"; };
+		00216FB11E970056008204EA /* c_org_ortc_RTCRtpHeaderExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpHeaderExtension.h; sourceTree = "<group>"; };
+		00216FB21E970056008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpHeaderExtensionParameters.cpp; sourceTree = "<group>"; };
+		00216FB31E970056008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpHeaderExtensionParameters.h; sourceTree = "<group>"; };
+		00216FB41E970056008204EA /* c_org_ortc_RTCRtpListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpListener.cpp; sourceTree = "<group>"; };
+		00216FB51E970056008204EA /* c_org_ortc_RTCRtpListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpListener.h; sourceTree = "<group>"; };
+		00216FB61E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp; sourceTree = "<group>"; };
+		00216FB71E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h; sourceTree = "<group>"; };
+		00216FB81E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216FB91E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216FBA1E970056008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216FBB1E970056008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpOpusCodecParameterSettings.h; sourceTree = "<group>"; };
+		00216FBC1E970056008204EA /* c_org_ortc_RTCRtpParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpParameters.cpp; sourceTree = "<group>"; };
+		00216FBD1E970056008204EA /* c_org_ortc_RTCRtpParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpParameters.h; sourceTree = "<group>"; };
+		00216FBE1E970056008204EA /* c_org_ortc_RTCRtpReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpReceiver.cpp; sourceTree = "<group>"; };
+		00216FBF1E970056008204EA /* c_org_ortc_RTCRtpReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpReceiver.h; sourceTree = "<group>"; };
+		00216FC01E970056008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpRedCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216FC11E970056008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpRedCodecParameterSettings.h; sourceTree = "<group>"; };
+		00216FC21E970056008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216FC31E970056008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216FC41E970056008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216FC51E970056008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpRtxCodecParameterSettings.h; sourceTree = "<group>"; };
+		00216FC61E970056008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpRtxParameters.cpp; sourceTree = "<group>"; };
+		00216FC71E970056008204EA /* c_org_ortc_RTCRtpRtxParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpRtxParameters.h; sourceTree = "<group>"; };
+		00216FC81E970056008204EA /* c_org_ortc_RTCRtpSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpSender.cpp; sourceTree = "<group>"; };
+		00216FC91E970056008204EA /* c_org_ortc_RTCRtpSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpSender.h; sourceTree = "<group>"; };
+		00216FCA1E970056008204EA /* c_org_ortc_RTCRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpStreamStats.cpp; sourceTree = "<group>"; };
+		00216FCB1E970056008204EA /* c_org_ortc_RTCRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpStreamStats.h; sourceTree = "<group>"; };
+		00216FCC1E970056008204EA /* c_org_ortc_RTCRtpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpTransport.cpp; sourceTree = "<group>"; };
+		00216FCD1E970056008204EA /* c_org_ortc_RTCRtpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpTransport.h; sourceTree = "<group>"; };
+		00216FCE1E970056008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpUnhandledEvent.cpp; sourceTree = "<group>"; };
+		00216FCF1E970056008204EA /* c_org_ortc_RTCRtpUnhandledEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpUnhandledEvent.h; sourceTree = "<group>"; };
+		00216FD01E970056008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00216FD11E970056008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00216FD21E970056008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00216FD31E970056008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCRtpVp8CodecParameterSettings.h; sourceTree = "<group>"; };
+		00216FD41E970056008204EA /* c_org_ortc_RTCSctpCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpCapabilities.cpp; sourceTree = "<group>"; };
+		00216FD51E970056008204EA /* c_org_ortc_RTCSctpCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpCapabilities.h; sourceTree = "<group>"; };
+		00216FD61E970056008204EA /* c_org_ortc_RTCSctpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpTransport.cpp; sourceTree = "<group>"; };
+		00216FD71E970056008204EA /* c_org_ortc_RTCSctpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpTransport.h; sourceTree = "<group>"; };
+		00216FD81E970056008204EA /* c_org_ortc_RTCSctpTransportListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpTransportListener.cpp; sourceTree = "<group>"; };
+		00216FD91E970056008204EA /* c_org_ortc_RTCSctpTransportListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpTransportListener.h; sourceTree = "<group>"; };
+		00216FDA1E970056008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpTransportListenerEvent.cpp; sourceTree = "<group>"; };
+		00216FDB1E970056008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpTransportListenerEvent.h; sourceTree = "<group>"; };
+		00216FDC1E970056008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00216FDD1E970056008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		00216FDE1E970056008204EA /* c_org_ortc_RTCSctpTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSctpTransportStats.cpp; sourceTree = "<group>"; };
+		00216FDF1E970056008204EA /* c_org_ortc_RTCSctpTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSctpTransportStats.h; sourceTree = "<group>"; };
+		00216FE01E970056008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpSdesCryptoParameters.cpp; sourceTree = "<group>"; };
+		00216FE11E970056008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpSdesCryptoParameters.h; sourceTree = "<group>"; };
+		00216FE21E970056008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpSdesKeyParameters.cpp; sourceTree = "<group>"; };
+		00216FE31E970056008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpSdesKeyParameters.h; sourceTree = "<group>"; };
+		00216FE41E970056008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpSdesParameters.cpp; sourceTree = "<group>"; };
+		00216FE51E970056008204EA /* c_org_ortc_RTCSrtpSdesParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpSdesParameters.h; sourceTree = "<group>"; };
+		00216FE61E970056008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpSdesTransport.cpp; sourceTree = "<group>"; };
+		00216FE71E970056008204EA /* c_org_ortc_RTCSrtpSdesTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpSdesTransport.h; sourceTree = "<group>"; };
+		00216FE81E970056008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp; sourceTree = "<group>"; };
+		00216FE91E970056008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h; sourceTree = "<group>"; };
+		00216FEA1E970056008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSrtpTransportStats.cpp; sourceTree = "<group>"; };
+		00216FEB1E970056008204EA /* c_org_ortc_RTCSrtpTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSrtpTransportStats.h; sourceTree = "<group>"; };
+		00216FEC1E970056008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCSsrcConflictEvent.cpp; sourceTree = "<group>"; };
+		00216FED1E970056008204EA /* c_org_ortc_RTCSsrcConflictEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCSsrcConflictEvent.h; sourceTree = "<group>"; };
+		00216FEE1E970056008204EA /* c_org_ortc_RTCStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCStats.cpp; sourceTree = "<group>"; };
+		00216FEF1E970056008204EA /* c_org_ortc_RTCStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCStats.h; sourceTree = "<group>"; };
+		00216FF01E970056008204EA /* c_org_ortc_RTCStatsProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCStatsProvider.cpp; sourceTree = "<group>"; };
+		00216FF11E970056008204EA /* c_org_ortc_RTCStatsProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCStatsProvider.h; sourceTree = "<group>"; };
+		00216FF21E970056008204EA /* c_org_ortc_RTCStatsReport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCStatsReport.cpp; sourceTree = "<group>"; };
+		00216FF31E970056008204EA /* c_org_ortc_RTCStatsReport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCStatsReport.h; sourceTree = "<group>"; };
+		00216FF41E970056008204EA /* c_org_ortc_RTCStatsTypeSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_RTCStatsTypeSet.cpp; sourceTree = "<group>"; };
+		00216FF51E970056008204EA /* c_org_ortc_RTCStatsTypeSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_RTCStatsTypeSet.h; sourceTree = "<group>"; };
+		00216FF61E970056008204EA /* c_org_ortc_Settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_Settings.cpp; sourceTree = "<group>"; };
+		00216FF71E970056008204EA /* c_org_ortc_Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_Settings.h; sourceTree = "<group>"; };
+		00216FF81E970056008204EA /* c_org_ortc_StringOrStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_org_ortc_StringOrStringList.cpp; sourceTree = "<group>"; };
+		00216FF91E970056008204EA /* c_org_ortc_StringOrStringList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_org_ortc_StringOrStringList.h; sourceTree = "<group>"; };
+		00216FFA1E970056008204EA /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		00216EB71E970020008204EA /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		00216EB11E970020008204EA = {
+			isa = PBXGroup;
+			children = (
+				00216EC11E970056008204EA /* c */,
+				00216EBB1E970020008204EA /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		00216EBB1E970020008204EA /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				00216EBA1E970020008204EA /* libortclib-c-osx.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		00216EC11E970056008204EA /* c */ = {
+			isa = PBXGroup;
+			children = (
+				00216EC21E970056008204EA /* c_helpers.cpp */,
+				00216EC31E970056008204EA /* c_helpers.h */,
+				00216EC41E970056008204EA /* c_org_ortc_adapter_MediaStream.cpp */,
+				00216EC51E970056008204EA /* c_org_ortc_adapter_MediaStream.h */,
+				00216EC61E970056008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp */,
+				00216EC71E970056008204EA /* c_org_ortc_adapter_RTCAnswerOptions.h */,
+				00216EC81E970056008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp */,
+				00216EC91E970056008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.h */,
+				00216ECA1E970056008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp */,
+				00216ECB1E970056008204EA /* c_org_ortc_adapter_RTCConfiguration.h */,
+				00216ECC1E970056008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp */,
+				00216ECD1E970056008204EA /* c_org_ortc_adapter_RTCIceCandidate.h */,
+				00216ECE1E970056008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */,
+				00216ECF1E970056008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h */,
+				00216ED01E970056008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp */,
+				00216ED11E970056008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.h */,
+				00216ED21E970056008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp */,
+				00216ED31E970056008204EA /* c_org_ortc_adapter_RTCOfferOptions.h */,
+				00216ED41E970056008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp */,
+				00216ED51E970056008204EA /* c_org_ortc_adapter_RTCPeerConnection.h */,
+				00216ED61E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */,
+				00216ED71E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h */,
+				00216ED81E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */,
+				00216ED91E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.h */,
+				00216EDA1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp */,
+				00216EDB1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescription.h */,
+				00216EDC1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */,
+				00216EDD1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h */,
+				00216EDE1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */,
+				00216EDF1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h */,
+				00216EE01E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */,
+				00216EE11E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.h */,
+				00216EE21E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */,
+				00216EE31E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h */,
+				00216EE41E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */,
+				00216EE51E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h */,
+				00216EE61E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */,
+				00216EE71E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h */,
+				00216EE81E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */,
+				00216EE91E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h */,
+				00216EEA1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */,
+				00216EEB1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h */,
+				00216EEC1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */,
+				00216EED1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h */,
+				00216EEE1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */,
+				00216EEF1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h */,
+				00216EF01E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */,
+				00216EF11E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.h */,
+				00216EF21E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */,
+				00216EF31E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h */,
+				00216EF41E970056008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp */,
+				00216EF51E970056008204EA /* c_org_ortc_adapter_RTCTrackEvent.h */,
+				00216EF61E970056008204EA /* c_org_ortc_ConstrainBoolean.cpp */,
+				00216EF71E970056008204EA /* c_org_ortc_ConstrainBoolean.h */,
+				00216EF81E970056008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp */,
+				00216EF91E970056008204EA /* c_org_ortc_ConstrainBooleanParameters.h */,
+				00216EFA1E970056008204EA /* c_org_ortc_ConstrainDouble.cpp */,
+				00216EFB1E970056008204EA /* c_org_ortc_ConstrainDouble.h */,
+				00216EFC1E970056008204EA /* c_org_ortc_ConstrainDoubleRange.cpp */,
+				00216EFD1E970056008204EA /* c_org_ortc_ConstrainDoubleRange.h */,
+				00216EFE1E970056008204EA /* c_org_ortc_ConstrainLong.cpp */,
+				00216EFF1E970056008204EA /* c_org_ortc_ConstrainLong.h */,
+				00216F001E970056008204EA /* c_org_ortc_ConstrainLongRange.cpp */,
+				00216F011E970056008204EA /* c_org_ortc_ConstrainLongRange.h */,
+				00216F021E970056008204EA /* c_org_ortc_ConstrainString.cpp */,
+				00216F031E970056008204EA /* c_org_ortc_ConstrainString.h */,
+				00216F041E970056008204EA /* c_org_ortc_ConstrainStringParameters.cpp */,
+				00216F051E970056008204EA /* c_org_ortc_ConstrainStringParameters.h */,
+				00216F061E970056008204EA /* c_org_ortc_DoubleRange.cpp */,
+				00216F071E970056008204EA /* c_org_ortc_DoubleRange.h */,
+				00216F081E970056008204EA /* c_org_ortc_Error.cpp */,
+				00216F091E970056008204EA /* c_org_ortc_Error.h */,
+				00216F0A1E970056008204EA /* c_org_ortc_ErrorEvent.cpp */,
+				00216F0B1E970056008204EA /* c_org_ortc_ErrorEvent.h */,
+				00216F0C1E970056008204EA /* c_org_ortc_Json.cpp */,
+				00216F0D1E970056008204EA /* c_org_ortc_Json.h */,
+				00216F0E1E970056008204EA /* c_org_ortc_Logger.cpp */,
+				00216F0F1E970056008204EA /* c_org_ortc_Logger.h */,
+				00216F101E970056008204EA /* c_org_ortc_LongRange.cpp */,
+				00216F111E970056008204EA /* c_org_ortc_LongRange.h */,
+				00216F121E970056008204EA /* c_org_ortc_MediaControl.cpp */,
+				00216F131E970056008204EA /* c_org_ortc_MediaControl.h */,
+				00216F141E970056008204EA /* c_org_ortc_MediaDeviceInfo.cpp */,
+				00216F151E970056008204EA /* c_org_ortc_MediaDeviceInfo.h */,
+				00216F161E970056008204EA /* c_org_ortc_MediaDevices.cpp */,
+				00216F171E970056008204EA /* c_org_ortc_MediaDevices.h */,
+				00216F181E970056008204EA /* c_org_ortc_MediaSource.cpp */,
+				00216F191E970056008204EA /* c_org_ortc_MediaSource.h */,
+				00216F1A1E970056008204EA /* c_org_ortc_MediaStreamConstraints.cpp */,
+				00216F1B1E970056008204EA /* c_org_ortc_MediaStreamConstraints.h */,
+				00216F1C1E970056008204EA /* c_org_ortc_MediaStreamTrack.cpp */,
+				00216F1D1E970056008204EA /* c_org_ortc_MediaStreamTrack.h */,
+				00216F1E1E970056008204EA /* c_org_ortc_MediaTrackCapabilities.cpp */,
+				00216F1F1E970056008204EA /* c_org_ortc_MediaTrackCapabilities.h */,
+				00216F201E970056008204EA /* c_org_ortc_MediaTrackConstraints.cpp */,
+				00216F211E970056008204EA /* c_org_ortc_MediaTrackConstraints.h */,
+				00216F221E970056008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp */,
+				00216F231E970056008204EA /* c_org_ortc_MediaTrackConstraintSet.h */,
+				00216F241E970056008204EA /* c_org_ortc_MediaTrackSettings.cpp */,
+				00216F251E970056008204EA /* c_org_ortc_MediaTrackSettings.h */,
+				00216F261E970056008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp */,
+				00216F271E970056008204EA /* c_org_ortc_MediaTrackSupportedConstraints.h */,
+				00216F281E970056008204EA /* c_org_ortc_MessageQueue.cpp */,
+				00216F291E970056008204EA /* c_org_ortc_MessageQueue.h */,
+				00216F2A1E970056008204EA /* c_org_ortc_OrtcLib.cpp */,
+				00216F2B1E970056008204EA /* c_org_ortc_OrtcLib.h */,
+				00216F2C1E970056008204EA /* c_org_ortc_OverconstrainedError.cpp */,
+				00216F2D1E970056008204EA /* c_org_ortc_OverconstrainedError.h */,
+				00216F2E1E970056008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp */,
+				00216F2F1E970056008204EA /* c_org_ortc_OverconstrainedErrorEvent.h */,
+				00216F301E970056008204EA /* c_org_ortc_RTCCertificate.cpp */,
+				00216F311E970056008204EA /* c_org_ortc_RTCCertificate.h */,
+				00216F321E970056008204EA /* c_org_ortc_RTCCertificateStats.cpp */,
+				00216F331E970056008204EA /* c_org_ortc_RTCCertificateStats.h */,
+				00216F341E970056008204EA /* c_org_ortc_RTCCodec.cpp */,
+				00216F351E970056008204EA /* c_org_ortc_RTCCodec.h */,
+				00216F361E970056008204EA /* c_org_ortc_RTCDataChannel.cpp */,
+				00216F371E970056008204EA /* c_org_ortc_RTCDataChannel.h */,
+				00216F381E970056008204EA /* c_org_ortc_RTCDataChannelEvent.cpp */,
+				00216F391E970056008204EA /* c_org_ortc_RTCDataChannelEvent.h */,
+				00216F3A1E970056008204EA /* c_org_ortc_RTCDataChannelParameters.cpp */,
+				00216F3B1E970056008204EA /* c_org_ortc_RTCDataChannelParameters.h */,
+				00216F3C1E970056008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp */,
+				00216F3D1E970056008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.h */,
+				00216F3E1E970056008204EA /* c_org_ortc_RTCDataChannelStats.cpp */,
+				00216F3F1E970056008204EA /* c_org_ortc_RTCDataChannelStats.h */,
+				00216F401E970056008204EA /* c_org_ortc_RTCDataTransport.cpp */,
+				00216F411E970056008204EA /* c_org_ortc_RTCDataTransport.h */,
+				00216F421E970056008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp */,
+				00216F431E970056008204EA /* c_org_ortc_RTCDtlsCertificateBinary.h */,
+				00216F441E970056008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp */,
+				00216F451E970056008204EA /* c_org_ortc_RTCDtlsFingerprint.h */,
+				00216F461E970056008204EA /* c_org_ortc_RTCDtlsParameters.cpp */,
+				00216F471E970056008204EA /* c_org_ortc_RTCDtlsParameters.h */,
+				00216F481E970056008204EA /* c_org_ortc_RTCDtlsTransport.cpp */,
+				00216F491E970056008204EA /* c_org_ortc_RTCDtlsTransport.h */,
+				00216F4A1E970056008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */,
+				00216F4B1E970056008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.h */,
+				00216F4C1E970056008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp */,
+				00216F4D1E970056008204EA /* c_org_ortc_RTCDtlsTransportStats.h */,
+				00216F4E1E970056008204EA /* c_org_ortc_RTCDtmfSender.cpp */,
+				00216F4F1E970056008204EA /* c_org_ortc_RTCDtmfSender.h */,
+				00216F501E970056008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp */,
+				00216F511E970056008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.h */,
+				00216F521E970056008204EA /* c_org_ortc_RTCIceCandidate.cpp */,
+				00216F531E970056008204EA /* c_org_ortc_RTCIceCandidate.h */,
+				00216F541E970056008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp */,
+				00216F551E970056008204EA /* c_org_ortc_RTCIceCandidateAttributes.h */,
+				00216F561E970056008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp */,
+				00216F571E970056008204EA /* c_org_ortc_RTCIceCandidateComplete.h */,
+				00216F581E970056008204EA /* c_org_ortc_RTCIceCandidatePair.cpp */,
+				00216F591E970056008204EA /* c_org_ortc_RTCIceCandidatePair.h */,
+				00216F5A1E970056008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp */,
+				00216F5B1E970056008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.h */,
+				00216F5C1E970056008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp */,
+				00216F5D1E970056008204EA /* c_org_ortc_RTCIceCandidatePairStats.h */,
+				00216F5E1E970056008204EA /* c_org_ortc_RTCIceGatherer.cpp */,
+				00216F5F1E970056008204EA /* c_org_ortc_RTCIceGatherer.h */,
+				00216F601E970056008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp */,
+				00216F611E970056008204EA /* c_org_ortc_RTCIceGathererCandidate.h */,
+				00216F621E970056008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */,
+				00216F631E970056008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.h */,
+				00216F641E970056008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp */,
+				00216F651E970056008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.h */,
+				00216F661E970056008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp */,
+				00216F671E970056008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.h */,
+				00216F681E970056008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp */,
+				00216F691E970056008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.h */,
+				00216F6A1E970056008204EA /* c_org_ortc_RTCIceGathererStats.cpp */,
+				00216F6B1E970056008204EA /* c_org_ortc_RTCIceGathererStats.h */,
+				00216F6C1E970056008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp */,
+				00216F6D1E970056008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.h */,
+				00216F6E1E970056008204EA /* c_org_ortc_RTCIceGatherOptions.cpp */,
+				00216F6F1E970056008204EA /* c_org_ortc_RTCIceGatherOptions.h */,
+				00216F701E970056008204EA /* c_org_ortc_RTCIceParameters.cpp */,
+				00216F711E970056008204EA /* c_org_ortc_RTCIceParameters.h */,
+				00216F721E970056008204EA /* c_org_ortc_RTCIceServer.cpp */,
+				00216F731E970056008204EA /* c_org_ortc_RTCIceServer.h */,
+				00216F741E970056008204EA /* c_org_ortc_RTCIceTransport.cpp */,
+				00216F751E970056008204EA /* c_org_ortc_RTCIceTransport.h */,
+				00216F761E970056008204EA /* c_org_ortc_RTCIceTransportController.cpp */,
+				00216F771E970056008204EA /* c_org_ortc_RTCIceTransportController.h */,
+				00216F781E970056008204EA /* c_org_ortc_RTCIceTransportOptions.cpp */,
+				00216F791E970056008204EA /* c_org_ortc_RTCIceTransportOptions.h */,
+				00216F7A1E970056008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp */,
+				00216F7B1E970056008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.h */,
+				00216F7C1E970056008204EA /* c_org_ortc_RTCIceTransportStats.cpp */,
+				00216F7D1E970056008204EA /* c_org_ortc_RTCIceTransportStats.h */,
+				00216F7E1E970056008204EA /* c_org_ortc_RTCIdentity.cpp */,
+				00216F7F1E970056008204EA /* c_org_ortc_RTCIdentity.h */,
+				00216F801E970056008204EA /* c_org_ortc_RTCIdentityAssertion.cpp */,
+				00216F811E970056008204EA /* c_org_ortc_RTCIdentityAssertion.h */,
+				00216F821E970056008204EA /* c_org_ortc_RTCIdentityError.cpp */,
+				00216F831E970056008204EA /* c_org_ortc_RTCIdentityError.h */,
+				00216F841E970056008204EA /* c_org_ortc_RTCIdentityResult.cpp */,
+				00216F851E970056008204EA /* c_org_ortc_RTCIdentityResult.h */,
+				00216F861E970056008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp */,
+				00216F871E970056008204EA /* c_org_ortc_RTCInboundRtpStreamStats.h */,
+				00216F881E970056008204EA /* c_org_ortc_RTCMediaStreamStats.cpp */,
+				00216F891E970056008204EA /* c_org_ortc_RTCMediaStreamStats.h */,
+				00216F8A1E970056008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp */,
+				00216F8B1E970056008204EA /* c_org_ortc_RTCMediaStreamTrackStats.h */,
+				00216F8C1E970056008204EA /* c_org_ortc_RTCMessageEvent.cpp */,
+				00216F8D1E970056008204EA /* c_org_ortc_RTCMessageEvent.h */,
+				00216F8E1E970056008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp */,
+				00216F8F1E970056008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.h */,
+				00216F901E970056008204EA /* c_org_ortc_RTCRtcpFeedback.cpp */,
+				00216F911E970056008204EA /* c_org_ortc_RTCRtcpFeedback.h */,
+				00216F921E970056008204EA /* c_org_ortc_RTCRtcpParameters.cpp */,
+				00216F931E970056008204EA /* c_org_ortc_RTCRtcpParameters.h */,
+				00216F941E970056008204EA /* c_org_ortc_RTCRtcpTransport.cpp */,
+				00216F951E970056008204EA /* c_org_ortc_RTCRtcpTransport.h */,
+				00216F961E970056008204EA /* c_org_ortc_RTCRtpCapabilities.cpp */,
+				00216F971E970056008204EA /* c_org_ortc_RTCRtpCapabilities.h */,
+				00216F981E970056008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp */,
+				00216F991E970056008204EA /* c_org_ortc_RTCRtpCodecCapability.h */,
+				00216F9A1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp */,
+				00216F9B1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.h */,
+				00216F9C1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp */,
+				00216F9D1E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.h */,
+				00216F9E1E970056008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp */,
+				00216F9F1E970056008204EA /* c_org_ortc_RTCRtpCodecParameters.h */,
+				00216FA01E970056008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp */,
+				00216FA11E970056008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.h */,
+				00216FA21E970056008204EA /* c_org_ortc_RTCRtpContributingSource.cpp */,
+				00216FA31E970056008204EA /* c_org_ortc_RTCRtpContributingSource.h */,
+				00216FA41E970056008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp */,
+				00216FA51E970056008204EA /* c_org_ortc_RTCRtpEncodingParameters.h */,
+				00216FA61E970056008204EA /* c_org_ortc_RTCRtpFecParameters.cpp */,
+				00216FA71E970056008204EA /* c_org_ortc_RTCRtpFecParameters.h */,
+				00216FA81E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */,
+				00216FA91E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h */,
+				00216FAA1E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */,
+				00216FAB1E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h */,
+				00216FAC1E970056008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */,
+				00216FAD1E970056008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.h */,
+				00216FAE1E970056008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp */,
+				00216FAF1E970056008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.h */,
+				00216FB01E970056008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp */,
+				00216FB11E970056008204EA /* c_org_ortc_RTCRtpHeaderExtension.h */,
+				00216FB21E970056008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp */,
+				00216FB31E970056008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.h */,
+				00216FB41E970056008204EA /* c_org_ortc_RTCRtpListener.cpp */,
+				00216FB51E970056008204EA /* c_org_ortc_RTCRtpListener.h */,
+				00216FB61E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */,
+				00216FB71E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h */,
+				00216FB81E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */,
+				00216FB91E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h */,
+				00216FBA1E970056008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */,
+				00216FBB1E970056008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.h */,
+				00216FBC1E970056008204EA /* c_org_ortc_RTCRtpParameters.cpp */,
+				00216FBD1E970056008204EA /* c_org_ortc_RTCRtpParameters.h */,
+				00216FBE1E970056008204EA /* c_org_ortc_RTCRtpReceiver.cpp */,
+				00216FBF1E970056008204EA /* c_org_ortc_RTCRtpReceiver.h */,
+				00216FC01E970056008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp */,
+				00216FC11E970056008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.h */,
+				00216FC21E970056008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */,
+				00216FC31E970056008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h */,
+				00216FC41E970056008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */,
+				00216FC51E970056008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.h */,
+				00216FC61E970056008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp */,
+				00216FC71E970056008204EA /* c_org_ortc_RTCRtpRtxParameters.h */,
+				00216FC81E970056008204EA /* c_org_ortc_RTCRtpSender.cpp */,
+				00216FC91E970056008204EA /* c_org_ortc_RTCRtpSender.h */,
+				00216FCA1E970056008204EA /* c_org_ortc_RTCRtpStreamStats.cpp */,
+				00216FCB1E970056008204EA /* c_org_ortc_RTCRtpStreamStats.h */,
+				00216FCC1E970056008204EA /* c_org_ortc_RTCRtpTransport.cpp */,
+				00216FCD1E970056008204EA /* c_org_ortc_RTCRtpTransport.h */,
+				00216FCE1E970056008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp */,
+				00216FCF1E970056008204EA /* c_org_ortc_RTCRtpUnhandledEvent.h */,
+				00216FD01E970056008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */,
+				00216FD11E970056008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h */,
+				00216FD21E970056008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */,
+				00216FD31E970056008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.h */,
+				00216FD41E970056008204EA /* c_org_ortc_RTCSctpCapabilities.cpp */,
+				00216FD51E970056008204EA /* c_org_ortc_RTCSctpCapabilities.h */,
+				00216FD61E970056008204EA /* c_org_ortc_RTCSctpTransport.cpp */,
+				00216FD71E970056008204EA /* c_org_ortc_RTCSctpTransport.h */,
+				00216FD81E970056008204EA /* c_org_ortc_RTCSctpTransportListener.cpp */,
+				00216FD91E970056008204EA /* c_org_ortc_RTCSctpTransportListener.h */,
+				00216FDA1E970056008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp */,
+				00216FDB1E970056008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.h */,
+				00216FDC1E970056008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp */,
+				00216FDD1E970056008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.h */,
+				00216FDE1E970056008204EA /* c_org_ortc_RTCSctpTransportStats.cpp */,
+				00216FDF1E970056008204EA /* c_org_ortc_RTCSctpTransportStats.h */,
+				00216FE01E970056008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp */,
+				00216FE11E970056008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.h */,
+				00216FE21E970056008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp */,
+				00216FE31E970056008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.h */,
+				00216FE41E970056008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp */,
+				00216FE51E970056008204EA /* c_org_ortc_RTCSrtpSdesParameters.h */,
+				00216FE61E970056008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp */,
+				00216FE71E970056008204EA /* c_org_ortc_RTCSrtpSdesTransport.h */,
+				00216FE81E970056008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */,
+				00216FE91E970056008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h */,
+				00216FEA1E970056008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp */,
+				00216FEB1E970056008204EA /* c_org_ortc_RTCSrtpTransportStats.h */,
+				00216FEC1E970056008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp */,
+				00216FED1E970056008204EA /* c_org_ortc_RTCSsrcConflictEvent.h */,
+				00216FEE1E970056008204EA /* c_org_ortc_RTCStats.cpp */,
+				00216FEF1E970056008204EA /* c_org_ortc_RTCStats.h */,
+				00216FF01E970056008204EA /* c_org_ortc_RTCStatsProvider.cpp */,
+				00216FF11E970056008204EA /* c_org_ortc_RTCStatsProvider.h */,
+				00216FF21E970056008204EA /* c_org_ortc_RTCStatsReport.cpp */,
+				00216FF31E970056008204EA /* c_org_ortc_RTCStatsReport.h */,
+				00216FF41E970056008204EA /* c_org_ortc_RTCStatsTypeSet.cpp */,
+				00216FF51E970056008204EA /* c_org_ortc_RTCStatsTypeSet.h */,
+				00216FF61E970056008204EA /* c_org_ortc_Settings.cpp */,
+				00216FF71E970056008204EA /* c_org_ortc_Settings.h */,
+				00216FF81E970056008204EA /* c_org_ortc_StringOrStringList.cpp */,
+				00216FF91E970056008204EA /* c_org_ortc_StringOrStringList.h */,
+				00216FFA1E970056008204EA /* types.h */,
+			);
+			name = c;
+			path = ../../../ortc/idl/wrapper/generated/c;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		00216EB81E970020008204EA /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				002170F21E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.h in Headers */,
+				002170BE1E970056008204EA /* c_org_ortc_RTCIdentityResult.h in Headers */,
+				002171141E970056008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.h in Headers */,
+				002170E61E970056008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.h in Headers */,
+				002170821E970056008204EA /* c_org_ortc_RTCDtlsTransport.h in Headers */,
+				002170261E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h in Headers */,
+				0021701A1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.h in Headers */,
+				0021709A1E970056008204EA /* c_org_ortc_RTCIceGathererCandidate.h in Headers */,
+				002170181E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h in Headers */,
+				002170E41E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.h in Headers */,
+				0021704C1E970056008204EA /* c_org_ortc_MediaControl.h in Headers */,
+				002171081E970056008204EA /* c_org_ortc_RTCRtpUnhandledEvent.h in Headers */,
+				0021703A1E970056008204EA /* c_org_ortc_ConstrainLongRange.h in Headers */,
+				002171021E970056008204EA /* c_org_ortc_RTCRtpSender.h in Headers */,
+				002171331E970056008204EA /* types.h in Headers */,
+				002170861E970056008204EA /* c_org_ortc_RTCDtlsTransportStats.h in Headers */,
+				0021710A1E970056008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.h in Headers */,
+				002170A81E970056008204EA /* c_org_ortc_RTCIceGatherOptions.h in Headers */,
+				002170E01E970056008204EA /* c_org_ortc_RTCRtpFecParameters.h in Headers */,
+				002170641E970056008204EA /* c_org_ortc_OrtcLib.h in Headers */,
+				002170581E970056008204EA /* c_org_ortc_MediaTrackCapabilities.h in Headers */,
+				002171041E970056008204EA /* c_org_ortc_RTCRtpStreamStats.h in Headers */,
+				002170661E970056008204EA /* c_org_ortc_OverconstrainedError.h in Headers */,
+				002170B21E970056008204EA /* c_org_ortc_RTCIceTransportOptions.h in Headers */,
+				00216FFE1E970056008204EA /* c_org_ortc_adapter_MediaStream.h in Headers */,
+				002170061E970056008204EA /* c_org_ortc_adapter_RTCIceCandidate.h in Headers */,
+				0021703E1E970056008204EA /* c_org_ortc_ConstrainStringParameters.h in Headers */,
+				002170881E970056008204EA /* c_org_ortc_RTCDtmfSender.h in Headers */,
+				002171101E970056008204EA /* c_org_ortc_RTCSctpTransport.h in Headers */,
+				0021710E1E970056008204EA /* c_org_ortc_RTCSctpCapabilities.h in Headers */,
+				002171001E970056008204EA /* c_org_ortc_RTCRtpRtxParameters.h in Headers */,
+				0021705A1E970056008204EA /* c_org_ortc_MediaTrackConstraints.h in Headers */,
+				0021709E1E970056008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.h in Headers */,
+				002170C21E970056008204EA /* c_org_ortc_RTCMediaStreamStats.h in Headers */,
+				002170141E970056008204EA /* c_org_ortc_adapter_RTCSessionDescription.h in Headers */,
+				00216FFC1E970056008204EA /* c_helpers.h in Headers */,
+				002170301E970056008204EA /* c_org_ortc_ConstrainBoolean.h in Headers */,
+				0021712E1E970056008204EA /* c_org_ortc_RTCStatsTypeSet.h in Headers */,
+				002170741E970056008204EA /* c_org_ortc_RTCDataChannelParameters.h in Headers */,
+				002170CA1E970056008204EA /* c_org_ortc_RTCRtcpFeedback.h in Headers */,
+				002170761E970056008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.h in Headers */,
+				002170701E970056008204EA /* c_org_ortc_RTCDataChannel.h in Headers */,
+				002170E21E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h in Headers */,
+				0021700C1E970056008204EA /* c_org_ortc_adapter_RTCOfferOptions.h in Headers */,
+				002170AA1E970056008204EA /* c_org_ortc_RTCIceParameters.h in Headers */,
+				0021705C1E970056008204EA /* c_org_ortc_MediaTrackConstraintSet.h in Headers */,
+				002170F81E970056008204EA /* c_org_ortc_RTCRtpReceiver.h in Headers */,
+				002170961E970056008204EA /* c_org_ortc_RTCIceCandidatePairStats.h in Headers */,
+				002171121E970056008204EA /* c_org_ortc_RTCSctpTransportListener.h in Headers */,
+				002170441E970056008204EA /* c_org_ortc_ErrorEvent.h in Headers */,
+				002170021E970056008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.h in Headers */,
+				002170EE1E970056008204EA /* c_org_ortc_RTCRtpListener.h in Headers */,
+				002170D81E970056008204EA /* c_org_ortc_RTCRtpCodecParameters.h in Headers */,
+				002170101E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h in Headers */,
+				002170521E970056008204EA /* c_org_ortc_MediaSource.h in Headers */,
+				0021700E1E970056008204EA /* c_org_ortc_adapter_RTCPeerConnection.h in Headers */,
+				002170FE1E970056008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.h in Headers */,
+				002170F61E970056008204EA /* c_org_ortc_RTCRtpParameters.h in Headers */,
+				0021704E1E970056008204EA /* c_org_ortc_MediaDeviceInfo.h in Headers */,
+				0021701C1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h in Headers */,
+				0021708E1E970056008204EA /* c_org_ortc_RTCIceCandidateAttributes.h in Headers */,
+				002171301E970056008204EA /* c_org_ortc_Settings.h in Headers */,
+				002170DE1E970056008204EA /* c_org_ortc_RTCRtpEncodingParameters.h in Headers */,
+				002170CC1E970056008204EA /* c_org_ortc_RTCRtcpParameters.h in Headers */,
+				002171241E970056008204EA /* c_org_ortc_RTCSrtpTransportStats.h in Headers */,
+				002170041E970056008204EA /* c_org_ortc_adapter_RTCConfiguration.h in Headers */,
+				002171281E970056008204EA /* c_org_ortc_RTCStats.h in Headers */,
+				0021702C1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h in Headers */,
+				0021701E1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.h in Headers */,
+				002171161E970056008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.h in Headers */,
+				002170561E970056008204EA /* c_org_ortc_MediaStreamTrack.h in Headers */,
+				002170DA1E970056008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.h in Headers */,
+				002170461E970056008204EA /* c_org_ortc_Json.h in Headers */,
+				002170EC1E970056008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.h in Headers */,
+				002170421E970056008204EA /* c_org_ortc_Error.h in Headers */,
+				002171221E970056008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h in Headers */,
+				0021707C1E970056008204EA /* c_org_ortc_RTCDtlsCertificateBinary.h in Headers */,
+				0021708C1E970056008204EA /* c_org_ortc_RTCIceCandidate.h in Headers */,
+				002170901E970056008204EA /* c_org_ortc_RTCIceCandidateComplete.h in Headers */,
+				002170BC1E970056008204EA /* c_org_ortc_RTCIdentityError.h in Headers */,
+				002170201E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h in Headers */,
+				002170481E970056008204EA /* c_org_ortc_Logger.h in Headers */,
+				0021707A1E970056008204EA /* c_org_ortc_RTCDataTransport.h in Headers */,
+				002171061E970056008204EA /* c_org_ortc_RTCRtpTransport.h in Headers */,
+				002170F01E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.h in Headers */,
+				002170681E970056008204EA /* c_org_ortc_OverconstrainedErrorEvent.h in Headers */,
+				002170781E970056008204EA /* c_org_ortc_RTCDataChannelStats.h in Headers */,
+				002170DC1E970056008204EA /* c_org_ortc_RTCRtpContributingSource.h in Headers */,
+				0021706C1E970056008204EA /* c_org_ortc_RTCCertificateStats.h in Headers */,
+				002171201E970056008204EA /* c_org_ortc_RTCSrtpSdesTransport.h in Headers */,
+				002170E81E970056008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.h in Headers */,
+				002170121E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.h in Headers */,
+				002170B61E970056008204EA /* c_org_ortc_RTCIceTransportStats.h in Headers */,
+				002170321E970056008204EA /* c_org_ortc_ConstrainBooleanParameters.h in Headers */,
+				0021704A1E970056008204EA /* c_org_ortc_LongRange.h in Headers */,
+				002170FA1E970056008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.h in Headers */,
+				002170C01E970056008204EA /* c_org_ortc_RTCInboundRtpStreamStats.h in Headers */,
+				002170981E970056008204EA /* c_org_ortc_RTCIceGatherer.h in Headers */,
+				002170841E970056008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.h in Headers */,
+				0021712C1E970056008204EA /* c_org_ortc_RTCStatsReport.h in Headers */,
+				002170B01E970056008204EA /* c_org_ortc_RTCIceTransportController.h in Headers */,
+				002170A41E970056008204EA /* c_org_ortc_RTCIceGathererStats.h in Headers */,
+				002170081E970056008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h in Headers */,
+				002170381E970056008204EA /* c_org_ortc_ConstrainLong.h in Headers */,
+				002171181E970056008204EA /* c_org_ortc_RTCSctpTransportStats.h in Headers */,
+				0021702E1E970056008204EA /* c_org_ortc_adapter_RTCTrackEvent.h in Headers */,
+				0021712A1E970056008204EA /* c_org_ortc_RTCStatsProvider.h in Headers */,
+				002171261E970056008204EA /* c_org_ortc_RTCSsrcConflictEvent.h in Headers */,
+				002170F41E970056008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.h in Headers */,
+				002171321E970056008204EA /* c_org_ortc_StringOrStringList.h in Headers */,
+				002170241E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.h in Headers */,
+				002170D41E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.h in Headers */,
+				002170921E970056008204EA /* c_org_ortc_RTCIceCandidatePair.h in Headers */,
+				002170341E970056008204EA /* c_org_ortc_ConstrainDouble.h in Headers */,
+				002170001E970056008204EA /* c_org_ortc_adapter_RTCAnswerOptions.h in Headers */,
+				0021700A1E970056008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.h in Headers */,
+				0021710C1E970056008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.h in Headers */,
+				0021706E1E970056008204EA /* c_org_ortc_RTCCodec.h in Headers */,
+				002170401E970056008204EA /* c_org_ortc_DoubleRange.h in Headers */,
+				002170BA1E970056008204EA /* c_org_ortc_RTCIdentityAssertion.h in Headers */,
+				002170FC1E970056008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.h in Headers */,
+				002170621E970056008204EA /* c_org_ortc_MessageQueue.h in Headers */,
+				002170541E970056008204EA /* c_org_ortc_MediaStreamConstraints.h in Headers */,
+				002170D21E970056008204EA /* c_org_ortc_RTCRtpCodecCapability.h in Headers */,
+				0021711C1E970056008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.h in Headers */,
+				002170A21E970056008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.h in Headers */,
+				002170D01E970056008204EA /* c_org_ortc_RTCRtpCapabilities.h in Headers */,
+				002170AC1E970056008204EA /* c_org_ortc_RTCIceServer.h in Headers */,
+				0021711A1E970056008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.h in Headers */,
+				002170601E970056008204EA /* c_org_ortc_MediaTrackSupportedConstraints.h in Headers */,
+				002170501E970056008204EA /* c_org_ortc_MediaDevices.h in Headers */,
+				0021705E1E970056008204EA /* c_org_ortc_MediaTrackSettings.h in Headers */,
+				002170161E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.h in Headers */,
+				002170EA1E970056008204EA /* c_org_ortc_RTCRtpHeaderExtension.h in Headers */,
+				002170281E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h in Headers */,
+				0021709C1E970056008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.h in Headers */,
+				002170C81E970056008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.h in Headers */,
+				002170801E970056008204EA /* c_org_ortc_RTCDtlsParameters.h in Headers */,
+				002170C61E970056008204EA /* c_org_ortc_RTCMessageEvent.h in Headers */,
+				002170941E970056008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.h in Headers */,
+				0021711E1E970056008204EA /* c_org_ortc_RTCSrtpSdesParameters.h in Headers */,
+				002170221E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h in Headers */,
+				0021703C1E970056008204EA /* c_org_ortc_ConstrainString.h in Headers */,
+				002170A01E970056008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.h in Headers */,
+				002170CE1E970056008204EA /* c_org_ortc_RTCRtcpTransport.h in Headers */,
+				002170721E970056008204EA /* c_org_ortc_RTCDataChannelEvent.h in Headers */,
+				002170AE1E970056008204EA /* c_org_ortc_RTCIceTransport.h in Headers */,
+				0021708A1E970056008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.h in Headers */,
+				002170C41E970056008204EA /* c_org_ortc_RTCMediaStreamTrackStats.h in Headers */,
+				0021706A1E970056008204EA /* c_org_ortc_RTCCertificate.h in Headers */,
+				002170A61E970056008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.h in Headers */,
+				002170361E970056008204EA /* c_org_ortc_ConstrainDoubleRange.h in Headers */,
+				0021702A1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.h in Headers */,
+				002170B41E970056008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.h in Headers */,
+				002170D61E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.h in Headers */,
+				002170B81E970056008204EA /* c_org_ortc_RTCIdentity.h in Headers */,
+				0021707E1E970056008204EA /* c_org_ortc_RTCDtlsFingerprint.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		00216EB91E970020008204EA /* ortclib-c-osx */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 00216EBE1E970020008204EA /* Build configuration list for PBXNativeTarget "ortclib-c-osx" */;
+			buildPhases = (
+				00216EB61E970020008204EA /* Sources */,
+				00216EB71E970020008204EA /* Frameworks */,
+				00216EB81E970020008204EA /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "ortclib-c-osx";
+			productName = "ortclib-c-osx";
+			productReference = 00216EBA1E970020008204EA /* libortclib-c-osx.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		00216EB21E970020008204EA /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0830;
+				ORGANIZATIONNAME = "Open Peer Foundation";
+				TargetAttributes = {
+					00216EB91E970020008204EA = {
+						CreatedOnToolsVersion = 8.3;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 00216EB51E970020008204EA /* Build configuration list for PBXProject "ortclib-c-osx" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 00216EB11E970020008204EA;
+			productRefGroup = 00216EBB1E970020008204EA /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				00216EB91E970020008204EA /* ortclib-c-osx */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		00216EB61E970020008204EA /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				002170791E970056008204EA /* c_org_ortc_RTCDataTransport.cpp in Sources */,
+				002170671E970056008204EA /* c_org_ortc_OverconstrainedErrorEvent.cpp in Sources */,
+				002170391E970056008204EA /* c_org_ortc_ConstrainLongRange.cpp in Sources */,
+				0021712B1E970056008204EA /* c_org_ortc_RTCStatsReport.cpp in Sources */,
+				0021707B1E970056008204EA /* c_org_ortc_RTCDtlsCertificateBinary.cpp in Sources */,
+				002170AD1E970056008204EA /* c_org_ortc_RTCIceTransport.cpp in Sources */,
+				002170171E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp in Sources */,
+				0021705F1E970056008204EA /* c_org_ortc_MediaTrackSupportedConstraints.cpp in Sources */,
+				002170571E970056008204EA /* c_org_ortc_MediaTrackCapabilities.cpp in Sources */,
+				002170D11E970056008204EA /* c_org_ortc_RTCRtpCodecCapability.cpp in Sources */,
+				002170AF1E970056008204EA /* c_org_ortc_RTCIceTransportController.cpp in Sources */,
+				002170851E970056008204EA /* c_org_ortc_RTCDtlsTransportStats.cpp in Sources */,
+				0021708F1E970056008204EA /* c_org_ortc_RTCIceCandidateComplete.cpp in Sources */,
+				002170E71E970056008204EA /* c_org_ortc_RTCRtpH264CodecParameterSettings.cpp in Sources */,
+				002170751E970056008204EA /* c_org_ortc_RTCDataChannelStateChangeEvent.cpp in Sources */,
+				002171311E970056008204EA /* c_org_ortc_StringOrStringList.cpp in Sources */,
+				0021708D1E970056008204EA /* c_org_ortc_RTCIceCandidateAttributes.cpp in Sources */,
+				002170C51E970056008204EA /* c_org_ortc_RTCMessageEvent.cpp in Sources */,
+				002170231E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp in Sources */,
+				002171051E970056008204EA /* c_org_ortc_RTCRtpTransport.cpp in Sources */,
+				002170EF1E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp in Sources */,
+				002170831E970056008204EA /* c_org_ortc_RTCDtlsTransportStateChangeEvent.cpp in Sources */,
+				002170BF1E970056008204EA /* c_org_ortc_RTCInboundRtpStreamStats.cpp in Sources */,
+				00216FFF1E970056008204EA /* c_org_ortc_adapter_RTCAnswerOptions.cpp in Sources */,
+				0021702D1E970056008204EA /* c_org_ortc_adapter_RTCTrackEvent.cpp in Sources */,
+				0021704F1E970056008204EA /* c_org_ortc_MediaDevices.cpp in Sources */,
+				0021710D1E970056008204EA /* c_org_ortc_RTCSctpCapabilities.cpp in Sources */,
+				00216FFB1E970056008204EA /* c_helpers.cpp in Sources */,
+				002170631E970056008204EA /* c_org_ortc_OrtcLib.cpp in Sources */,
+				002170431E970056008204EA /* c_org_ortc_ErrorEvent.cpp in Sources */,
+				0021711D1E970056008204EA /* c_org_ortc_RTCSrtpSdesParameters.cpp in Sources */,
+				0021710F1E970056008204EA /* c_org_ortc_RTCSctpTransport.cpp in Sources */,
+				0021705B1E970056008204EA /* c_org_ortc_MediaTrackConstraintSet.cpp in Sources */,
+				002171271E970056008204EA /* c_org_ortc_RTCStats.cpp in Sources */,
+				002170351E970056008204EA /* c_org_ortc_ConstrainDoubleRange.cpp in Sources */,
+				002170FD1E970056008204EA /* c_org_ortc_RTCRtpRtxCodecParameterSettings.cpp in Sources */,
+				002170ED1E970056008204EA /* c_org_ortc_RTCRtpListener.cpp in Sources */,
+				002170551E970056008204EA /* c_org_ortc_MediaStreamTrack.cpp in Sources */,
+				002170411E970056008204EA /* c_org_ortc_Error.cpp in Sources */,
+				002170DB1E970056008204EA /* c_org_ortc_RTCRtpContributingSource.cpp in Sources */,
+				002170531E970056008204EA /* c_org_ortc_MediaStreamConstraints.cpp in Sources */,
+				002171231E970056008204EA /* c_org_ortc_RTCSrtpTransportStats.cpp in Sources */,
+				0021705D1E970056008204EA /* c_org_ortc_MediaTrackSettings.cpp in Sources */,
+				002170051E970056008204EA /* c_org_ortc_adapter_RTCIceCandidate.cpp in Sources */,
+				002170CB1E970056008204EA /* c_org_ortc_RTCRtcpParameters.cpp in Sources */,
+				0021710B1E970056008204EA /* c_org_ortc_RTCRtpVp8CodecParameterSettings.cpp in Sources */,
+				0021704B1E970056008204EA /* c_org_ortc_MediaControl.cpp in Sources */,
+				002171211E970056008204EA /* c_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp in Sources */,
+				002170211E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp in Sources */,
+				0021700F1E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp in Sources */,
+				002170A51E970056008204EA /* c_org_ortc_RTCIceGatherInterfacePolicy.cpp in Sources */,
+				002170D51E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityParameters.cpp in Sources */,
+				002170F91E970056008204EA /* c_org_ortc_RTCRtpRedCodecParameterSettings.cpp in Sources */,
+				002170FF1E970056008204EA /* c_org_ortc_RTCRtpRtxParameters.cpp in Sources */,
+				002170771E970056008204EA /* c_org_ortc_RTCDataChannelStats.cpp in Sources */,
+				0021708B1E970056008204EA /* c_org_ortc_RTCIceCandidate.cpp in Sources */,
+				002170331E970056008204EA /* c_org_ortc_ConstrainDouble.cpp in Sources */,
+				002170E31E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp in Sources */,
+				002170591E970056008204EA /* c_org_ortc_MediaTrackConstraints.cpp in Sources */,
+				002170C91E970056008204EA /* c_org_ortc_RTCRtcpFeedback.cpp in Sources */,
+				0021701F1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp in Sources */,
+				002170A71E970056008204EA /* c_org_ortc_RTCIceGatherOptions.cpp in Sources */,
+				002171011E970056008204EA /* c_org_ortc_RTCRtpSender.cpp in Sources */,
+				0021702F1E970056008204EA /* c_org_ortc_ConstrainBoolean.cpp in Sources */,
+				002170031E970056008204EA /* c_org_ortc_adapter_RTCConfiguration.cpp in Sources */,
+				0021703F1E970056008204EA /* c_org_ortc_DoubleRange.cpp in Sources */,
+				002170BB1E970056008204EA /* c_org_ortc_RTCIdentityError.cpp in Sources */,
+				002170111E970056008204EA /* c_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp in Sources */,
+				002170E11E970056008204EA /* c_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp in Sources */,
+				002170811E970056008204EA /* c_org_ortc_RTCDtlsTransport.cpp in Sources */,
+				002170C31E970056008204EA /* c_org_ortc_RTCMediaStreamTrackStats.cpp in Sources */,
+				002170711E970056008204EA /* c_org_ortc_RTCDataChannelEvent.cpp in Sources */,
+				0021711F1E970056008204EA /* c_org_ortc_RTCSrtpSdesTransport.cpp in Sources */,
+				0021707D1E970056008204EA /* c_org_ortc_RTCDtlsFingerprint.cpp in Sources */,
+				0021701D1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp in Sources */,
+				0021706B1E970056008204EA /* c_org_ortc_RTCCertificateStats.cpp in Sources */,
+				002170091E970056008204EA /* c_org_ortc_adapter_RTCOfferAnswerOptions.cpp in Sources */,
+				002170971E970056008204EA /* c_org_ortc_RTCIceGatherer.cpp in Sources */,
+				0021709D1E970056008204EA /* c_org_ortc_RTCIceGathererCandidateEvent.cpp in Sources */,
+				002170451E970056008204EA /* c_org_ortc_Json.cpp in Sources */,
+				0021712D1E970056008204EA /* c_org_ortc_RTCStatsTypeSet.cpp in Sources */,
+				002170F11E970056008204EA /* c_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp in Sources */,
+				002170291E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransport.cpp in Sources */,
+				002170911E970056008204EA /* c_org_ortc_RTCIceCandidatePair.cpp in Sources */,
+				002170E51E970056008204EA /* c_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp in Sources */,
+				002170CF1E970056008204EA /* c_org_ortc_RTCRtpCapabilities.cpp in Sources */,
+				002170BD1E970056008204EA /* c_org_ortc_RTCIdentityResult.cpp in Sources */,
+				002170491E970056008204EA /* c_org_ortc_LongRange.cpp in Sources */,
+				002171071E970056008204EA /* c_org_ortc_RTCRtpUnhandledEvent.cpp in Sources */,
+				002170B51E970056008204EA /* c_org_ortc_RTCIceTransportStats.cpp in Sources */,
+				002170B91E970056008204EA /* c_org_ortc_RTCIdentityAssertion.cpp in Sources */,
+				002170CD1E970056008204EA /* c_org_ortc_RTCRtcpTransport.cpp in Sources */,
+				002171251E970056008204EA /* c_org_ortc_RTCSsrcConflictEvent.cpp in Sources */,
+				002170DD1E970056008204EA /* c_org_ortc_RTCRtpEncodingParameters.cpp in Sources */,
+				0021709B1E970056008204EA /* c_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp in Sources */,
+				002170EB1E970056008204EA /* c_org_ortc_RTCRtpHeaderExtensionParameters.cpp in Sources */,
+				002170311E970056008204EA /* c_org_ortc_ConstrainBooleanParameters.cpp in Sources */,
+				002170871E970056008204EA /* c_org_ortc_RTCDtmfSender.cpp in Sources */,
+				00216FFD1E970056008204EA /* c_org_ortc_adapter_MediaStream.cpp in Sources */,
+				002170C11E970056008204EA /* c_org_ortc_RTCMediaStreamStats.cpp in Sources */,
+				0021700D1E970056008204EA /* c_org_ortc_adapter_RTCPeerConnection.cpp in Sources */,
+				002170931E970056008204EA /* c_org_ortc_RTCIceCandidatePairChangeEvent.cpp in Sources */,
+				002170891E970056008204EA /* c_org_ortc_RTCDtmfToneChangeEvent.cpp in Sources */,
+				002170B31E970056008204EA /* c_org_ortc_RTCIceTransportStateChangeEvent.cpp in Sources */,
+				002170F31E970056008204EA /* c_org_ortc_RTCRtpOpusCodecParameterSettings.cpp in Sources */,
+				002170D31E970056008204EA /* c_org_ortc_RTCRtpCodecCapabilityOptions.cpp in Sources */,
+				002171191E970056008204EA /* c_org_ortc_RTCSrtpSdesCryptoParameters.cpp in Sources */,
+				002170271E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp in Sources */,
+				002170131E970056008204EA /* c_org_ortc_adapter_RTCSessionDescription.cpp in Sources */,
+				002170951E970056008204EA /* c_org_ortc_RTCIceCandidatePairStats.cpp in Sources */,
+				002170F71E970056008204EA /* c_org_ortc_RTCRtpReceiver.cpp in Sources */,
+				002170151E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp in Sources */,
+				002170471E970056008204EA /* c_org_ortc_Logger.cpp in Sources */,
+				002171151E970056008204EA /* c_org_ortc_RTCSctpTransportStateChangeEvent.cpp in Sources */,
+				0021711B1E970056008204EA /* c_org_ortc_RTCSrtpSdesKeyParameters.cpp in Sources */,
+				0021700B1E970056008204EA /* c_org_ortc_adapter_RTCOfferOptions.cpp in Sources */,
+				002170AB1E970056008204EA /* c_org_ortc_RTCIceServer.cpp in Sources */,
+				002170F51E970056008204EA /* c_org_ortc_RTCRtpParameters.cpp in Sources */,
+				002170E91E970056008204EA /* c_org_ortc_RTCRtpHeaderExtension.cpp in Sources */,
+				0021703D1E970056008204EA /* c_org_ortc_ConstrainStringParameters.cpp in Sources */,
+				002170651E970056008204EA /* c_org_ortc_OverconstrainedError.cpp in Sources */,
+				0021701B1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp in Sources */,
+				002170991E970056008204EA /* c_org_ortc_RTCIceGathererCandidate.cpp in Sources */,
+				0021702B1E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp in Sources */,
+				002170B11E970056008204EA /* c_org_ortc_RTCIceTransportOptions.cpp in Sources */,
+				002170A91E970056008204EA /* c_org_ortc_RTCIceParameters.cpp in Sources */,
+				0021709F1E970056008204EA /* c_org_ortc_RTCIceGathererIceErrorEvent.cpp in Sources */,
+				0021706D1E970056008204EA /* c_org_ortc_RTCCodec.cpp in Sources */,
+				002170A31E970056008204EA /* c_org_ortc_RTCIceGathererStats.cpp in Sources */,
+				002170511E970056008204EA /* c_org_ortc_MediaSource.cpp in Sources */,
+				002170731E970056008204EA /* c_org_ortc_RTCDataChannelParameters.cpp in Sources */,
+				0021703B1E970056008204EA /* c_org_ortc_ConstrainString.cpp in Sources */,
+				002170191E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionDescription.cpp in Sources */,
+				002171031E970056008204EA /* c_org_ortc_RTCRtpStreamStats.cpp in Sources */,
+				002171291E970056008204EA /* c_org_ortc_RTCStatsProvider.cpp in Sources */,
+				002171111E970056008204EA /* c_org_ortc_RTCSctpTransportListener.cpp in Sources */,
+				002170251E970056008204EA /* c_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp in Sources */,
+				002171171E970056008204EA /* c_org_ortc_RTCSctpTransportStats.cpp in Sources */,
+				002170A11E970056008204EA /* c_org_ortc_RTCIceGathererStateChangeEvent.cpp in Sources */,
+				0021706F1E970056008204EA /* c_org_ortc_RTCDataChannel.cpp in Sources */,
+				0021707F1E970056008204EA /* c_org_ortc_RTCDtlsParameters.cpp in Sources */,
+				002171091E970056008204EA /* c_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp in Sources */,
+				002170B71E970056008204EA /* c_org_ortc_RTCIdentity.cpp in Sources */,
+				002170691E970056008204EA /* c_org_ortc_RTCCertificate.cpp in Sources */,
+				002170D71E970056008204EA /* c_org_ortc_RTCRtpCodecParameters.cpp in Sources */,
+				002170371E970056008204EA /* c_org_ortc_ConstrainLong.cpp in Sources */,
+				0021704D1E970056008204EA /* c_org_ortc_MediaDeviceInfo.cpp in Sources */,
+				0021712F1E970056008204EA /* c_org_ortc_Settings.cpp in Sources */,
+				002170D91E970056008204EA /* c_org_ortc_RTCRtpCodecParameterSettings.cpp in Sources */,
+				002170C71E970056008204EA /* c_org_ortc_RTCOutboundRtpStreamStats.cpp in Sources */,
+				002170071E970056008204EA /* c_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp in Sources */,
+				002170DF1E970056008204EA /* c_org_ortc_RTCRtpFecParameters.cpp in Sources */,
+				002170611E970056008204EA /* c_org_ortc_MessageQueue.cpp in Sources */,
+				002171131E970056008204EA /* c_org_ortc_RTCSctpTransportListenerEvent.cpp in Sources */,
+				002170FB1E970056008204EA /* c_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp in Sources */,
+				002170011E970056008204EA /* c_org_ortc_adapter_RTCCapabilityOptions.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		00216EBC1E970020008204EA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../../../zsLib,
+					"../../../../zsLib-eventing",
+					../../../..,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		00216EBD1E970020008204EA /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../../../zsLib,
+					"../../../../zsLib-eventing",
+					../../../..,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		00216EBF1E970020008204EA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		00216EC01E970020008204EA /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		00216EB51E970020008204EA /* Build configuration list for PBXProject "ortclib-c-osx" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				00216EBC1E970020008204EA /* Debug */,
+				00216EBD1E970020008204EA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		00216EBE1E970020008204EA /* Build configuration list for PBXNativeTarget "ortclib-c-osx" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				00216EBF1E970020008204EA /* Debug */,
+				00216EC01E970020008204EA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 00216EB21E970020008204EA /* Project object */;
+}
diff --git a/projects/xcode/ortclib-ios/ortclib-ios.xcodeproj/project.pbxproj b/projects/xcode/ortclib-ios/ortclib-ios.xcodeproj/project.pbxproj
index 49bc2311..16a02134 100644
--- a/projects/xcode/ortclib-ios/ortclib-ios.xcodeproj/project.pbxproj
+++ b/projects/xcode/ortclib-ios/ortclib-ios.xcodeproj/project.pbxproj
@@ -55,7 +55,7 @@
 		009D16611DE5210300D139FF /* ortc_SCTPTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D15C11DE5210200D139FF /* ortc_SCTPTransport.cpp */; };
 		009D16621DE5210300D139FF /* ortc_SCTPTransportListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D15C21DE5210200D139FF /* ortc_SCTPTransportListener.cpp */; };
 		009D16641DE5210300D139FF /* ortc_SRTPSDESTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D15C41DE5210200D139FF /* ortc_SRTPSDESTransport.cpp */; };
-		009D16651DE5210300D139FF /* ortc_SRTPTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D15C51DE5210200D139FF /* ortc_SRTPTransport.cpp */; };
+		009D16651DE5210300D139FF /* ortc_SRTPTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D15C51DE5210200D139FF /* ortc_SRTPTransport.cpp */; settings = {COMPILER_FLAGS = "-Wno-documentation"; }; };
 		009D16661DE5210300D139FF /* ortc_StatsReport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D15C61DE5210200D139FF /* ortc_StatsReport.cpp */; };
 		009D16671DE5210300D139FF /* ortc_webrtc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D15C71DE5210200D139FF /* ortc_webrtc.cpp */; };
 /* End PBXBuildFile section */
@@ -219,6 +219,7 @@
 		009D16151DE5210200D139FF /* IStatsReport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IStatsReport.h; sourceTree = "<group>"; };
 		009D16161DE5210200D139FF /* ortc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ortc.h; sourceTree = "<group>"; };
 		009D16331DE5210300D139FF /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
+		5206B1B01E5CDB3600029C2C /* ortcEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ortcEvents.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -387,6 +388,7 @@
 		009D15D81DE5210200D139FF /* internal */ = {
 			isa = PBXGroup;
 			children = (
+				5206B1B01E5CDB3600029C2C /* ortcEvents.h */,
 				009D15D91DE5210200D139FF /* ifaddrs-android.h */,
 				009D15DA1DE5210200D139FF /* ortc.events.h */,
 				009D15DB1DE5210200D139FF /* ortc.events.jman */,
@@ -583,14 +585,17 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -642,13 +647,16 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"NDEBUG=1",
 					"$(inherited)",
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -676,18 +684,60 @@
 		0064F80D1DE51EB900EE8962 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE,
+					WEBRTC_BUILD_LIBEVENT,
+					WEBRTC_POSIX,
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../..,
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					../../../../../../webrtc/xplatform/boringssl/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/crypto/include,
+					../../../../../../webrtc/xplatform/libsrtp/config,
+					../../../../../../webrtc/xplatform/webrtc,
+					"$(inherited)",
+					../../../../../../webrtc/xplatform/usrsctp/usrsctplib,
+				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				VALID_ARCHS = "arm64 armv7 armv7s";
 			};
 			name = Debug;
 		};
 		0064F80E1DE51EB900EE8962 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE,
+					WEBRTC_BUILD_LIBEVENT,
+					WEBRTC_POSIX,
+					"NDEBUG=1",
+					"$(inherited)",
+				);
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../..,
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					../../../../../../webrtc/xplatform/boringssl/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/crypto/include,
+					../../../../../../webrtc/xplatform/libsrtp/config,
+					../../../../../../webrtc/xplatform/webrtc,
+					"$(inherited)",
+					../../../../../../webrtc/xplatform/usrsctp/usrsctplib,
+				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				VALID_ARCHS = "arm64 armv7 armv7s";
 			};
 			name = Release;
 		};
diff --git a/projects/xcode/ortclib-osx/ortclib-osx.xcodeproj/project.pbxproj b/projects/xcode/ortclib-osx/ortclib-osx.xcodeproj/project.pbxproj
index 146f2c28..fc3e0b8c 100644
--- a/projects/xcode/ortclib-osx/ortclib-osx.xcodeproj/project.pbxproj
+++ b/projects/xcode/ortclib-osx/ortclib-osx.xcodeproj/project.pbxproj
@@ -55,7 +55,7 @@
 		009D180D1DE5285800D139FF /* ortc_SCTPTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D17601DE5285700D139FF /* ortc_SCTPTransport.cpp */; };
 		009D180E1DE5285800D139FF /* ortc_SCTPTransportListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D17611DE5285700D139FF /* ortc_SCTPTransportListener.cpp */; };
 		009D18101DE5285800D139FF /* ortc_SRTPSDESTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D17631DE5285700D139FF /* ortc_SRTPSDESTransport.cpp */; };
-		009D18111DE5285800D139FF /* ortc_SRTPTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D17641DE5285700D139FF /* ortc_SRTPTransport.cpp */; };
+		009D18111DE5285800D139FF /* ortc_SRTPTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D17641DE5285700D139FF /* ortc_SRTPTransport.cpp */; settings = {COMPILER_FLAGS = "-Wno-documentation"; }; };
 		009D18121DE5285800D139FF /* ortc_StatsReport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D17651DE5285700D139FF /* ortc_StatsReport.cpp */; };
 		009D18131DE5285800D139FF /* ortc_webrtc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D17661DE5285700D139FF /* ortc_webrtc.cpp */; };
 /* End PBXBuildFile section */
@@ -577,14 +577,17 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -636,9 +639,12 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -666,6 +672,26 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE,
+					WEBRTC_BUILD_LIBEVENT,
+					WEBRTC_POSIX,
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../..,
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					../../../../../../webrtc/xplatform/boringssl/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/crypto/include,
+					../../../../../../webrtc/xplatform/libsrtp/config,
+					../../../../../../webrtc/xplatform/webrtc,
+					"$(inherited)",
+					../../../../../../webrtc/xplatform/usrsctp/usrsctplib,
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -674,6 +700,24 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE,
+					WEBRTC_BUILD_LIBEVENT,
+					WEBRTC_POSIX,
+				);
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../..,
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					../../../../../../webrtc/xplatform/boringssl/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/crypto/include,
+					../../../../../../webrtc/xplatform/libsrtp/config,
+					../../../../../../webrtc/xplatform/webrtc,
+					"$(inherited)",
+					../../../../../../webrtc/xplatform/usrsctp/usrsctplib,
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/projects/xcode/ortclib-wrapper-ios/ortclib-wrapper-ios.xcodeproj/project.pbxproj b/projects/xcode/ortclib-wrapper-ios/ortclib-wrapper-ios.xcodeproj/project.pbxproj
new file mode 100644
index 00000000..1c3aaaa3
--- /dev/null
+++ b/projects/xcode/ortclib-wrapper-ios/ortclib-wrapper-ios.xcodeproj/project.pbxproj
@@ -0,0 +1,1229 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		002177701E9701C6008204EA /* impl_org_ortc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002174FA1E9701C3008204EA /* impl_org_ortc.cpp */; };
+		002177711E9701C6008204EA /* impl_org_ortc_adapter_MediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002174FB1E9701C3008204EA /* impl_org_ortc_adapter_MediaStream.cpp */; };
+		002177721E9701C6008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002174FD1E9701C3008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.cpp */; };
+		002177731E9701C6008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002174FF1E9701C3008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.cpp */; };
+		002177741E9701C6008204EA /* impl_org_ortc_adapter_RTCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175011E9701C3008204EA /* impl_org_ortc_adapter_RTCConfiguration.cpp */; };
+		002177751E9701C6008204EA /* impl_org_ortc_adapter_RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175031E9701C3008204EA /* impl_org_ortc_adapter_RTCIceCandidate.cpp */; };
+		002177761E9701C6008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175051E9701C3008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */; };
+		002177771E9701C6008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175071E9701C3008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp */; };
+		002177781E9701C6008204EA /* impl_org_ortc_adapter_RTCOfferOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175091E9701C3008204EA /* impl_org_ortc_adapter_RTCOfferOptions.cpp */; };
+		002177791E9701C6008204EA /* impl_org_ortc_adapter_RTCPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021750B1E9701C3008204EA /* impl_org_ortc_adapter_RTCPeerConnection.cpp */; };
+		0021777A1E9701C6008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021750D1E9701C3008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */; };
+		0021777B1E9701C6008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021750F1E9701C4008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */; };
+		0021777C1E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175111E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescription.cpp */; };
+		0021777D1E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175131E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */; };
+		0021777E1E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175151E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */; };
+		0021777F1E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175171E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */; };
+		002177801E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175191E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */; };
+		002177811E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021751B1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */; };
+		002177821E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021751D1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */; };
+		002177831E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021751F1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */; };
+		002177841E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175211E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */; };
+		002177851E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175231E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */; };
+		002177861E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175251E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */; };
+		002177871E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175271E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */; };
+		002177881E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175291E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */; };
+		002177891E9701C6008204EA /* impl_org_ortc_adapter_RTCTrackEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021752B1E9701C4008204EA /* impl_org_ortc_adapter_RTCTrackEvent.cpp */; };
+		0021778A1E9701C6008204EA /* impl_org_ortc_ConstrainBoolean.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021752D1E9701C4008204EA /* impl_org_ortc_ConstrainBoolean.cpp */; };
+		0021778B1E9701C6008204EA /* impl_org_ortc_ConstrainBooleanParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021752F1E9701C4008204EA /* impl_org_ortc_ConstrainBooleanParameters.cpp */; };
+		0021778C1E9701C6008204EA /* impl_org_ortc_ConstrainDouble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175311E9701C4008204EA /* impl_org_ortc_ConstrainDouble.cpp */; };
+		0021778D1E9701C6008204EA /* impl_org_ortc_ConstrainDoubleRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175331E9701C4008204EA /* impl_org_ortc_ConstrainDoubleRange.cpp */; };
+		0021778E1E9701C6008204EA /* impl_org_ortc_ConstrainLong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175351E9701C4008204EA /* impl_org_ortc_ConstrainLong.cpp */; };
+		0021778F1E9701C6008204EA /* impl_org_ortc_ConstrainLongRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175371E9701C4008204EA /* impl_org_ortc_ConstrainLongRange.cpp */; };
+		002177901E9701C6008204EA /* impl_org_ortc_ConstrainString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175391E9701C4008204EA /* impl_org_ortc_ConstrainString.cpp */; };
+		002177911E9701C6008204EA /* impl_org_ortc_ConstrainStringParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021753B1E9701C4008204EA /* impl_org_ortc_ConstrainStringParameters.cpp */; };
+		002177931E9701C6008204EA /* impl_org_ortc_DoubleRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021753F1E9701C4008204EA /* impl_org_ortc_DoubleRange.cpp */; };
+		002177941E9701C6008204EA /* impl_org_ortc_Error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175411E9701C4008204EA /* impl_org_ortc_Error.cpp */; };
+		002177951E9701C6008204EA /* impl_org_ortc_ErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175431E9701C4008204EA /* impl_org_ortc_ErrorEvent.cpp */; };
+		002177961E9701C6008204EA /* impl_org_ortc_Helper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175451E9701C4008204EA /* impl_org_ortc_Helper.cpp */; };
+		002177971E9701C6008204EA /* impl_org_ortc_Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175471E9701C4008204EA /* impl_org_ortc_Json.cpp */; };
+		002177981E9701C6008204EA /* impl_org_ortc_Logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175491E9701C4008204EA /* impl_org_ortc_Logger.cpp */; };
+		002177991E9701C6008204EA /* impl_org_ortc_LongRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021754B1E9701C4008204EA /* impl_org_ortc_LongRange.cpp */; };
+		0021779A1E9701C6008204EA /* impl_org_ortc_MediaControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021754D1E9701C4008204EA /* impl_org_ortc_MediaControl.cpp */; };
+		0021779B1E9701C6008204EA /* impl_org_ortc_MediaDeviceInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021754F1E9701C4008204EA /* impl_org_ortc_MediaDeviceInfo.cpp */; };
+		0021779C1E9701C6008204EA /* impl_org_ortc_MediaDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175511E9701C4008204EA /* impl_org_ortc_MediaDevices.cpp */; };
+		0021779D1E9701C6008204EA /* impl_org_ortc_MediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175531E9701C4008204EA /* impl_org_ortc_MediaSource.cpp */; };
+		0021779E1E9701C6008204EA /* impl_org_ortc_MediaStreamConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175551E9701C4008204EA /* impl_org_ortc_MediaStreamConstraints.cpp */; };
+		0021779F1E9701C6008204EA /* impl_org_ortc_MediaStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175571E9701C4008204EA /* impl_org_ortc_MediaStreamTrack.cpp */; };
+		002177A01E9701C6008204EA /* impl_org_ortc_MediaTrackCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175591E9701C4008204EA /* impl_org_ortc_MediaTrackCapabilities.cpp */; };
+		002177A11E9701C6008204EA /* impl_org_ortc_MediaTrackConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021755B1E9701C4008204EA /* impl_org_ortc_MediaTrackConstraints.cpp */; };
+		002177A21E9701C6008204EA /* impl_org_ortc_MediaTrackConstraintSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021755D1E9701C4008204EA /* impl_org_ortc_MediaTrackConstraintSet.cpp */; };
+		002177A31E9701C6008204EA /* impl_org_ortc_MediaTrackSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021755F1E9701C4008204EA /* impl_org_ortc_MediaTrackSettings.cpp */; };
+		002177A41E9701C6008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175611E9701C4008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.cpp */; };
+		002177A51E9701C6008204EA /* impl_org_ortc_MessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175631E9701C4008204EA /* impl_org_ortc_MessageQueue.cpp */; };
+		002177A61E9701C6008204EA /* impl_org_ortc_OrtcLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175651E9701C4008204EA /* impl_org_ortc_OrtcLib.cpp */; };
+		002177A81E9701C6008204EA /* impl_org_ortc_OverconstrainedError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175691E9701C4008204EA /* impl_org_ortc_OverconstrainedError.cpp */; };
+		002177A91E9701C6008204EA /* impl_org_ortc_OverconstrainedErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021756B1E9701C4008204EA /* impl_org_ortc_OverconstrainedErrorEvent.cpp */; };
+		002177AA1E9701C6008204EA /* impl_org_ortc_RTCCertificate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021756D1E9701C4008204EA /* impl_org_ortc_RTCCertificate.cpp */; };
+		002177AB1E9701C6008204EA /* impl_org_ortc_RTCCertificateStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021756F1E9701C4008204EA /* impl_org_ortc_RTCCertificateStats.cpp */; };
+		002177AC1E9701C6008204EA /* impl_org_ortc_RTCCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175711E9701C4008204EA /* impl_org_ortc_RTCCodec.cpp */; };
+		002177AD1E9701C6008204EA /* impl_org_ortc_RTCDataChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175731E9701C4008204EA /* impl_org_ortc_RTCDataChannel.cpp */; };
+		002177AE1E9701C6008204EA /* impl_org_ortc_RTCDataChannelEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175751E9701C4008204EA /* impl_org_ortc_RTCDataChannelEvent.cpp */; };
+		002177AF1E9701C6008204EA /* impl_org_ortc_RTCDataChannelParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175771E9701C4008204EA /* impl_org_ortc_RTCDataChannelParameters.cpp */; };
+		002177B01E9701C6008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175791E9701C4008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.cpp */; };
+		002177B11E9701C6008204EA /* impl_org_ortc_RTCDataChannelStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021757B1E9701C4008204EA /* impl_org_ortc_RTCDataChannelStats.cpp */; };
+		002177B21E9701C6008204EA /* impl_org_ortc_RTCDataTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021757D1E9701C4008204EA /* impl_org_ortc_RTCDataTransport.cpp */; };
+		002177B31E9701C6008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021757F1E9701C4008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.cpp */; };
+		002177B41E9701C6008204EA /* impl_org_ortc_RTCDtlsFingerprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175811E9701C4008204EA /* impl_org_ortc_RTCDtlsFingerprint.cpp */; };
+		002177B51E9701C6008204EA /* impl_org_ortc_RTCDtlsParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175831E9701C4008204EA /* impl_org_ortc_RTCDtlsParameters.cpp */; };
+		002177B61E9701C6008204EA /* impl_org_ortc_RTCDtlsTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175851E9701C4008204EA /* impl_org_ortc_RTCDtlsTransport.cpp */; };
+		002177B71E9701C6008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175871E9701C4008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */; };
+		002177B81E9701C6008204EA /* impl_org_ortc_RTCDtlsTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175891E9701C4008204EA /* impl_org_ortc_RTCDtlsTransportStats.cpp */; };
+		002177B91E9701C6008204EA /* impl_org_ortc_RTCDtmfSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021758B1E9701C4008204EA /* impl_org_ortc_RTCDtmfSender.cpp */; };
+		002177BA1E9701C6008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021758D1E9701C4008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.cpp */; };
+		002177BB1E9701C6008204EA /* impl_org_ortc_RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021758F1E9701C4008204EA /* impl_org_ortc_RTCIceCandidate.cpp */; };
+		002177BC1E9701C6008204EA /* impl_org_ortc_RTCIceCandidateAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175911E9701C4008204EA /* impl_org_ortc_RTCIceCandidateAttributes.cpp */; };
+		002177BD1E9701C6008204EA /* impl_org_ortc_RTCIceCandidateComplete.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175931E9701C5008204EA /* impl_org_ortc_RTCIceCandidateComplete.cpp */; };
+		002177BE1E9701C6008204EA /* impl_org_ortc_RTCIceCandidatePair.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175951E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePair.cpp */; };
+		002177BF1E9701C6008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175971E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp */; };
+		002177C01E9701C6008204EA /* impl_org_ortc_RTCIceCandidatePairStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175991E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePairStats.cpp */; };
+		002177C11E9701C6008204EA /* impl_org_ortc_RTCIceGatherer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021759B1E9701C5008204EA /* impl_org_ortc_RTCIceGatherer.cpp */; };
+		002177C21E9701C6008204EA /* impl_org_ortc_RTCIceGathererCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021759D1E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidate.cpp */; };
+		002177C31E9701C6008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021759F1E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */; };
+		002177C41E9701C6008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175A11E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.cpp */; };
+		002177C51E9701C6008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175A31E9701C5008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.cpp */; };
+		002177C61E9701C6008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175A51E9701C5008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.cpp */; };
+		002177C71E9701C6008204EA /* impl_org_ortc_RTCIceGathererStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175A71E9701C5008204EA /* impl_org_ortc_RTCIceGathererStats.cpp */; };
+		002177C81E9701C6008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175A91E9701C5008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.cpp */; };
+		002177C91E9701C6008204EA /* impl_org_ortc_RTCIceGatherOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175AB1E9701C5008204EA /* impl_org_ortc_RTCIceGatherOptions.cpp */; };
+		002177CA1E9701C6008204EA /* impl_org_ortc_RTCIceParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175AD1E9701C5008204EA /* impl_org_ortc_RTCIceParameters.cpp */; };
+		002177CB1E9701C6008204EA /* impl_org_ortc_RTCIceServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175AF1E9701C5008204EA /* impl_org_ortc_RTCIceServer.cpp */; };
+		002177CC1E9701C6008204EA /* impl_org_ortc_RTCIceTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175B11E9701C5008204EA /* impl_org_ortc_RTCIceTransport.cpp */; };
+		002177CD1E9701C6008204EA /* impl_org_ortc_RTCIceTransportController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175B31E9701C5008204EA /* impl_org_ortc_RTCIceTransportController.cpp */; };
+		002177CE1E9701C6008204EA /* impl_org_ortc_RTCIceTransportOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175B51E9701C5008204EA /* impl_org_ortc_RTCIceTransportOptions.cpp */; };
+		002177CF1E9701C6008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175B71E9701C5008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.cpp */; };
+		002177D01E9701C6008204EA /* impl_org_ortc_RTCIceTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175B91E9701C5008204EA /* impl_org_ortc_RTCIceTransportStats.cpp */; };
+		002177D11E9701C6008204EA /* impl_org_ortc_RTCIdentity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175BB1E9701C5008204EA /* impl_org_ortc_RTCIdentity.cpp */; };
+		002177D21E9701C6008204EA /* impl_org_ortc_RTCIdentityAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175BD1E9701C5008204EA /* impl_org_ortc_RTCIdentityAssertion.cpp */; };
+		002177D31E9701C6008204EA /* impl_org_ortc_RTCIdentityError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175BF1E9701C5008204EA /* impl_org_ortc_RTCIdentityError.cpp */; };
+		002177D41E9701C6008204EA /* impl_org_ortc_RTCIdentityResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175C11E9701C5008204EA /* impl_org_ortc_RTCIdentityResult.cpp */; };
+		002177D51E9701C6008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175C31E9701C5008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.cpp */; };
+		002177D61E9701C6008204EA /* impl_org_ortc_RTCMediaStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175C51E9701C5008204EA /* impl_org_ortc_RTCMediaStreamStats.cpp */; };
+		002177D71E9701C6008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175C71E9701C5008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.cpp */; };
+		002177D81E9701C6008204EA /* impl_org_ortc_RTCMessageEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175C91E9701C5008204EA /* impl_org_ortc_RTCMessageEvent.cpp */; };
+		002177D91E9701C6008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175CB1E9701C5008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.cpp */; };
+		002177DA1E9701C6008204EA /* impl_org_ortc_RTCRtcpFeedback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175CD1E9701C5008204EA /* impl_org_ortc_RTCRtcpFeedback.cpp */; };
+		002177DB1E9701C6008204EA /* impl_org_ortc_RTCRtcpParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175CF1E9701C5008204EA /* impl_org_ortc_RTCRtcpParameters.cpp */; };
+		002177DC1E9701C6008204EA /* impl_org_ortc_RTCRtcpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175D11E9701C5008204EA /* impl_org_ortc_RTCRtcpTransport.cpp */; };
+		002177DD1E9701C6008204EA /* impl_org_ortc_RTCRtpCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175D31E9701C5008204EA /* impl_org_ortc_RTCRtpCapabilities.cpp */; };
+		002177DE1E9701C6008204EA /* impl_org_ortc_RTCRtpCodecCapability.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175D51E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapability.cpp */; };
+		002177DF1E9701C6008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175D71E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp */; };
+		002177E01E9701C6008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175D91E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp */; };
+		002177E11E9701C6008204EA /* impl_org_ortc_RTCRtpCodecParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175DB1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecParameters.cpp */; };
+		002177E21E9701C7008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175DD1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.cpp */; };
+		002177E31E9701C7008204EA /* impl_org_ortc_RTCRtpContributingSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175DF1E9701C5008204EA /* impl_org_ortc_RTCRtpContributingSource.cpp */; };
+		002177E41E9701C7008204EA /* impl_org_ortc_RTCRtpEncodingParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175E11E9701C5008204EA /* impl_org_ortc_RTCRtpEncodingParameters.cpp */; };
+		002177E51E9701C7008204EA /* impl_org_ortc_RTCRtpFecParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175E31E9701C5008204EA /* impl_org_ortc_RTCRtpFecParameters.cpp */; };
+		002177E61E9701C7008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175E51E9701C5008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */; };
+		002177E71E9701C7008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175E71E9701C5008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */; };
+		002177E81E9701C7008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175E91E9701C5008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */; };
+		002177E91E9701C7008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175EB1E9701C5008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp */; };
+		002177EA1E9701C7008204EA /* impl_org_ortc_RTCRtpHeaderExtension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175ED1E9701C5008204EA /* impl_org_ortc_RTCRtpHeaderExtension.cpp */; };
+		002177EB1E9701C7008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175EF1E9701C5008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp */; };
+		002177EC1E9701C7008204EA /* impl_org_ortc_RTCRtpListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175F11E9701C5008204EA /* impl_org_ortc_RTCRtpListener.cpp */; };
+		002177ED1E9701C7008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175F31E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */; };
+		002177EE1E9701C7008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175F51E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */; };
+		002177EF1E9701C7008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175F71E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */; };
+		002177F01E9701C7008204EA /* impl_org_ortc_RTCRtpParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175F91E9701C5008204EA /* impl_org_ortc_RTCRtpParameters.cpp */; };
+		002177F11E9701C7008204EA /* impl_org_ortc_RTCRtpReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175FB1E9701C5008204EA /* impl_org_ortc_RTCRtpReceiver.cpp */; };
+		002177F21E9701C7008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175FD1E9701C5008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp */; };
+		002177F31E9701C7008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002175FF1E9701C5008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */; };
+		002177F41E9701C7008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176011E9701C5008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */; };
+		002177F51E9701C7008204EA /* impl_org_ortc_RTCRtpRtxParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176031E9701C5008204EA /* impl_org_ortc_RTCRtpRtxParameters.cpp */; };
+		002177F61E9701C7008204EA /* impl_org_ortc_RTCRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176051E9701C5008204EA /* impl_org_ortc_RTCRtpSender.cpp */; };
+		002177F71E9701C7008204EA /* impl_org_ortc_RTCRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176071E9701C5008204EA /* impl_org_ortc_RTCRtpStreamStats.cpp */; };
+		002177F81E9701C7008204EA /* impl_org_ortc_RTCRtpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176091E9701C6008204EA /* impl_org_ortc_RTCRtpTransport.cpp */; };
+		002177F91E9701C7008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021760B1E9701C6008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.cpp */; };
+		002177FA1E9701C7008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021760D1E9701C6008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */; };
+		002177FB1E9701C7008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021760F1E9701C6008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */; };
+		002177FC1E9701C7008204EA /* impl_org_ortc_RTCSctpCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176111E9701C6008204EA /* impl_org_ortc_RTCSctpCapabilities.cpp */; };
+		002177FD1E9701C7008204EA /* impl_org_ortc_RTCSctpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176131E9701C6008204EA /* impl_org_ortc_RTCSctpTransport.cpp */; };
+		002177FE1E9701C7008204EA /* impl_org_ortc_RTCSctpTransportListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176151E9701C6008204EA /* impl_org_ortc_RTCSctpTransportListener.cpp */; };
+		002177FF1E9701C7008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176171E9701C6008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.cpp */; };
+		002178001E9701C7008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176191E9701C6008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp */; };
+		002178011E9701C7008204EA /* impl_org_ortc_RTCSctpTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021761B1E9701C6008204EA /* impl_org_ortc_RTCSctpTransportStats.cpp */; };
+		002178021E9701C7008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021761D1E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp */; };
+		002178031E9701C7008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021761F1E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.cpp */; };
+		002178041E9701C7008204EA /* impl_org_ortc_RTCSrtpSdesParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176211E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesParameters.cpp */; };
+		002178051E9701C7008204EA /* impl_org_ortc_RTCSrtpSdesTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176231E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesTransport.cpp */; };
+		002178061E9701C7008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176251E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */; };
+		002178071E9701C7008204EA /* impl_org_ortc_RTCSrtpTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176271E9701C6008204EA /* impl_org_ortc_RTCSrtpTransportStats.cpp */; };
+		002178081E9701C7008204EA /* impl_org_ortc_RTCSsrcConflictEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176291E9701C6008204EA /* impl_org_ortc_RTCSsrcConflictEvent.cpp */; };
+		002178091E9701C7008204EA /* impl_org_ortc_RTCStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021762B1E9701C6008204EA /* impl_org_ortc_RTCStats.cpp */; };
+		0021780A1E9701C7008204EA /* impl_org_ortc_RTCStatsProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021762D1E9701C6008204EA /* impl_org_ortc_RTCStatsProvider.cpp */; };
+		0021780B1E9701C7008204EA /* impl_org_ortc_RTCStatsReport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0021762F1E9701C6008204EA /* impl_org_ortc_RTCStatsReport.cpp */; };
+		0021780C1E9701C7008204EA /* impl_org_ortc_RTCStatsTypeSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176311E9701C6008204EA /* impl_org_ortc_RTCStatsTypeSet.cpp */; };
+		0021780D1E9701C7008204EA /* impl_org_ortc_Settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176331E9701C6008204EA /* impl_org_ortc_Settings.cpp */; };
+		0021780E1E9701C7008204EA /* impl_org_ortc_StringOrStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002176351E9701C6008204EA /* impl_org_ortc_StringOrStringList.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		0021713B1E97017D008204EA /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		0021713D1E97017D008204EA /* libortclib-wrapper-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libortclib-wrapper-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		002174FA1E9701C3008204EA /* impl_org_ortc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc.cpp; sourceTree = "<group>"; };
+		002174FB1E9701C3008204EA /* impl_org_ortc_adapter_MediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_MediaStream.cpp; sourceTree = "<group>"; };
+		002174FC1E9701C3008204EA /* impl_org_ortc_adapter_MediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_MediaStream.h; sourceTree = "<group>"; };
+		002174FD1E9701C3008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCAnswerOptions.cpp; sourceTree = "<group>"; };
+		002174FE1E9701C3008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCAnswerOptions.h; sourceTree = "<group>"; };
+		002174FF1E9701C3008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCCapabilityOptions.cpp; sourceTree = "<group>"; };
+		002175001E9701C3008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCCapabilityOptions.h; sourceTree = "<group>"; };
+		002175011E9701C3008204EA /* impl_org_ortc_adapter_RTCConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCConfiguration.cpp; sourceTree = "<group>"; };
+		002175021E9701C3008204EA /* impl_org_ortc_adapter_RTCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCConfiguration.h; sourceTree = "<group>"; };
+		002175031E9701C3008204EA /* impl_org_ortc_adapter_RTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCIceCandidate.cpp; sourceTree = "<group>"; };
+		002175041E9701C3008204EA /* impl_org_ortc_adapter_RTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCIceCandidate.h; sourceTree = "<group>"; };
+		002175051E9701C3008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp; sourceTree = "<group>"; };
+		002175061E9701C3008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h; sourceTree = "<group>"; };
+		002175071E9701C3008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp; sourceTree = "<group>"; };
+		002175081E9701C3008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCOfferAnswerOptions.h; sourceTree = "<group>"; };
+		002175091E9701C3008204EA /* impl_org_ortc_adapter_RTCOfferOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCOfferOptions.cpp; sourceTree = "<group>"; };
+		0021750A1E9701C3008204EA /* impl_org_ortc_adapter_RTCOfferOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCOfferOptions.h; sourceTree = "<group>"; };
+		0021750B1E9701C3008204EA /* impl_org_ortc_adapter_RTCPeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCPeerConnection.cpp; sourceTree = "<group>"; };
+		0021750C1E9701C3008204EA /* impl_org_ortc_adapter_RTCPeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCPeerConnection.h; sourceTree = "<group>"; };
+		0021750D1E9701C3008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp; sourceTree = "<group>"; };
+		0021750E1E9701C3008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h; sourceTree = "<group>"; };
+		0021750F1E9701C4008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp; sourceTree = "<group>"; };
+		002175101E9701C4008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h; sourceTree = "<group>"; };
+		002175111E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescription.cpp; sourceTree = "<group>"; };
+		002175121E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescription.h; sourceTree = "<group>"; };
+		002175131E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp; sourceTree = "<group>"; };
+		002175141E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h; sourceTree = "<group>"; };
+		002175151E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp; sourceTree = "<group>"; };
+		002175161E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h; sourceTree = "<group>"; };
+		002175171E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp; sourceTree = "<group>"; };
+		002175181E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionDescription.h; sourceTree = "<group>"; };
+		002175191E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp; sourceTree = "<group>"; };
+		0021751A1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h; sourceTree = "<group>"; };
+		0021751B1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp; sourceTree = "<group>"; };
+		0021751C1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h; sourceTree = "<group>"; };
+		0021751D1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp; sourceTree = "<group>"; };
+		0021751E1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h; sourceTree = "<group>"; };
+		0021751F1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp; sourceTree = "<group>"; };
+		002175201E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h; sourceTree = "<group>"; };
+		002175211E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp; sourceTree = "<group>"; };
+		002175221E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h; sourceTree = "<group>"; };
+		002175231E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp; sourceTree = "<group>"; };
+		002175241E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h; sourceTree = "<group>"; };
+		002175251E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp; sourceTree = "<group>"; };
+		002175261E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h; sourceTree = "<group>"; };
+		002175271E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp; sourceTree = "<group>"; };
+		002175281E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionTransport.h; sourceTree = "<group>"; };
+		002175291E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp; sourceTree = "<group>"; };
+		0021752A1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h; sourceTree = "<group>"; };
+		0021752B1E9701C4008204EA /* impl_org_ortc_adapter_RTCTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCTrackEvent.cpp; sourceTree = "<group>"; };
+		0021752C1E9701C4008204EA /* impl_org_ortc_adapter_RTCTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCTrackEvent.h; sourceTree = "<group>"; };
+		0021752D1E9701C4008204EA /* impl_org_ortc_ConstrainBoolean.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainBoolean.cpp; sourceTree = "<group>"; };
+		0021752E1E9701C4008204EA /* impl_org_ortc_ConstrainBoolean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainBoolean.h; sourceTree = "<group>"; };
+		0021752F1E9701C4008204EA /* impl_org_ortc_ConstrainBooleanParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainBooleanParameters.cpp; sourceTree = "<group>"; };
+		002175301E9701C4008204EA /* impl_org_ortc_ConstrainBooleanParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainBooleanParameters.h; sourceTree = "<group>"; };
+		002175311E9701C4008204EA /* impl_org_ortc_ConstrainDouble.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainDouble.cpp; sourceTree = "<group>"; };
+		002175321E9701C4008204EA /* impl_org_ortc_ConstrainDouble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainDouble.h; sourceTree = "<group>"; };
+		002175331E9701C4008204EA /* impl_org_ortc_ConstrainDoubleRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainDoubleRange.cpp; sourceTree = "<group>"; };
+		002175341E9701C4008204EA /* impl_org_ortc_ConstrainDoubleRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainDoubleRange.h; sourceTree = "<group>"; };
+		002175351E9701C4008204EA /* impl_org_ortc_ConstrainLong.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainLong.cpp; sourceTree = "<group>"; };
+		002175361E9701C4008204EA /* impl_org_ortc_ConstrainLong.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainLong.h; sourceTree = "<group>"; };
+		002175371E9701C4008204EA /* impl_org_ortc_ConstrainLongRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainLongRange.cpp; sourceTree = "<group>"; };
+		002175381E9701C4008204EA /* impl_org_ortc_ConstrainLongRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainLongRange.h; sourceTree = "<group>"; };
+		002175391E9701C4008204EA /* impl_org_ortc_ConstrainString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainString.cpp; sourceTree = "<group>"; };
+		0021753A1E9701C4008204EA /* impl_org_ortc_ConstrainString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainString.h; sourceTree = "<group>"; };
+		0021753B1E9701C4008204EA /* impl_org_ortc_ConstrainStringParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainStringParameters.cpp; sourceTree = "<group>"; };
+		0021753C1E9701C4008204EA /* impl_org_ortc_ConstrainStringParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainStringParameters.h; sourceTree = "<group>"; };
+		0021753D1E9701C4008204EA /* impl_org_ortc_Dispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Dispatcher.cpp; sourceTree = "<group>"; };
+		0021753E1E9701C4008204EA /* impl_org_ortc_Dispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Dispatcher.h; sourceTree = "<group>"; };
+		0021753F1E9701C4008204EA /* impl_org_ortc_DoubleRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_DoubleRange.cpp; sourceTree = "<group>"; };
+		002175401E9701C4008204EA /* impl_org_ortc_DoubleRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_DoubleRange.h; sourceTree = "<group>"; };
+		002175411E9701C4008204EA /* impl_org_ortc_Error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Error.cpp; sourceTree = "<group>"; };
+		002175421E9701C4008204EA /* impl_org_ortc_Error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Error.h; sourceTree = "<group>"; };
+		002175431E9701C4008204EA /* impl_org_ortc_ErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ErrorEvent.cpp; sourceTree = "<group>"; };
+		002175441E9701C4008204EA /* impl_org_ortc_ErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ErrorEvent.h; sourceTree = "<group>"; };
+		002175451E9701C4008204EA /* impl_org_ortc_Helper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Helper.cpp; sourceTree = "<group>"; };
+		002175461E9701C4008204EA /* impl_org_ortc_Helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Helper.h; sourceTree = "<group>"; };
+		002175471E9701C4008204EA /* impl_org_ortc_Json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Json.cpp; sourceTree = "<group>"; };
+		002175481E9701C4008204EA /* impl_org_ortc_Json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Json.h; sourceTree = "<group>"; };
+		002175491E9701C4008204EA /* impl_org_ortc_Logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Logger.cpp; sourceTree = "<group>"; };
+		0021754A1E9701C4008204EA /* impl_org_ortc_Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Logger.h; sourceTree = "<group>"; };
+		0021754B1E9701C4008204EA /* impl_org_ortc_LongRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_LongRange.cpp; sourceTree = "<group>"; };
+		0021754C1E9701C4008204EA /* impl_org_ortc_LongRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_LongRange.h; sourceTree = "<group>"; };
+		0021754D1E9701C4008204EA /* impl_org_ortc_MediaControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaControl.cpp; sourceTree = "<group>"; };
+		0021754E1E9701C4008204EA /* impl_org_ortc_MediaControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaControl.h; sourceTree = "<group>"; };
+		0021754F1E9701C4008204EA /* impl_org_ortc_MediaDeviceInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaDeviceInfo.cpp; sourceTree = "<group>"; };
+		002175501E9701C4008204EA /* impl_org_ortc_MediaDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaDeviceInfo.h; sourceTree = "<group>"; };
+		002175511E9701C4008204EA /* impl_org_ortc_MediaDevices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaDevices.cpp; sourceTree = "<group>"; };
+		002175521E9701C4008204EA /* impl_org_ortc_MediaDevices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaDevices.h; sourceTree = "<group>"; };
+		002175531E9701C4008204EA /* impl_org_ortc_MediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaSource.cpp; sourceTree = "<group>"; };
+		002175541E9701C4008204EA /* impl_org_ortc_MediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaSource.h; sourceTree = "<group>"; };
+		002175551E9701C4008204EA /* impl_org_ortc_MediaStreamConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaStreamConstraints.cpp; sourceTree = "<group>"; };
+		002175561E9701C4008204EA /* impl_org_ortc_MediaStreamConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaStreamConstraints.h; sourceTree = "<group>"; };
+		002175571E9701C4008204EA /* impl_org_ortc_MediaStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaStreamTrack.cpp; sourceTree = "<group>"; };
+		002175581E9701C4008204EA /* impl_org_ortc_MediaStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaStreamTrack.h; sourceTree = "<group>"; };
+		002175591E9701C4008204EA /* impl_org_ortc_MediaTrackCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaTrackCapabilities.cpp; sourceTree = "<group>"; };
+		0021755A1E9701C4008204EA /* impl_org_ortc_MediaTrackCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaTrackCapabilities.h; sourceTree = "<group>"; };
+		0021755B1E9701C4008204EA /* impl_org_ortc_MediaTrackConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaTrackConstraints.cpp; sourceTree = "<group>"; };
+		0021755C1E9701C4008204EA /* impl_org_ortc_MediaTrackConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaTrackConstraints.h; sourceTree = "<group>"; };
+		0021755D1E9701C4008204EA /* impl_org_ortc_MediaTrackConstraintSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaTrackConstraintSet.cpp; sourceTree = "<group>"; };
+		0021755E1E9701C4008204EA /* impl_org_ortc_MediaTrackConstraintSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaTrackConstraintSet.h; sourceTree = "<group>"; };
+		0021755F1E9701C4008204EA /* impl_org_ortc_MediaTrackSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaTrackSettings.cpp; sourceTree = "<group>"; };
+		002175601E9701C4008204EA /* impl_org_ortc_MediaTrackSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaTrackSettings.h; sourceTree = "<group>"; };
+		002175611E9701C4008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaTrackSupportedConstraints.cpp; sourceTree = "<group>"; };
+		002175621E9701C4008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaTrackSupportedConstraints.h; sourceTree = "<group>"; };
+		002175631E9701C4008204EA /* impl_org_ortc_MessageQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MessageQueue.cpp; sourceTree = "<group>"; };
+		002175641E9701C4008204EA /* impl_org_ortc_MessageQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MessageQueue.h; sourceTree = "<group>"; };
+		002175651E9701C4008204EA /* impl_org_ortc_OrtcLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_OrtcLib.cpp; sourceTree = "<group>"; };
+		002175661E9701C4008204EA /* impl_org_ortc_OrtcLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_OrtcLib.h; sourceTree = "<group>"; };
+		002175671E9701C4008204EA /* impl_org_ortc_OrtcLibWithDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_OrtcLibWithDispatcher.cpp; sourceTree = "<group>"; };
+		002175681E9701C4008204EA /* impl_org_ortc_OrtcLibWithDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_OrtcLibWithDispatcher.h; sourceTree = "<group>"; };
+		002175691E9701C4008204EA /* impl_org_ortc_OverconstrainedError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_OverconstrainedError.cpp; sourceTree = "<group>"; };
+		0021756A1E9701C4008204EA /* impl_org_ortc_OverconstrainedError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_OverconstrainedError.h; sourceTree = "<group>"; };
+		0021756B1E9701C4008204EA /* impl_org_ortc_OverconstrainedErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_OverconstrainedErrorEvent.cpp; sourceTree = "<group>"; };
+		0021756C1E9701C4008204EA /* impl_org_ortc_OverconstrainedErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_OverconstrainedErrorEvent.h; sourceTree = "<group>"; };
+		0021756D1E9701C4008204EA /* impl_org_ortc_RTCCertificate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCCertificate.cpp; sourceTree = "<group>"; };
+		0021756E1E9701C4008204EA /* impl_org_ortc_RTCCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCCertificate.h; sourceTree = "<group>"; };
+		0021756F1E9701C4008204EA /* impl_org_ortc_RTCCertificateStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCCertificateStats.cpp; sourceTree = "<group>"; };
+		002175701E9701C4008204EA /* impl_org_ortc_RTCCertificateStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCCertificateStats.h; sourceTree = "<group>"; };
+		002175711E9701C4008204EA /* impl_org_ortc_RTCCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCCodec.cpp; sourceTree = "<group>"; };
+		002175721E9701C4008204EA /* impl_org_ortc_RTCCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCCodec.h; sourceTree = "<group>"; };
+		002175731E9701C4008204EA /* impl_org_ortc_RTCDataChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataChannel.cpp; sourceTree = "<group>"; };
+		002175741E9701C4008204EA /* impl_org_ortc_RTCDataChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataChannel.h; sourceTree = "<group>"; };
+		002175751E9701C4008204EA /* impl_org_ortc_RTCDataChannelEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataChannelEvent.cpp; sourceTree = "<group>"; };
+		002175761E9701C4008204EA /* impl_org_ortc_RTCDataChannelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataChannelEvent.h; sourceTree = "<group>"; };
+		002175771E9701C4008204EA /* impl_org_ortc_RTCDataChannelParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataChannelParameters.cpp; sourceTree = "<group>"; };
+		002175781E9701C4008204EA /* impl_org_ortc_RTCDataChannelParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataChannelParameters.h; sourceTree = "<group>"; };
+		002175791E9701C4008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataChannelStateChangeEvent.cpp; sourceTree = "<group>"; };
+		0021757A1E9701C4008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataChannelStateChangeEvent.h; sourceTree = "<group>"; };
+		0021757B1E9701C4008204EA /* impl_org_ortc_RTCDataChannelStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataChannelStats.cpp; sourceTree = "<group>"; };
+		0021757C1E9701C4008204EA /* impl_org_ortc_RTCDataChannelStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataChannelStats.h; sourceTree = "<group>"; };
+		0021757D1E9701C4008204EA /* impl_org_ortc_RTCDataTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataTransport.cpp; sourceTree = "<group>"; };
+		0021757E1E9701C4008204EA /* impl_org_ortc_RTCDataTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataTransport.h; sourceTree = "<group>"; };
+		0021757F1E9701C4008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsCertificateBinary.cpp; sourceTree = "<group>"; };
+		002175801E9701C4008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsCertificateBinary.h; sourceTree = "<group>"; };
+		002175811E9701C4008204EA /* impl_org_ortc_RTCDtlsFingerprint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsFingerprint.cpp; sourceTree = "<group>"; };
+		002175821E9701C4008204EA /* impl_org_ortc_RTCDtlsFingerprint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsFingerprint.h; sourceTree = "<group>"; };
+		002175831E9701C4008204EA /* impl_org_ortc_RTCDtlsParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsParameters.cpp; sourceTree = "<group>"; };
+		002175841E9701C4008204EA /* impl_org_ortc_RTCDtlsParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsParameters.h; sourceTree = "<group>"; };
+		002175851E9701C4008204EA /* impl_org_ortc_RTCDtlsTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsTransport.cpp; sourceTree = "<group>"; };
+		002175861E9701C4008204EA /* impl_org_ortc_RTCDtlsTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsTransport.h; sourceTree = "<group>"; };
+		002175871E9701C4008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		002175881E9701C4008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		002175891E9701C4008204EA /* impl_org_ortc_RTCDtlsTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsTransportStats.cpp; sourceTree = "<group>"; };
+		0021758A1E9701C4008204EA /* impl_org_ortc_RTCDtlsTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsTransportStats.h; sourceTree = "<group>"; };
+		0021758B1E9701C4008204EA /* impl_org_ortc_RTCDtmfSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtmfSender.cpp; sourceTree = "<group>"; };
+		0021758C1E9701C4008204EA /* impl_org_ortc_RTCDtmfSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtmfSender.h; sourceTree = "<group>"; };
+		0021758D1E9701C4008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtmfToneChangeEvent.cpp; sourceTree = "<group>"; };
+		0021758E1E9701C4008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtmfToneChangeEvent.h; sourceTree = "<group>"; };
+		0021758F1E9701C4008204EA /* impl_org_ortc_RTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidate.cpp; sourceTree = "<group>"; };
+		002175901E9701C4008204EA /* impl_org_ortc_RTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidate.h; sourceTree = "<group>"; };
+		002175911E9701C4008204EA /* impl_org_ortc_RTCIceCandidateAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidateAttributes.cpp; sourceTree = "<group>"; };
+		002175921E9701C4008204EA /* impl_org_ortc_RTCIceCandidateAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidateAttributes.h; sourceTree = "<group>"; };
+		002175931E9701C5008204EA /* impl_org_ortc_RTCIceCandidateComplete.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidateComplete.cpp; sourceTree = "<group>"; };
+		002175941E9701C5008204EA /* impl_org_ortc_RTCIceCandidateComplete.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidateComplete.h; sourceTree = "<group>"; };
+		002175951E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidatePair.cpp; sourceTree = "<group>"; };
+		002175961E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidatePair.h; sourceTree = "<group>"; };
+		002175971E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp; sourceTree = "<group>"; };
+		002175981E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidatePairChangeEvent.h; sourceTree = "<group>"; };
+		002175991E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePairStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidatePairStats.cpp; sourceTree = "<group>"; };
+		0021759A1E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePairStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidatePairStats.h; sourceTree = "<group>"; };
+		0021759B1E9701C5008204EA /* impl_org_ortc_RTCIceGatherer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGatherer.cpp; sourceTree = "<group>"; };
+		0021759C1E9701C5008204EA /* impl_org_ortc_RTCIceGatherer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGatherer.h; sourceTree = "<group>"; };
+		0021759D1E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererCandidate.cpp; sourceTree = "<group>"; };
+		0021759E1E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererCandidate.h; sourceTree = "<group>"; };
+		0021759F1E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp; sourceTree = "<group>"; };
+		002175A01E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h; sourceTree = "<group>"; };
+		002175A11E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererCandidateEvent.cpp; sourceTree = "<group>"; };
+		002175A21E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererCandidateEvent.h; sourceTree = "<group>"; };
+		002175A31E9701C5008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererIceErrorEvent.cpp; sourceTree = "<group>"; };
+		002175A41E9701C5008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererIceErrorEvent.h; sourceTree = "<group>"; };
+		002175A51E9701C5008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererStateChangeEvent.cpp; sourceTree = "<group>"; };
+		002175A61E9701C5008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererStateChangeEvent.h; sourceTree = "<group>"; };
+		002175A71E9701C5008204EA /* impl_org_ortc_RTCIceGathererStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererStats.cpp; sourceTree = "<group>"; };
+		002175A81E9701C5008204EA /* impl_org_ortc_RTCIceGathererStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererStats.h; sourceTree = "<group>"; };
+		002175A91E9701C5008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGatherInterfacePolicy.cpp; sourceTree = "<group>"; };
+		002175AA1E9701C5008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGatherInterfacePolicy.h; sourceTree = "<group>"; };
+		002175AB1E9701C5008204EA /* impl_org_ortc_RTCIceGatherOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGatherOptions.cpp; sourceTree = "<group>"; };
+		002175AC1E9701C5008204EA /* impl_org_ortc_RTCIceGatherOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGatherOptions.h; sourceTree = "<group>"; };
+		002175AD1E9701C5008204EA /* impl_org_ortc_RTCIceParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceParameters.cpp; sourceTree = "<group>"; };
+		002175AE1E9701C5008204EA /* impl_org_ortc_RTCIceParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceParameters.h; sourceTree = "<group>"; };
+		002175AF1E9701C5008204EA /* impl_org_ortc_RTCIceServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceServer.cpp; sourceTree = "<group>"; };
+		002175B01E9701C5008204EA /* impl_org_ortc_RTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceServer.h; sourceTree = "<group>"; };
+		002175B11E9701C5008204EA /* impl_org_ortc_RTCIceTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceTransport.cpp; sourceTree = "<group>"; };
+		002175B21E9701C5008204EA /* impl_org_ortc_RTCIceTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceTransport.h; sourceTree = "<group>"; };
+		002175B31E9701C5008204EA /* impl_org_ortc_RTCIceTransportController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceTransportController.cpp; sourceTree = "<group>"; };
+		002175B41E9701C5008204EA /* impl_org_ortc_RTCIceTransportController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceTransportController.h; sourceTree = "<group>"; };
+		002175B51E9701C5008204EA /* impl_org_ortc_RTCIceTransportOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceTransportOptions.cpp; sourceTree = "<group>"; };
+		002175B61E9701C5008204EA /* impl_org_ortc_RTCIceTransportOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceTransportOptions.h; sourceTree = "<group>"; };
+		002175B71E9701C5008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		002175B81E9701C5008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		002175B91E9701C5008204EA /* impl_org_ortc_RTCIceTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceTransportStats.cpp; sourceTree = "<group>"; };
+		002175BA1E9701C5008204EA /* impl_org_ortc_RTCIceTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceTransportStats.h; sourceTree = "<group>"; };
+		002175BB1E9701C5008204EA /* impl_org_ortc_RTCIdentity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIdentity.cpp; sourceTree = "<group>"; };
+		002175BC1E9701C5008204EA /* impl_org_ortc_RTCIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIdentity.h; sourceTree = "<group>"; };
+		002175BD1E9701C5008204EA /* impl_org_ortc_RTCIdentityAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIdentityAssertion.cpp; sourceTree = "<group>"; };
+		002175BE1E9701C5008204EA /* impl_org_ortc_RTCIdentityAssertion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIdentityAssertion.h; sourceTree = "<group>"; };
+		002175BF1E9701C5008204EA /* impl_org_ortc_RTCIdentityError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIdentityError.cpp; sourceTree = "<group>"; };
+		002175C01E9701C5008204EA /* impl_org_ortc_RTCIdentityError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIdentityError.h; sourceTree = "<group>"; };
+		002175C11E9701C5008204EA /* impl_org_ortc_RTCIdentityResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIdentityResult.cpp; sourceTree = "<group>"; };
+		002175C21E9701C5008204EA /* impl_org_ortc_RTCIdentityResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIdentityResult.h; sourceTree = "<group>"; };
+		002175C31E9701C5008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCInboundRtpStreamStats.cpp; sourceTree = "<group>"; };
+		002175C41E9701C5008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCInboundRtpStreamStats.h; sourceTree = "<group>"; };
+		002175C51E9701C5008204EA /* impl_org_ortc_RTCMediaStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCMediaStreamStats.cpp; sourceTree = "<group>"; };
+		002175C61E9701C5008204EA /* impl_org_ortc_RTCMediaStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCMediaStreamStats.h; sourceTree = "<group>"; };
+		002175C71E9701C5008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCMediaStreamTrackStats.cpp; sourceTree = "<group>"; };
+		002175C81E9701C5008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCMediaStreamTrackStats.h; sourceTree = "<group>"; };
+		002175C91E9701C5008204EA /* impl_org_ortc_RTCMessageEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCMessageEvent.cpp; sourceTree = "<group>"; };
+		002175CA1E9701C5008204EA /* impl_org_ortc_RTCMessageEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCMessageEvent.h; sourceTree = "<group>"; };
+		002175CB1E9701C5008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCOutboundRtpStreamStats.cpp; sourceTree = "<group>"; };
+		002175CC1E9701C5008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCOutboundRtpStreamStats.h; sourceTree = "<group>"; };
+		002175CD1E9701C5008204EA /* impl_org_ortc_RTCRtcpFeedback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtcpFeedback.cpp; sourceTree = "<group>"; };
+		002175CE1E9701C5008204EA /* impl_org_ortc_RTCRtcpFeedback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtcpFeedback.h; sourceTree = "<group>"; };
+		002175CF1E9701C5008204EA /* impl_org_ortc_RTCRtcpParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtcpParameters.cpp; sourceTree = "<group>"; };
+		002175D01E9701C5008204EA /* impl_org_ortc_RTCRtcpParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtcpParameters.h; sourceTree = "<group>"; };
+		002175D11E9701C5008204EA /* impl_org_ortc_RTCRtcpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtcpTransport.cpp; sourceTree = "<group>"; };
+		002175D21E9701C5008204EA /* impl_org_ortc_RTCRtcpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtcpTransport.h; sourceTree = "<group>"; };
+		002175D31E9701C5008204EA /* impl_org_ortc_RTCRtpCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCapabilities.cpp; sourceTree = "<group>"; };
+		002175D41E9701C5008204EA /* impl_org_ortc_RTCRtpCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCapabilities.h; sourceTree = "<group>"; };
+		002175D51E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapability.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCodecCapability.cpp; sourceTree = "<group>"; };
+		002175D61E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCodecCapability.h; sourceTree = "<group>"; };
+		002175D71E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp; sourceTree = "<group>"; };
+		002175D81E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCodecCapabilityOptions.h; sourceTree = "<group>"; };
+		002175D91E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		002175DA1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		002175DB1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCodecParameters.cpp; sourceTree = "<group>"; };
+		002175DC1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCodecParameters.h; sourceTree = "<group>"; };
+		002175DD1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		002175DE1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCodecParameterSettings.h; sourceTree = "<group>"; };
+		002175DF1E9701C5008204EA /* impl_org_ortc_RTCRtpContributingSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpContributingSource.cpp; sourceTree = "<group>"; };
+		002175E01E9701C5008204EA /* impl_org_ortc_RTCRtpContributingSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpContributingSource.h; sourceTree = "<group>"; };
+		002175E11E9701C5008204EA /* impl_org_ortc_RTCRtpEncodingParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpEncodingParameters.cpp; sourceTree = "<group>"; };
+		002175E21E9701C5008204EA /* impl_org_ortc_RTCRtpEncodingParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpEncodingParameters.h; sourceTree = "<group>"; };
+		002175E31E9701C5008204EA /* impl_org_ortc_RTCRtpFecParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpFecParameters.cpp; sourceTree = "<group>"; };
+		002175E41E9701C5008204EA /* impl_org_ortc_RTCRtpFecParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpFecParameters.h; sourceTree = "<group>"; };
+		002175E51E9701C5008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		002175E61E9701C5008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		002175E71E9701C5008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		002175E81E9701C5008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h; sourceTree = "<group>"; };
+		002175E91E9701C5008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		002175EA1E9701C5008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h; sourceTree = "<group>"; };
+		002175EB1E9701C5008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp; sourceTree = "<group>"; };
+		002175EC1E9701C5008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpH264CodecParameterSettings.h; sourceTree = "<group>"; };
+		002175ED1E9701C5008204EA /* impl_org_ortc_RTCRtpHeaderExtension.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpHeaderExtension.cpp; sourceTree = "<group>"; };
+		002175EE1E9701C5008204EA /* impl_org_ortc_RTCRtpHeaderExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpHeaderExtension.h; sourceTree = "<group>"; };
+		002175EF1E9701C5008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp; sourceTree = "<group>"; };
+		002175F01E9701C5008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpHeaderExtensionParameters.h; sourceTree = "<group>"; };
+		002175F11E9701C5008204EA /* impl_org_ortc_RTCRtpListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpListener.cpp; sourceTree = "<group>"; };
+		002175F21E9701C5008204EA /* impl_org_ortc_RTCRtpListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpListener.h; sourceTree = "<group>"; };
+		002175F31E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp; sourceTree = "<group>"; };
+		002175F41E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h; sourceTree = "<group>"; };
+		002175F51E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		002175F61E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		002175F71E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		002175F81E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpOpusCodecParameterSettings.h; sourceTree = "<group>"; };
+		002175F91E9701C5008204EA /* impl_org_ortc_RTCRtpParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpParameters.cpp; sourceTree = "<group>"; };
+		002175FA1E9701C5008204EA /* impl_org_ortc_RTCRtpParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpParameters.h; sourceTree = "<group>"; };
+		002175FB1E9701C5008204EA /* impl_org_ortc_RTCRtpReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpReceiver.cpp; sourceTree = "<group>"; };
+		002175FC1E9701C5008204EA /* impl_org_ortc_RTCRtpReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpReceiver.h; sourceTree = "<group>"; };
+		002175FD1E9701C5008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		002175FE1E9701C5008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpRedCodecParameterSettings.h; sourceTree = "<group>"; };
+		002175FF1E9701C5008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		002176001E9701C5008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		002176011E9701C5008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		002176021E9701C5008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpRtxCodecParameterSettings.h; sourceTree = "<group>"; };
+		002176031E9701C5008204EA /* impl_org_ortc_RTCRtpRtxParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpRtxParameters.cpp; sourceTree = "<group>"; };
+		002176041E9701C5008204EA /* impl_org_ortc_RTCRtpRtxParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpRtxParameters.h; sourceTree = "<group>"; };
+		002176051E9701C5008204EA /* impl_org_ortc_RTCRtpSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpSender.cpp; sourceTree = "<group>"; };
+		002176061E9701C5008204EA /* impl_org_ortc_RTCRtpSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpSender.h; sourceTree = "<group>"; };
+		002176071E9701C5008204EA /* impl_org_ortc_RTCRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpStreamStats.cpp; sourceTree = "<group>"; };
+		002176081E9701C6008204EA /* impl_org_ortc_RTCRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpStreamStats.h; sourceTree = "<group>"; };
+		002176091E9701C6008204EA /* impl_org_ortc_RTCRtpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpTransport.cpp; sourceTree = "<group>"; };
+		0021760A1E9701C6008204EA /* impl_org_ortc_RTCRtpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpTransport.h; sourceTree = "<group>"; };
+		0021760B1E9701C6008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpUnhandledEvent.cpp; sourceTree = "<group>"; };
+		0021760C1E9701C6008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpUnhandledEvent.h; sourceTree = "<group>"; };
+		0021760D1E9701C6008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		0021760E1E9701C6008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h; sourceTree = "<group>"; };
+		0021760F1E9701C6008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp; sourceTree = "<group>"; };
+		002176101E9701C6008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpVp8CodecParameterSettings.h; sourceTree = "<group>"; };
+		002176111E9701C6008204EA /* impl_org_ortc_RTCSctpCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpCapabilities.cpp; sourceTree = "<group>"; };
+		002176121E9701C6008204EA /* impl_org_ortc_RTCSctpCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpCapabilities.h; sourceTree = "<group>"; };
+		002176131E9701C6008204EA /* impl_org_ortc_RTCSctpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpTransport.cpp; sourceTree = "<group>"; };
+		002176141E9701C6008204EA /* impl_org_ortc_RTCSctpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpTransport.h; sourceTree = "<group>"; };
+		002176151E9701C6008204EA /* impl_org_ortc_RTCSctpTransportListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpTransportListener.cpp; sourceTree = "<group>"; };
+		002176161E9701C6008204EA /* impl_org_ortc_RTCSctpTransportListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpTransportListener.h; sourceTree = "<group>"; };
+		002176171E9701C6008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpTransportListenerEvent.cpp; sourceTree = "<group>"; };
+		002176181E9701C6008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpTransportListenerEvent.h; sourceTree = "<group>"; };
+		002176191E9701C6008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		0021761A1E9701C6008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		0021761B1E9701C6008204EA /* impl_org_ortc_RTCSctpTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpTransportStats.cpp; sourceTree = "<group>"; };
+		0021761C1E9701C6008204EA /* impl_org_ortc_RTCSctpTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpTransportStats.h; sourceTree = "<group>"; };
+		0021761D1E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp; sourceTree = "<group>"; };
+		0021761E1E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpSdesCryptoParameters.h; sourceTree = "<group>"; };
+		0021761F1E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpSdesKeyParameters.cpp; sourceTree = "<group>"; };
+		002176201E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpSdesKeyParameters.h; sourceTree = "<group>"; };
+		002176211E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpSdesParameters.cpp; sourceTree = "<group>"; };
+		002176221E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpSdesParameters.h; sourceTree = "<group>"; };
+		002176231E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpSdesTransport.cpp; sourceTree = "<group>"; };
+		002176241E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpSdesTransport.h; sourceTree = "<group>"; };
+		002176251E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp; sourceTree = "<group>"; };
+		002176261E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h; sourceTree = "<group>"; };
+		002176271E9701C6008204EA /* impl_org_ortc_RTCSrtpTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpTransportStats.cpp; sourceTree = "<group>"; };
+		002176281E9701C6008204EA /* impl_org_ortc_RTCSrtpTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpTransportStats.h; sourceTree = "<group>"; };
+		002176291E9701C6008204EA /* impl_org_ortc_RTCSsrcConflictEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSsrcConflictEvent.cpp; sourceTree = "<group>"; };
+		0021762A1E9701C6008204EA /* impl_org_ortc_RTCSsrcConflictEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSsrcConflictEvent.h; sourceTree = "<group>"; };
+		0021762B1E9701C6008204EA /* impl_org_ortc_RTCStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCStats.cpp; sourceTree = "<group>"; };
+		0021762C1E9701C6008204EA /* impl_org_ortc_RTCStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCStats.h; sourceTree = "<group>"; };
+		0021762D1E9701C6008204EA /* impl_org_ortc_RTCStatsProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCStatsProvider.cpp; sourceTree = "<group>"; };
+		0021762E1E9701C6008204EA /* impl_org_ortc_RTCStatsProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCStatsProvider.h; sourceTree = "<group>"; };
+		0021762F1E9701C6008204EA /* impl_org_ortc_RTCStatsReport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCStatsReport.cpp; sourceTree = "<group>"; };
+		002176301E9701C6008204EA /* impl_org_ortc_RTCStatsReport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCStatsReport.h; sourceTree = "<group>"; };
+		002176311E9701C6008204EA /* impl_org_ortc_RTCStatsTypeSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCStatsTypeSet.cpp; sourceTree = "<group>"; };
+		002176321E9701C6008204EA /* impl_org_ortc_RTCStatsTypeSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCStatsTypeSet.h; sourceTree = "<group>"; };
+		002176331E9701C6008204EA /* impl_org_ortc_Settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Settings.cpp; sourceTree = "<group>"; };
+		002176341E9701C6008204EA /* impl_org_ortc_Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Settings.h; sourceTree = "<group>"; };
+		002176351E9701C6008204EA /* impl_org_ortc_StringOrStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_StringOrStringList.cpp; sourceTree = "<group>"; };
+		002176361E9701C6008204EA /* impl_org_ortc_StringOrStringList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_StringOrStringList.h; sourceTree = "<group>"; };
+		002176371E9701C6008204EA /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		0021713A1E97017D008204EA /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		002171341E97017D008204EA = {
+			isa = PBXGroup;
+			children = (
+				002171491E9701C1008204EA /* wrapper */,
+				0021713E1E97017D008204EA /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		0021713E1E97017D008204EA /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				0021713D1E97017D008204EA /* libortclib-wrapper-ios.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		002171491E9701C1008204EA /* wrapper */ = {
+			isa = PBXGroup;
+			children = (
+				002174FA1E9701C3008204EA /* impl_org_ortc.cpp */,
+				002174FB1E9701C3008204EA /* impl_org_ortc_adapter_MediaStream.cpp */,
+				002174FC1E9701C3008204EA /* impl_org_ortc_adapter_MediaStream.h */,
+				002174FD1E9701C3008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.cpp */,
+				002174FE1E9701C3008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.h */,
+				002174FF1E9701C3008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.cpp */,
+				002175001E9701C3008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.h */,
+				002175011E9701C3008204EA /* impl_org_ortc_adapter_RTCConfiguration.cpp */,
+				002175021E9701C3008204EA /* impl_org_ortc_adapter_RTCConfiguration.h */,
+				002175031E9701C3008204EA /* impl_org_ortc_adapter_RTCIceCandidate.cpp */,
+				002175041E9701C3008204EA /* impl_org_ortc_adapter_RTCIceCandidate.h */,
+				002175051E9701C3008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */,
+				002175061E9701C3008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h */,
+				002175071E9701C3008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp */,
+				002175081E9701C3008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.h */,
+				002175091E9701C3008204EA /* impl_org_ortc_adapter_RTCOfferOptions.cpp */,
+				0021750A1E9701C3008204EA /* impl_org_ortc_adapter_RTCOfferOptions.h */,
+				0021750B1E9701C3008204EA /* impl_org_ortc_adapter_RTCPeerConnection.cpp */,
+				0021750C1E9701C3008204EA /* impl_org_ortc_adapter_RTCPeerConnection.h */,
+				0021750D1E9701C3008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */,
+				0021750E1E9701C3008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h */,
+				0021750F1E9701C4008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */,
+				002175101E9701C4008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h */,
+				002175111E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescription.cpp */,
+				002175121E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescription.h */,
+				002175131E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */,
+				002175141E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h */,
+				002175151E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */,
+				002175161E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h */,
+				002175171E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */,
+				002175181E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.h */,
+				002175191E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */,
+				0021751A1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h */,
+				0021751B1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */,
+				0021751C1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h */,
+				0021751D1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */,
+				0021751E1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h */,
+				0021751F1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */,
+				002175201E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h */,
+				002175211E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */,
+				002175221E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h */,
+				002175231E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */,
+				002175241E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h */,
+				002175251E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */,
+				002175261E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h */,
+				002175271E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */,
+				002175281E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.h */,
+				002175291E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */,
+				0021752A1E9701C4008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h */,
+				0021752B1E9701C4008204EA /* impl_org_ortc_adapter_RTCTrackEvent.cpp */,
+				0021752C1E9701C4008204EA /* impl_org_ortc_adapter_RTCTrackEvent.h */,
+				0021752D1E9701C4008204EA /* impl_org_ortc_ConstrainBoolean.cpp */,
+				0021752E1E9701C4008204EA /* impl_org_ortc_ConstrainBoolean.h */,
+				0021752F1E9701C4008204EA /* impl_org_ortc_ConstrainBooleanParameters.cpp */,
+				002175301E9701C4008204EA /* impl_org_ortc_ConstrainBooleanParameters.h */,
+				002175311E9701C4008204EA /* impl_org_ortc_ConstrainDouble.cpp */,
+				002175321E9701C4008204EA /* impl_org_ortc_ConstrainDouble.h */,
+				002175331E9701C4008204EA /* impl_org_ortc_ConstrainDoubleRange.cpp */,
+				002175341E9701C4008204EA /* impl_org_ortc_ConstrainDoubleRange.h */,
+				002175351E9701C4008204EA /* impl_org_ortc_ConstrainLong.cpp */,
+				002175361E9701C4008204EA /* impl_org_ortc_ConstrainLong.h */,
+				002175371E9701C4008204EA /* impl_org_ortc_ConstrainLongRange.cpp */,
+				002175381E9701C4008204EA /* impl_org_ortc_ConstrainLongRange.h */,
+				002175391E9701C4008204EA /* impl_org_ortc_ConstrainString.cpp */,
+				0021753A1E9701C4008204EA /* impl_org_ortc_ConstrainString.h */,
+				0021753B1E9701C4008204EA /* impl_org_ortc_ConstrainStringParameters.cpp */,
+				0021753C1E9701C4008204EA /* impl_org_ortc_ConstrainStringParameters.h */,
+				0021753D1E9701C4008204EA /* impl_org_ortc_Dispatcher.cpp */,
+				0021753E1E9701C4008204EA /* impl_org_ortc_Dispatcher.h */,
+				0021753F1E9701C4008204EA /* impl_org_ortc_DoubleRange.cpp */,
+				002175401E9701C4008204EA /* impl_org_ortc_DoubleRange.h */,
+				002175411E9701C4008204EA /* impl_org_ortc_Error.cpp */,
+				002175421E9701C4008204EA /* impl_org_ortc_Error.h */,
+				002175431E9701C4008204EA /* impl_org_ortc_ErrorEvent.cpp */,
+				002175441E9701C4008204EA /* impl_org_ortc_ErrorEvent.h */,
+				002175451E9701C4008204EA /* impl_org_ortc_Helper.cpp */,
+				002175461E9701C4008204EA /* impl_org_ortc_Helper.h */,
+				002175471E9701C4008204EA /* impl_org_ortc_Json.cpp */,
+				002175481E9701C4008204EA /* impl_org_ortc_Json.h */,
+				002175491E9701C4008204EA /* impl_org_ortc_Logger.cpp */,
+				0021754A1E9701C4008204EA /* impl_org_ortc_Logger.h */,
+				0021754B1E9701C4008204EA /* impl_org_ortc_LongRange.cpp */,
+				0021754C1E9701C4008204EA /* impl_org_ortc_LongRange.h */,
+				0021754D1E9701C4008204EA /* impl_org_ortc_MediaControl.cpp */,
+				0021754E1E9701C4008204EA /* impl_org_ortc_MediaControl.h */,
+				0021754F1E9701C4008204EA /* impl_org_ortc_MediaDeviceInfo.cpp */,
+				002175501E9701C4008204EA /* impl_org_ortc_MediaDeviceInfo.h */,
+				002175511E9701C4008204EA /* impl_org_ortc_MediaDevices.cpp */,
+				002175521E9701C4008204EA /* impl_org_ortc_MediaDevices.h */,
+				002175531E9701C4008204EA /* impl_org_ortc_MediaSource.cpp */,
+				002175541E9701C4008204EA /* impl_org_ortc_MediaSource.h */,
+				002175551E9701C4008204EA /* impl_org_ortc_MediaStreamConstraints.cpp */,
+				002175561E9701C4008204EA /* impl_org_ortc_MediaStreamConstraints.h */,
+				002175571E9701C4008204EA /* impl_org_ortc_MediaStreamTrack.cpp */,
+				002175581E9701C4008204EA /* impl_org_ortc_MediaStreamTrack.h */,
+				002175591E9701C4008204EA /* impl_org_ortc_MediaTrackCapabilities.cpp */,
+				0021755A1E9701C4008204EA /* impl_org_ortc_MediaTrackCapabilities.h */,
+				0021755B1E9701C4008204EA /* impl_org_ortc_MediaTrackConstraints.cpp */,
+				0021755C1E9701C4008204EA /* impl_org_ortc_MediaTrackConstraints.h */,
+				0021755D1E9701C4008204EA /* impl_org_ortc_MediaTrackConstraintSet.cpp */,
+				0021755E1E9701C4008204EA /* impl_org_ortc_MediaTrackConstraintSet.h */,
+				0021755F1E9701C4008204EA /* impl_org_ortc_MediaTrackSettings.cpp */,
+				002175601E9701C4008204EA /* impl_org_ortc_MediaTrackSettings.h */,
+				002175611E9701C4008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.cpp */,
+				002175621E9701C4008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.h */,
+				002175631E9701C4008204EA /* impl_org_ortc_MessageQueue.cpp */,
+				002175641E9701C4008204EA /* impl_org_ortc_MessageQueue.h */,
+				002175651E9701C4008204EA /* impl_org_ortc_OrtcLib.cpp */,
+				002175661E9701C4008204EA /* impl_org_ortc_OrtcLib.h */,
+				002175671E9701C4008204EA /* impl_org_ortc_OrtcLibWithDispatcher.cpp */,
+				002175681E9701C4008204EA /* impl_org_ortc_OrtcLibWithDispatcher.h */,
+				002175691E9701C4008204EA /* impl_org_ortc_OverconstrainedError.cpp */,
+				0021756A1E9701C4008204EA /* impl_org_ortc_OverconstrainedError.h */,
+				0021756B1E9701C4008204EA /* impl_org_ortc_OverconstrainedErrorEvent.cpp */,
+				0021756C1E9701C4008204EA /* impl_org_ortc_OverconstrainedErrorEvent.h */,
+				0021756D1E9701C4008204EA /* impl_org_ortc_RTCCertificate.cpp */,
+				0021756E1E9701C4008204EA /* impl_org_ortc_RTCCertificate.h */,
+				0021756F1E9701C4008204EA /* impl_org_ortc_RTCCertificateStats.cpp */,
+				002175701E9701C4008204EA /* impl_org_ortc_RTCCertificateStats.h */,
+				002175711E9701C4008204EA /* impl_org_ortc_RTCCodec.cpp */,
+				002175721E9701C4008204EA /* impl_org_ortc_RTCCodec.h */,
+				002175731E9701C4008204EA /* impl_org_ortc_RTCDataChannel.cpp */,
+				002175741E9701C4008204EA /* impl_org_ortc_RTCDataChannel.h */,
+				002175751E9701C4008204EA /* impl_org_ortc_RTCDataChannelEvent.cpp */,
+				002175761E9701C4008204EA /* impl_org_ortc_RTCDataChannelEvent.h */,
+				002175771E9701C4008204EA /* impl_org_ortc_RTCDataChannelParameters.cpp */,
+				002175781E9701C4008204EA /* impl_org_ortc_RTCDataChannelParameters.h */,
+				002175791E9701C4008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.cpp */,
+				0021757A1E9701C4008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.h */,
+				0021757B1E9701C4008204EA /* impl_org_ortc_RTCDataChannelStats.cpp */,
+				0021757C1E9701C4008204EA /* impl_org_ortc_RTCDataChannelStats.h */,
+				0021757D1E9701C4008204EA /* impl_org_ortc_RTCDataTransport.cpp */,
+				0021757E1E9701C4008204EA /* impl_org_ortc_RTCDataTransport.h */,
+				0021757F1E9701C4008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.cpp */,
+				002175801E9701C4008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.h */,
+				002175811E9701C4008204EA /* impl_org_ortc_RTCDtlsFingerprint.cpp */,
+				002175821E9701C4008204EA /* impl_org_ortc_RTCDtlsFingerprint.h */,
+				002175831E9701C4008204EA /* impl_org_ortc_RTCDtlsParameters.cpp */,
+				002175841E9701C4008204EA /* impl_org_ortc_RTCDtlsParameters.h */,
+				002175851E9701C4008204EA /* impl_org_ortc_RTCDtlsTransport.cpp */,
+				002175861E9701C4008204EA /* impl_org_ortc_RTCDtlsTransport.h */,
+				002175871E9701C4008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */,
+				002175881E9701C4008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.h */,
+				002175891E9701C4008204EA /* impl_org_ortc_RTCDtlsTransportStats.cpp */,
+				0021758A1E9701C4008204EA /* impl_org_ortc_RTCDtlsTransportStats.h */,
+				0021758B1E9701C4008204EA /* impl_org_ortc_RTCDtmfSender.cpp */,
+				0021758C1E9701C4008204EA /* impl_org_ortc_RTCDtmfSender.h */,
+				0021758D1E9701C4008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.cpp */,
+				0021758E1E9701C4008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.h */,
+				0021758F1E9701C4008204EA /* impl_org_ortc_RTCIceCandidate.cpp */,
+				002175901E9701C4008204EA /* impl_org_ortc_RTCIceCandidate.h */,
+				002175911E9701C4008204EA /* impl_org_ortc_RTCIceCandidateAttributes.cpp */,
+				002175921E9701C4008204EA /* impl_org_ortc_RTCIceCandidateAttributes.h */,
+				002175931E9701C5008204EA /* impl_org_ortc_RTCIceCandidateComplete.cpp */,
+				002175941E9701C5008204EA /* impl_org_ortc_RTCIceCandidateComplete.h */,
+				002175951E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePair.cpp */,
+				002175961E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePair.h */,
+				002175971E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp */,
+				002175981E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.h */,
+				002175991E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePairStats.cpp */,
+				0021759A1E9701C5008204EA /* impl_org_ortc_RTCIceCandidatePairStats.h */,
+				0021759B1E9701C5008204EA /* impl_org_ortc_RTCIceGatherer.cpp */,
+				0021759C1E9701C5008204EA /* impl_org_ortc_RTCIceGatherer.h */,
+				0021759D1E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidate.cpp */,
+				0021759E1E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidate.h */,
+				0021759F1E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */,
+				002175A01E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h */,
+				002175A11E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.cpp */,
+				002175A21E9701C5008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.h */,
+				002175A31E9701C5008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.cpp */,
+				002175A41E9701C5008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.h */,
+				002175A51E9701C5008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.cpp */,
+				002175A61E9701C5008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.h */,
+				002175A71E9701C5008204EA /* impl_org_ortc_RTCIceGathererStats.cpp */,
+				002175A81E9701C5008204EA /* impl_org_ortc_RTCIceGathererStats.h */,
+				002175A91E9701C5008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.cpp */,
+				002175AA1E9701C5008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.h */,
+				002175AB1E9701C5008204EA /* impl_org_ortc_RTCIceGatherOptions.cpp */,
+				002175AC1E9701C5008204EA /* impl_org_ortc_RTCIceGatherOptions.h */,
+				002175AD1E9701C5008204EA /* impl_org_ortc_RTCIceParameters.cpp */,
+				002175AE1E9701C5008204EA /* impl_org_ortc_RTCIceParameters.h */,
+				002175AF1E9701C5008204EA /* impl_org_ortc_RTCIceServer.cpp */,
+				002175B01E9701C5008204EA /* impl_org_ortc_RTCIceServer.h */,
+				002175B11E9701C5008204EA /* impl_org_ortc_RTCIceTransport.cpp */,
+				002175B21E9701C5008204EA /* impl_org_ortc_RTCIceTransport.h */,
+				002175B31E9701C5008204EA /* impl_org_ortc_RTCIceTransportController.cpp */,
+				002175B41E9701C5008204EA /* impl_org_ortc_RTCIceTransportController.h */,
+				002175B51E9701C5008204EA /* impl_org_ortc_RTCIceTransportOptions.cpp */,
+				002175B61E9701C5008204EA /* impl_org_ortc_RTCIceTransportOptions.h */,
+				002175B71E9701C5008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.cpp */,
+				002175B81E9701C5008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.h */,
+				002175B91E9701C5008204EA /* impl_org_ortc_RTCIceTransportStats.cpp */,
+				002175BA1E9701C5008204EA /* impl_org_ortc_RTCIceTransportStats.h */,
+				002175BB1E9701C5008204EA /* impl_org_ortc_RTCIdentity.cpp */,
+				002175BC1E9701C5008204EA /* impl_org_ortc_RTCIdentity.h */,
+				002175BD1E9701C5008204EA /* impl_org_ortc_RTCIdentityAssertion.cpp */,
+				002175BE1E9701C5008204EA /* impl_org_ortc_RTCIdentityAssertion.h */,
+				002175BF1E9701C5008204EA /* impl_org_ortc_RTCIdentityError.cpp */,
+				002175C01E9701C5008204EA /* impl_org_ortc_RTCIdentityError.h */,
+				002175C11E9701C5008204EA /* impl_org_ortc_RTCIdentityResult.cpp */,
+				002175C21E9701C5008204EA /* impl_org_ortc_RTCIdentityResult.h */,
+				002175C31E9701C5008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.cpp */,
+				002175C41E9701C5008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.h */,
+				002175C51E9701C5008204EA /* impl_org_ortc_RTCMediaStreamStats.cpp */,
+				002175C61E9701C5008204EA /* impl_org_ortc_RTCMediaStreamStats.h */,
+				002175C71E9701C5008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.cpp */,
+				002175C81E9701C5008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.h */,
+				002175C91E9701C5008204EA /* impl_org_ortc_RTCMessageEvent.cpp */,
+				002175CA1E9701C5008204EA /* impl_org_ortc_RTCMessageEvent.h */,
+				002175CB1E9701C5008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.cpp */,
+				002175CC1E9701C5008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.h */,
+				002175CD1E9701C5008204EA /* impl_org_ortc_RTCRtcpFeedback.cpp */,
+				002175CE1E9701C5008204EA /* impl_org_ortc_RTCRtcpFeedback.h */,
+				002175CF1E9701C5008204EA /* impl_org_ortc_RTCRtcpParameters.cpp */,
+				002175D01E9701C5008204EA /* impl_org_ortc_RTCRtcpParameters.h */,
+				002175D11E9701C5008204EA /* impl_org_ortc_RTCRtcpTransport.cpp */,
+				002175D21E9701C5008204EA /* impl_org_ortc_RTCRtcpTransport.h */,
+				002175D31E9701C5008204EA /* impl_org_ortc_RTCRtpCapabilities.cpp */,
+				002175D41E9701C5008204EA /* impl_org_ortc_RTCRtpCapabilities.h */,
+				002175D51E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapability.cpp */,
+				002175D61E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapability.h */,
+				002175D71E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp */,
+				002175D81E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.h */,
+				002175D91E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp */,
+				002175DA1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.h */,
+				002175DB1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecParameters.cpp */,
+				002175DC1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecParameters.h */,
+				002175DD1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.cpp */,
+				002175DE1E9701C5008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.h */,
+				002175DF1E9701C5008204EA /* impl_org_ortc_RTCRtpContributingSource.cpp */,
+				002175E01E9701C5008204EA /* impl_org_ortc_RTCRtpContributingSource.h */,
+				002175E11E9701C5008204EA /* impl_org_ortc_RTCRtpEncodingParameters.cpp */,
+				002175E21E9701C5008204EA /* impl_org_ortc_RTCRtpEncodingParameters.h */,
+				002175E31E9701C5008204EA /* impl_org_ortc_RTCRtpFecParameters.cpp */,
+				002175E41E9701C5008204EA /* impl_org_ortc_RTCRtpFecParameters.h */,
+				002175E51E9701C5008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */,
+				002175E61E9701C5008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h */,
+				002175E71E9701C5008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */,
+				002175E81E9701C5008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h */,
+				002175E91E9701C5008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */,
+				002175EA1E9701C5008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h */,
+				002175EB1E9701C5008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp */,
+				002175EC1E9701C5008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.h */,
+				002175ED1E9701C5008204EA /* impl_org_ortc_RTCRtpHeaderExtension.cpp */,
+				002175EE1E9701C5008204EA /* impl_org_ortc_RTCRtpHeaderExtension.h */,
+				002175EF1E9701C5008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp */,
+				002175F01E9701C5008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.h */,
+				002175F11E9701C5008204EA /* impl_org_ortc_RTCRtpListener.cpp */,
+				002175F21E9701C5008204EA /* impl_org_ortc_RTCRtpListener.h */,
+				002175F31E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */,
+				002175F41E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h */,
+				002175F51E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */,
+				002175F61E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h */,
+				002175F71E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */,
+				002175F81E9701C5008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.h */,
+				002175F91E9701C5008204EA /* impl_org_ortc_RTCRtpParameters.cpp */,
+				002175FA1E9701C5008204EA /* impl_org_ortc_RTCRtpParameters.h */,
+				002175FB1E9701C5008204EA /* impl_org_ortc_RTCRtpReceiver.cpp */,
+				002175FC1E9701C5008204EA /* impl_org_ortc_RTCRtpReceiver.h */,
+				002175FD1E9701C5008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp */,
+				002175FE1E9701C5008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.h */,
+				002175FF1E9701C5008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */,
+				002176001E9701C5008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h */,
+				002176011E9701C5008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */,
+				002176021E9701C5008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.h */,
+				002176031E9701C5008204EA /* impl_org_ortc_RTCRtpRtxParameters.cpp */,
+				002176041E9701C5008204EA /* impl_org_ortc_RTCRtpRtxParameters.h */,
+				002176051E9701C5008204EA /* impl_org_ortc_RTCRtpSender.cpp */,
+				002176061E9701C5008204EA /* impl_org_ortc_RTCRtpSender.h */,
+				002176071E9701C5008204EA /* impl_org_ortc_RTCRtpStreamStats.cpp */,
+				002176081E9701C6008204EA /* impl_org_ortc_RTCRtpStreamStats.h */,
+				002176091E9701C6008204EA /* impl_org_ortc_RTCRtpTransport.cpp */,
+				0021760A1E9701C6008204EA /* impl_org_ortc_RTCRtpTransport.h */,
+				0021760B1E9701C6008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.cpp */,
+				0021760C1E9701C6008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.h */,
+				0021760D1E9701C6008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */,
+				0021760E1E9701C6008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h */,
+				0021760F1E9701C6008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */,
+				002176101E9701C6008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.h */,
+				002176111E9701C6008204EA /* impl_org_ortc_RTCSctpCapabilities.cpp */,
+				002176121E9701C6008204EA /* impl_org_ortc_RTCSctpCapabilities.h */,
+				002176131E9701C6008204EA /* impl_org_ortc_RTCSctpTransport.cpp */,
+				002176141E9701C6008204EA /* impl_org_ortc_RTCSctpTransport.h */,
+				002176151E9701C6008204EA /* impl_org_ortc_RTCSctpTransportListener.cpp */,
+				002176161E9701C6008204EA /* impl_org_ortc_RTCSctpTransportListener.h */,
+				002176171E9701C6008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.cpp */,
+				002176181E9701C6008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.h */,
+				002176191E9701C6008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp */,
+				0021761A1E9701C6008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.h */,
+				0021761B1E9701C6008204EA /* impl_org_ortc_RTCSctpTransportStats.cpp */,
+				0021761C1E9701C6008204EA /* impl_org_ortc_RTCSctpTransportStats.h */,
+				0021761D1E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp */,
+				0021761E1E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.h */,
+				0021761F1E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.cpp */,
+				002176201E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.h */,
+				002176211E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesParameters.cpp */,
+				002176221E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesParameters.h */,
+				002176231E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesTransport.cpp */,
+				002176241E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesTransport.h */,
+				002176251E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */,
+				002176261E9701C6008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h */,
+				002176271E9701C6008204EA /* impl_org_ortc_RTCSrtpTransportStats.cpp */,
+				002176281E9701C6008204EA /* impl_org_ortc_RTCSrtpTransportStats.h */,
+				002176291E9701C6008204EA /* impl_org_ortc_RTCSsrcConflictEvent.cpp */,
+				0021762A1E9701C6008204EA /* impl_org_ortc_RTCSsrcConflictEvent.h */,
+				0021762B1E9701C6008204EA /* impl_org_ortc_RTCStats.cpp */,
+				0021762C1E9701C6008204EA /* impl_org_ortc_RTCStats.h */,
+				0021762D1E9701C6008204EA /* impl_org_ortc_RTCStatsProvider.cpp */,
+				0021762E1E9701C6008204EA /* impl_org_ortc_RTCStatsProvider.h */,
+				0021762F1E9701C6008204EA /* impl_org_ortc_RTCStatsReport.cpp */,
+				002176301E9701C6008204EA /* impl_org_ortc_RTCStatsReport.h */,
+				002176311E9701C6008204EA /* impl_org_ortc_RTCStatsTypeSet.cpp */,
+				002176321E9701C6008204EA /* impl_org_ortc_RTCStatsTypeSet.h */,
+				002176331E9701C6008204EA /* impl_org_ortc_Settings.cpp */,
+				002176341E9701C6008204EA /* impl_org_ortc_Settings.h */,
+				002176351E9701C6008204EA /* impl_org_ortc_StringOrStringList.cpp */,
+				002176361E9701C6008204EA /* impl_org_ortc_StringOrStringList.h */,
+				002176371E9701C6008204EA /* types.h */,
+			);
+			name = wrapper;
+			path = ../../../ortc/idl/wrapper;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		0021713C1E97017D008204EA /* ortclib-wrapper-ios */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 002171461E97017D008204EA /* Build configuration list for PBXNativeTarget "ortclib-wrapper-ios" */;
+			buildPhases = (
+				002171391E97017D008204EA /* Sources */,
+				0021713A1E97017D008204EA /* Frameworks */,
+				0021713B1E97017D008204EA /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "ortclib-wrapper-ios";
+			productName = "ortclib-wrapper-ios";
+			productReference = 0021713D1E97017D008204EA /* libortclib-wrapper-ios.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		002171351E97017D008204EA /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0830;
+				ORGANIZATIONNAME = "Open Peer Foundation";
+				TargetAttributes = {
+					0021713C1E97017D008204EA = {
+						CreatedOnToolsVersion = 8.3;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 002171381E97017D008204EA /* Build configuration list for PBXProject "ortclib-wrapper-ios" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 002171341E97017D008204EA;
+			productRefGroup = 0021713E1E97017D008204EA /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				0021713C1E97017D008204EA /* ortclib-wrapper-ios */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		002171391E97017D008204EA /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				002178071E9701C7008204EA /* impl_org_ortc_RTCSrtpTransportStats.cpp in Sources */,
+				002177CA1E9701C6008204EA /* impl_org_ortc_RTCIceParameters.cpp in Sources */,
+				002177CD1E9701C6008204EA /* impl_org_ortc_RTCIceTransportController.cpp in Sources */,
+				002177CF1E9701C6008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.cpp in Sources */,
+				002177BC1E9701C6008204EA /* impl_org_ortc_RTCIceCandidateAttributes.cpp in Sources */,
+				002177C81E9701C6008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.cpp in Sources */,
+				002177E91E9701C7008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp in Sources */,
+				002177B61E9701C6008204EA /* impl_org_ortc_RTCDtlsTransport.cpp in Sources */,
+				002177F61E9701C7008204EA /* impl_org_ortc_RTCRtpSender.cpp in Sources */,
+				002177DB1E9701C6008204EA /* impl_org_ortc_RTCRtcpParameters.cpp in Sources */,
+				0021780E1E9701C7008204EA /* impl_org_ortc_StringOrStringList.cpp in Sources */,
+				002177A41E9701C6008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.cpp in Sources */,
+				002177FB1E9701C7008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp in Sources */,
+				002177EA1E9701C7008204EA /* impl_org_ortc_RTCRtpHeaderExtension.cpp in Sources */,
+				002177751E9701C6008204EA /* impl_org_ortc_adapter_RTCIceCandidate.cpp in Sources */,
+				002177D81E9701C6008204EA /* impl_org_ortc_RTCMessageEvent.cpp in Sources */,
+				002177D31E9701C6008204EA /* impl_org_ortc_RTCIdentityError.cpp in Sources */,
+				002177741E9701C6008204EA /* impl_org_ortc_adapter_RTCConfiguration.cpp in Sources */,
+				002178051E9701C7008204EA /* impl_org_ortc_RTCSrtpSdesTransport.cpp in Sources */,
+				002177851E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp in Sources */,
+				002178011E9701C7008204EA /* impl_org_ortc_RTCSctpTransportStats.cpp in Sources */,
+				0021779E1E9701C6008204EA /* impl_org_ortc_MediaStreamConstraints.cpp in Sources */,
+				002177E01E9701C6008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp in Sources */,
+				002177BA1E9701C6008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.cpp in Sources */,
+				002177A21E9701C6008204EA /* impl_org_ortc_MediaTrackConstraintSet.cpp in Sources */,
+				002177C61E9701C6008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.cpp in Sources */,
+				002177E31E9701C7008204EA /* impl_org_ortc_RTCRtpContributingSource.cpp in Sources */,
+				002177CB1E9701C6008204EA /* impl_org_ortc_RTCIceServer.cpp in Sources */,
+				0021778F1E9701C6008204EA /* impl_org_ortc_ConstrainLongRange.cpp in Sources */,
+				002177781E9701C6008204EA /* impl_org_ortc_adapter_RTCOfferOptions.cpp in Sources */,
+				002177831E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp in Sources */,
+				002177DC1E9701C6008204EA /* impl_org_ortc_RTCRtcpTransport.cpp in Sources */,
+				0021780C1E9701C7008204EA /* impl_org_ortc_RTCStatsTypeSet.cpp in Sources */,
+				002177EC1E9701C7008204EA /* impl_org_ortc_RTCRtpListener.cpp in Sources */,
+				0021777C1E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescription.cpp in Sources */,
+				002177CC1E9701C6008204EA /* impl_org_ortc_RTCIceTransport.cpp in Sources */,
+				002177F71E9701C7008204EA /* impl_org_ortc_RTCRtpStreamStats.cpp in Sources */,
+				0021778D1E9701C6008204EA /* impl_org_ortc_ConstrainDoubleRange.cpp in Sources */,
+				002177D21E9701C6008204EA /* impl_org_ortc_RTCIdentityAssertion.cpp in Sources */,
+				0021779A1E9701C6008204EA /* impl_org_ortc_MediaControl.cpp in Sources */,
+				0021779D1E9701C6008204EA /* impl_org_ortc_MediaSource.cpp in Sources */,
+				002177FA1E9701C7008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp in Sources */,
+				002177EF1E9701C7008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp in Sources */,
+				002177D11E9701C6008204EA /* impl_org_ortc_RTCIdentity.cpp in Sources */,
+				002177C71E9701C6008204EA /* impl_org_ortc_RTCIceGathererStats.cpp in Sources */,
+				002178021E9701C7008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp in Sources */,
+				002177AC1E9701C6008204EA /* impl_org_ortc_RTCCodec.cpp in Sources */,
+				002177F11E9701C7008204EA /* impl_org_ortc_RTCRtpReceiver.cpp in Sources */,
+				002177A31E9701C6008204EA /* impl_org_ortc_MediaTrackSettings.cpp in Sources */,
+				002177A91E9701C6008204EA /* impl_org_ortc_OverconstrainedErrorEvent.cpp in Sources */,
+				002177B51E9701C6008204EA /* impl_org_ortc_RTCDtlsParameters.cpp in Sources */,
+				002177981E9701C6008204EA /* impl_org_ortc_Logger.cpp in Sources */,
+				0021778A1E9701C6008204EA /* impl_org_ortc_ConstrainBoolean.cpp in Sources */,
+				002177C91E9701C6008204EA /* impl_org_ortc_RTCIceGatherOptions.cpp in Sources */,
+				002178081E9701C7008204EA /* impl_org_ortc_RTCSsrcConflictEvent.cpp in Sources */,
+				002177891E9701C6008204EA /* impl_org_ortc_adapter_RTCTrackEvent.cpp in Sources */,
+				002177B71E9701C6008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp in Sources */,
+				002177AB1E9701C6008204EA /* impl_org_ortc_RTCCertificateStats.cpp in Sources */,
+				002177761E9701C6008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp in Sources */,
+				002177801E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp in Sources */,
+				002177FF1E9701C7008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.cpp in Sources */,
+				002177EE1E9701C7008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp in Sources */,
+				0021780B1E9701C7008204EA /* impl_org_ortc_RTCStatsReport.cpp in Sources */,
+				002177DA1E9701C6008204EA /* impl_org_ortc_RTCRtcpFeedback.cpp in Sources */,
+				002177701E9701C6008204EA /* impl_org_ortc.cpp in Sources */,
+				002178061E9701C7008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp in Sources */,
+				0021777D1E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp in Sources */,
+				002177A81E9701C6008204EA /* impl_org_ortc_OverconstrainedError.cpp in Sources */,
+				002177DF1E9701C6008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp in Sources */,
+				002177C31E9701C6008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp in Sources */,
+				002177A61E9701C6008204EA /* impl_org_ortc_OrtcLib.cpp in Sources */,
+				002177A01E9701C6008204EA /* impl_org_ortc_MediaTrackCapabilities.cpp in Sources */,
+				002177711E9701C6008204EA /* impl_org_ortc_adapter_MediaStream.cpp in Sources */,
+				002177BD1E9701C6008204EA /* impl_org_ortc_RTCIceCandidateComplete.cpp in Sources */,
+				002177C01E9701C6008204EA /* impl_org_ortc_RTCIceCandidatePairStats.cpp in Sources */,
+				002177B31E9701C6008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.cpp in Sources */,
+				002177D71E9701C6008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.cpp in Sources */,
+				0021778C1E9701C6008204EA /* impl_org_ortc_ConstrainDouble.cpp in Sources */,
+				002177BB1E9701C6008204EA /* impl_org_ortc_RTCIceCandidate.cpp in Sources */,
+				002177AA1E9701C6008204EA /* impl_org_ortc_RTCCertificate.cpp in Sources */,
+				002178001E9701C7008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp in Sources */,
+				002177F41E9701C7008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp in Sources */,
+				002177771E9701C6008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp in Sources */,
+				002177E71E9701C7008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp in Sources */,
+				002177941E9701C6008204EA /* impl_org_ortc_Error.cpp in Sources */,
+				002177991E9701C6008204EA /* impl_org_ortc_LongRange.cpp in Sources */,
+				002177ED1E9701C7008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp in Sources */,
+				002177EB1E9701C7008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp in Sources */,
+				002177E21E9701C7008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.cpp in Sources */,
+				002177B21E9701C6008204EA /* impl_org_ortc_RTCDataTransport.cpp in Sources */,
+				002177FE1E9701C7008204EA /* impl_org_ortc_RTCSctpTransportListener.cpp in Sources */,
+				002177BE1E9701C6008204EA /* impl_org_ortc_RTCIceCandidatePair.cpp in Sources */,
+				002177F81E9701C7008204EA /* impl_org_ortc_RTCRtpTransport.cpp in Sources */,
+				002177D41E9701C6008204EA /* impl_org_ortc_RTCIdentityResult.cpp in Sources */,
+				0021780D1E9701C7008204EA /* impl_org_ortc_Settings.cpp in Sources */,
+				002177B01E9701C6008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.cpp in Sources */,
+				002177F21E9701C7008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp in Sources */,
+				002177961E9701C6008204EA /* impl_org_ortc_Helper.cpp in Sources */,
+				002177721E9701C6008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.cpp in Sources */,
+				002177E41E9701C7008204EA /* impl_org_ortc_RTCRtpEncodingParameters.cpp in Sources */,
+				002177B11E9701C6008204EA /* impl_org_ortc_RTCDataChannelStats.cpp in Sources */,
+				002177911E9701C6008204EA /* impl_org_ortc_ConstrainStringParameters.cpp in Sources */,
+				002177881E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp in Sources */,
+				002177931E9701C6008204EA /* impl_org_ortc_DoubleRange.cpp in Sources */,
+				0021778B1E9701C6008204EA /* impl_org_ortc_ConstrainBooleanParameters.cpp in Sources */,
+				0021778E1E9701C6008204EA /* impl_org_ortc_ConstrainLong.cpp in Sources */,
+				002177D91E9701C6008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.cpp in Sources */,
+				0021777B1E9701C6008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp in Sources */,
+				002177C51E9701C6008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.cpp in Sources */,
+				002177D51E9701C6008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.cpp in Sources */,
+				002177E11E9701C6008204EA /* impl_org_ortc_RTCRtpCodecParameters.cpp in Sources */,
+				002177E61E9701C7008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp in Sources */,
+				0021777E1E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp in Sources */,
+				0021777A1E9701C6008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp in Sources */,
+				002177F51E9701C7008204EA /* impl_org_ortc_RTCRtpRtxParameters.cpp in Sources */,
+				002177A51E9701C6008204EA /* impl_org_ortc_MessageQueue.cpp in Sources */,
+				002177951E9701C6008204EA /* impl_org_ortc_ErrorEvent.cpp in Sources */,
+				002177D61E9701C6008204EA /* impl_org_ortc_RTCMediaStreamStats.cpp in Sources */,
+				002177E51E9701C7008204EA /* impl_org_ortc_RTCRtpFecParameters.cpp in Sources */,
+				002177E81E9701C7008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp in Sources */,
+				002177FC1E9701C7008204EA /* impl_org_ortc_RTCSctpCapabilities.cpp in Sources */,
+				002177AD1E9701C6008204EA /* impl_org_ortc_RTCDataChannel.cpp in Sources */,
+				002177901E9701C6008204EA /* impl_org_ortc_ConstrainString.cpp in Sources */,
+				002177821E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp in Sources */,
+				002177C41E9701C6008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.cpp in Sources */,
+				002177DD1E9701C6008204EA /* impl_org_ortc_RTCRtpCapabilities.cpp in Sources */,
+				002177B91E9701C6008204EA /* impl_org_ortc_RTCDtmfSender.cpp in Sources */,
+				002177B81E9701C6008204EA /* impl_org_ortc_RTCDtlsTransportStats.cpp in Sources */,
+				002177DE1E9701C6008204EA /* impl_org_ortc_RTCRtpCodecCapability.cpp in Sources */,
+				002177AE1E9701C6008204EA /* impl_org_ortc_RTCDataChannelEvent.cpp in Sources */,
+				002177F31E9701C7008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp in Sources */,
+				002177C11E9701C6008204EA /* impl_org_ortc_RTCIceGatherer.cpp in Sources */,
+				002177871E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp in Sources */,
+				002177791E9701C6008204EA /* impl_org_ortc_adapter_RTCPeerConnection.cpp in Sources */,
+				002177FD1E9701C7008204EA /* impl_org_ortc_RTCSctpTransport.cpp in Sources */,
+				0021780A1E9701C7008204EA /* impl_org_ortc_RTCStatsProvider.cpp in Sources */,
+				002178031E9701C7008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.cpp in Sources */,
+				0021779C1E9701C6008204EA /* impl_org_ortc_MediaDevices.cpp in Sources */,
+				002177F01E9701C7008204EA /* impl_org_ortc_RTCRtpParameters.cpp in Sources */,
+				002177B41E9701C6008204EA /* impl_org_ortc_RTCDtlsFingerprint.cpp in Sources */,
+				002177861E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp in Sources */,
+				002177811E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp in Sources */,
+				002177C21E9701C6008204EA /* impl_org_ortc_RTCIceGathererCandidate.cpp in Sources */,
+				002177A11E9701C6008204EA /* impl_org_ortc_MediaTrackConstraints.cpp in Sources */,
+				002177CE1E9701C6008204EA /* impl_org_ortc_RTCIceTransportOptions.cpp in Sources */,
+				002177AF1E9701C6008204EA /* impl_org_ortc_RTCDataChannelParameters.cpp in Sources */,
+				002177D01E9701C6008204EA /* impl_org_ortc_RTCIceTransportStats.cpp in Sources */,
+				0021779B1E9701C6008204EA /* impl_org_ortc_MediaDeviceInfo.cpp in Sources */,
+				002177971E9701C6008204EA /* impl_org_ortc_Json.cpp in Sources */,
+				002178091E9701C7008204EA /* impl_org_ortc_RTCStats.cpp in Sources */,
+				002177F91E9701C7008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.cpp in Sources */,
+				002178041E9701C7008204EA /* impl_org_ortc_RTCSrtpSdesParameters.cpp in Sources */,
+				002177BF1E9701C6008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp in Sources */,
+				0021777F1E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp in Sources */,
+				0021779F1E9701C6008204EA /* impl_org_ortc_MediaStreamTrack.cpp in Sources */,
+				002177731E9701C6008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.cpp in Sources */,
+				002177841E9701C6008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		002171441E97017D008204EA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../../../ortclib-cpp",
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					"../../../../zsLib-eventing",
+					../../../..,
+					../../../../../../webrtc/xplatform/webrtc,
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		002171451E97017D008204EA /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../../../ortclib-cpp",
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					"../../../../zsLib-eventing",
+					../../../..,
+					../../../../../../webrtc/xplatform/webrtc,
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		002171471E97017D008204EA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		002171481E97017D008204EA /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		002171381E97017D008204EA /* Build configuration list for PBXProject "ortclib-wrapper-ios" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				002171441E97017D008204EA /* Debug */,
+				002171451E97017D008204EA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		002171461E97017D008204EA /* Build configuration list for PBXNativeTarget "ortclib-wrapper-ios" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				002171471E97017D008204EA /* Debug */,
+				002171481E97017D008204EA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 002171351E97017D008204EA /* Project object */;
+}
diff --git a/projects/xcode/ortclib-wrapper-osx/ortclib-wrapper-osx.xcodeproj/project.pbxproj b/projects/xcode/ortclib-wrapper-osx/ortclib-wrapper-osx.xcodeproj/project.pbxproj
new file mode 100644
index 00000000..8095aaa7
--- /dev/null
+++ b/projects/xcode/ortclib-wrapper-osx/ortclib-wrapper-osx.xcodeproj/project.pbxproj
@@ -0,0 +1,1228 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		002180231E970520008204EA /* impl_org_ortc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BD71E97051D008204EA /* impl_org_ortc.cpp */; };
+		002180241E970520008204EA /* impl_org_ortc_adapter_MediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BD81E97051D008204EA /* impl_org_ortc_adapter_MediaStream.cpp */; };
+		002180261E970520008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BDA1E97051D008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.cpp */; };
+		002180281E970520008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BDC1E97051D008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.cpp */; };
+		0021802A1E970520008204EA /* impl_org_ortc_adapter_RTCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BDE1E97051D008204EA /* impl_org_ortc_adapter_RTCConfiguration.cpp */; };
+		0021802C1E970520008204EA /* impl_org_ortc_adapter_RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BE01E97051D008204EA /* impl_org_ortc_adapter_RTCIceCandidate.cpp */; };
+		0021802E1E970520008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BE21E97051D008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */; };
+		002180301E970520008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BE41E97051D008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp */; };
+		002180321E970520008204EA /* impl_org_ortc_adapter_RTCOfferOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BE61E97051D008204EA /* impl_org_ortc_adapter_RTCOfferOptions.cpp */; };
+		002180341E970520008204EA /* impl_org_ortc_adapter_RTCPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BE81E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnection.cpp */; };
+		002180361E970520008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BEA1E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */; };
+		002180381E970520008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BEC1E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */; };
+		0021803A1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BEE1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescription.cpp */; };
+		0021803C1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BF01E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */; };
+		0021803E1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BF21E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */; };
+		002180401E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BF41E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */; };
+		002180421E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BF61E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */; };
+		002180441E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BF81E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */; };
+		002180461E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BFA1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */; };
+		002180481E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BFC1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */; };
+		0021804A1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217BFE1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */; };
+		0021804C1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C001E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */; };
+		0021804E1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C021E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */; };
+		002180501E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C041E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */; };
+		002180521E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C061E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */; };
+		002180541E970520008204EA /* impl_org_ortc_adapter_RTCTrackEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C081E97051D008204EA /* impl_org_ortc_adapter_RTCTrackEvent.cpp */; };
+		002180561E970520008204EA /* impl_org_ortc_ConstrainBoolean.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C0A1E97051D008204EA /* impl_org_ortc_ConstrainBoolean.cpp */; };
+		002180581E970520008204EA /* impl_org_ortc_ConstrainBooleanParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C0C1E97051D008204EA /* impl_org_ortc_ConstrainBooleanParameters.cpp */; };
+		0021805A1E970520008204EA /* impl_org_ortc_ConstrainDouble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C0E1E97051D008204EA /* impl_org_ortc_ConstrainDouble.cpp */; };
+		0021805C1E970520008204EA /* impl_org_ortc_ConstrainDoubleRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C101E97051D008204EA /* impl_org_ortc_ConstrainDoubleRange.cpp */; };
+		0021805E1E970520008204EA /* impl_org_ortc_ConstrainLong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C121E97051D008204EA /* impl_org_ortc_ConstrainLong.cpp */; };
+		002180601E970520008204EA /* impl_org_ortc_ConstrainLongRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C141E97051D008204EA /* impl_org_ortc_ConstrainLongRange.cpp */; };
+		002180621E970520008204EA /* impl_org_ortc_ConstrainString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C161E97051D008204EA /* impl_org_ortc_ConstrainString.cpp */; };
+		002180641E970520008204EA /* impl_org_ortc_ConstrainStringParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C181E97051D008204EA /* impl_org_ortc_ConstrainStringParameters.cpp */; };
+		002180681E970520008204EA /* impl_org_ortc_DoubleRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C1C1E97051D008204EA /* impl_org_ortc_DoubleRange.cpp */; };
+		0021806A1E970520008204EA /* impl_org_ortc_Error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C1E1E97051D008204EA /* impl_org_ortc_Error.cpp */; };
+		0021806C1E970520008204EA /* impl_org_ortc_ErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C201E97051D008204EA /* impl_org_ortc_ErrorEvent.cpp */; };
+		0021806E1E970520008204EA /* impl_org_ortc_Helper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C221E97051D008204EA /* impl_org_ortc_Helper.cpp */; };
+		002180701E970520008204EA /* impl_org_ortc_Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C241E97051D008204EA /* impl_org_ortc_Json.cpp */; };
+		002180721E970520008204EA /* impl_org_ortc_Logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C261E97051D008204EA /* impl_org_ortc_Logger.cpp */; };
+		002180741E970520008204EA /* impl_org_ortc_LongRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C281E97051D008204EA /* impl_org_ortc_LongRange.cpp */; };
+		002180761E970520008204EA /* impl_org_ortc_MediaControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C2A1E97051D008204EA /* impl_org_ortc_MediaControl.cpp */; };
+		002180781E970520008204EA /* impl_org_ortc_MediaDeviceInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C2C1E97051D008204EA /* impl_org_ortc_MediaDeviceInfo.cpp */; };
+		0021807A1E970520008204EA /* impl_org_ortc_MediaDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C2E1E97051D008204EA /* impl_org_ortc_MediaDevices.cpp */; };
+		0021807C1E970520008204EA /* impl_org_ortc_MediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C301E97051D008204EA /* impl_org_ortc_MediaSource.cpp */; };
+		0021807E1E970520008204EA /* impl_org_ortc_MediaStreamConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C321E97051D008204EA /* impl_org_ortc_MediaStreamConstraints.cpp */; };
+		002180801E970520008204EA /* impl_org_ortc_MediaStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C341E97051D008204EA /* impl_org_ortc_MediaStreamTrack.cpp */; };
+		002180821E970520008204EA /* impl_org_ortc_MediaTrackCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C361E97051D008204EA /* impl_org_ortc_MediaTrackCapabilities.cpp */; };
+		002180841E970520008204EA /* impl_org_ortc_MediaTrackConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C381E97051D008204EA /* impl_org_ortc_MediaTrackConstraints.cpp */; };
+		002180861E970520008204EA /* impl_org_ortc_MediaTrackConstraintSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C3A1E97051D008204EA /* impl_org_ortc_MediaTrackConstraintSet.cpp */; };
+		002180881E970520008204EA /* impl_org_ortc_MediaTrackSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C3C1E97051D008204EA /* impl_org_ortc_MediaTrackSettings.cpp */; };
+		0021808A1E970520008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C3E1E97051D008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.cpp */; };
+		0021808C1E970520008204EA /* impl_org_ortc_MessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C401E97051D008204EA /* impl_org_ortc_MessageQueue.cpp */; };
+		0021808E1E970520008204EA /* impl_org_ortc_OrtcLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C421E97051D008204EA /* impl_org_ortc_OrtcLib.cpp */; };
+		002180921E970520008204EA /* impl_org_ortc_OverconstrainedError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C461E97051D008204EA /* impl_org_ortc_OverconstrainedError.cpp */; };
+		002180941E970520008204EA /* impl_org_ortc_OverconstrainedErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C481E97051D008204EA /* impl_org_ortc_OverconstrainedErrorEvent.cpp */; };
+		002180961E970520008204EA /* impl_org_ortc_RTCCertificate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C4A1E97051D008204EA /* impl_org_ortc_RTCCertificate.cpp */; };
+		002180981E970520008204EA /* impl_org_ortc_RTCCertificateStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C4C1E97051D008204EA /* impl_org_ortc_RTCCertificateStats.cpp */; };
+		0021809A1E970520008204EA /* impl_org_ortc_RTCCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C4E1E97051D008204EA /* impl_org_ortc_RTCCodec.cpp */; };
+		0021809C1E970520008204EA /* impl_org_ortc_RTCDataChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C501E97051D008204EA /* impl_org_ortc_RTCDataChannel.cpp */; };
+		0021809E1E970520008204EA /* impl_org_ortc_RTCDataChannelEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C521E97051D008204EA /* impl_org_ortc_RTCDataChannelEvent.cpp */; };
+		002180A01E970520008204EA /* impl_org_ortc_RTCDataChannelParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C541E97051D008204EA /* impl_org_ortc_RTCDataChannelParameters.cpp */; };
+		002180A21E970520008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C561E97051E008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.cpp */; };
+		002180A41E970520008204EA /* impl_org_ortc_RTCDataChannelStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C581E97051E008204EA /* impl_org_ortc_RTCDataChannelStats.cpp */; };
+		002180A61E970520008204EA /* impl_org_ortc_RTCDataTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C5A1E97051E008204EA /* impl_org_ortc_RTCDataTransport.cpp */; };
+		002180A81E970520008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C5C1E97051E008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.cpp */; };
+		002180AA1E970520008204EA /* impl_org_ortc_RTCDtlsFingerprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C5E1E97051E008204EA /* impl_org_ortc_RTCDtlsFingerprint.cpp */; };
+		002180AC1E970520008204EA /* impl_org_ortc_RTCDtlsParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C601E97051E008204EA /* impl_org_ortc_RTCDtlsParameters.cpp */; };
+		002180AE1E970520008204EA /* impl_org_ortc_RTCDtlsTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C621E97051E008204EA /* impl_org_ortc_RTCDtlsTransport.cpp */; };
+		002180B01E970520008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C641E97051E008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */; };
+		002180B21E970520008204EA /* impl_org_ortc_RTCDtlsTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C661E97051E008204EA /* impl_org_ortc_RTCDtlsTransportStats.cpp */; };
+		002180B41E970520008204EA /* impl_org_ortc_RTCDtmfSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C681E97051E008204EA /* impl_org_ortc_RTCDtmfSender.cpp */; };
+		002180B61E970520008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C6A1E97051E008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.cpp */; };
+		002180B81E970520008204EA /* impl_org_ortc_RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C6C1E97051E008204EA /* impl_org_ortc_RTCIceCandidate.cpp */; };
+		002180BA1E970520008204EA /* impl_org_ortc_RTCIceCandidateAttributes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C6E1E97051E008204EA /* impl_org_ortc_RTCIceCandidateAttributes.cpp */; };
+		002180BC1E970520008204EA /* impl_org_ortc_RTCIceCandidateComplete.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C701E97051E008204EA /* impl_org_ortc_RTCIceCandidateComplete.cpp */; };
+		002180BE1E970520008204EA /* impl_org_ortc_RTCIceCandidatePair.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C721E97051E008204EA /* impl_org_ortc_RTCIceCandidatePair.cpp */; };
+		002180C01E970520008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C741E97051E008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp */; };
+		002180C21E970520008204EA /* impl_org_ortc_RTCIceCandidatePairStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C761E97051E008204EA /* impl_org_ortc_RTCIceCandidatePairStats.cpp */; };
+		002180C41E970520008204EA /* impl_org_ortc_RTCIceGatherer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C781E97051E008204EA /* impl_org_ortc_RTCIceGatherer.cpp */; };
+		002180C61E970520008204EA /* impl_org_ortc_RTCIceGathererCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C7A1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidate.cpp */; };
+		002180C81E970520008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C7C1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */; };
+		002180CA1E970520008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C7E1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.cpp */; };
+		002180CC1E970520008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C801E97051E008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.cpp */; };
+		002180CE1E970520008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C821E97051E008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.cpp */; };
+		002180D01E970520008204EA /* impl_org_ortc_RTCIceGathererStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C841E97051E008204EA /* impl_org_ortc_RTCIceGathererStats.cpp */; };
+		002180D21E970520008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C861E97051E008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.cpp */; };
+		002180D41E970520008204EA /* impl_org_ortc_RTCIceGatherOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C881E97051E008204EA /* impl_org_ortc_RTCIceGatherOptions.cpp */; };
+		002180D61E970520008204EA /* impl_org_ortc_RTCIceParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C8A1E97051E008204EA /* impl_org_ortc_RTCIceParameters.cpp */; };
+		002180D81E970520008204EA /* impl_org_ortc_RTCIceServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C8C1E97051E008204EA /* impl_org_ortc_RTCIceServer.cpp */; };
+		002180DA1E970520008204EA /* impl_org_ortc_RTCIceTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C8E1E97051E008204EA /* impl_org_ortc_RTCIceTransport.cpp */; };
+		002180DC1E970520008204EA /* impl_org_ortc_RTCIceTransportController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C901E97051E008204EA /* impl_org_ortc_RTCIceTransportController.cpp */; };
+		002180DE1E970520008204EA /* impl_org_ortc_RTCIceTransportOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C921E97051E008204EA /* impl_org_ortc_RTCIceTransportOptions.cpp */; };
+		002180E01E970520008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C941E97051E008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.cpp */; };
+		002180E21E970520008204EA /* impl_org_ortc_RTCIceTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C961E97051E008204EA /* impl_org_ortc_RTCIceTransportStats.cpp */; };
+		002180E41E970520008204EA /* impl_org_ortc_RTCIdentity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C981E97051E008204EA /* impl_org_ortc_RTCIdentity.cpp */; };
+		002180E61E970520008204EA /* impl_org_ortc_RTCIdentityAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C9A1E97051E008204EA /* impl_org_ortc_RTCIdentityAssertion.cpp */; };
+		002180E81E970520008204EA /* impl_org_ortc_RTCIdentityError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C9C1E97051E008204EA /* impl_org_ortc_RTCIdentityError.cpp */; };
+		002180EA1E970520008204EA /* impl_org_ortc_RTCIdentityResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217C9E1E97051E008204EA /* impl_org_ortc_RTCIdentityResult.cpp */; };
+		002180EC1E970520008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CA01E97051E008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.cpp */; };
+		002180EE1E970520008204EA /* impl_org_ortc_RTCMediaStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CA21E97051E008204EA /* impl_org_ortc_RTCMediaStreamStats.cpp */; };
+		002180F01E970520008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CA41E97051E008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.cpp */; };
+		002180F21E970520008204EA /* impl_org_ortc_RTCMessageEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CA61E97051E008204EA /* impl_org_ortc_RTCMessageEvent.cpp */; };
+		002180F41E970520008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CA81E97051E008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.cpp */; };
+		002180F61E970520008204EA /* impl_org_ortc_RTCRtcpFeedback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CAA1E97051E008204EA /* impl_org_ortc_RTCRtcpFeedback.cpp */; };
+		002180F81E970520008204EA /* impl_org_ortc_RTCRtcpParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CAC1E97051E008204EA /* impl_org_ortc_RTCRtcpParameters.cpp */; };
+		002180FA1E970520008204EA /* impl_org_ortc_RTCRtcpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CAE1E97051E008204EA /* impl_org_ortc_RTCRtcpTransport.cpp */; };
+		002180FC1E970520008204EA /* impl_org_ortc_RTCRtpCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CB01E97051E008204EA /* impl_org_ortc_RTCRtpCapabilities.cpp */; };
+		002180FE1E970520008204EA /* impl_org_ortc_RTCRtpCodecCapability.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CB21E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapability.cpp */; };
+		002181001E970520008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CB41E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp */; };
+		002181021E970520008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CB61E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp */; };
+		002181041E970520008204EA /* impl_org_ortc_RTCRtpCodecParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CB81E97051E008204EA /* impl_org_ortc_RTCRtpCodecParameters.cpp */; };
+		002181061E970520008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CBA1E97051E008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.cpp */; };
+		002181081E970520008204EA /* impl_org_ortc_RTCRtpContributingSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CBC1E97051E008204EA /* impl_org_ortc_RTCRtpContributingSource.cpp */; };
+		0021810A1E970520008204EA /* impl_org_ortc_RTCRtpEncodingParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CBE1E97051E008204EA /* impl_org_ortc_RTCRtpEncodingParameters.cpp */; };
+		0021810C1E970520008204EA /* impl_org_ortc_RTCRtpFecParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CC01E97051E008204EA /* impl_org_ortc_RTCRtpFecParameters.cpp */; };
+		0021810E1E970520008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CC21E97051E008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */; };
+		002181101E970520008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CC41E97051E008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */; };
+		002181121E970520008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CC61E97051E008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */; };
+		002181141E970520008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CC81E97051E008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp */; };
+		002181161E970520008204EA /* impl_org_ortc_RTCRtpHeaderExtension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CCA1E97051E008204EA /* impl_org_ortc_RTCRtpHeaderExtension.cpp */; };
+		002181181E970520008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CCC1E97051F008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp */; };
+		0021811A1E970520008204EA /* impl_org_ortc_RTCRtpListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CCE1E97051F008204EA /* impl_org_ortc_RTCRtpListener.cpp */; };
+		0021811C1E970520008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CD01E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */; };
+		0021811E1E970520008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CD21E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */; };
+		002181201E970520008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CD41E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */; };
+		002181221E970520008204EA /* impl_org_ortc_RTCRtpParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CD61E97051F008204EA /* impl_org_ortc_RTCRtpParameters.cpp */; };
+		002181241E970520008204EA /* impl_org_ortc_RTCRtpReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CD81E97051F008204EA /* impl_org_ortc_RTCRtpReceiver.cpp */; };
+		002181261E970520008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CDA1E97051F008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp */; };
+		002181281E970520008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CDC1E97051F008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */; };
+		0021812A1E970520008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CDE1E97051F008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */; };
+		0021812C1E970520008204EA /* impl_org_ortc_RTCRtpRtxParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CE01E97051F008204EA /* impl_org_ortc_RTCRtpRtxParameters.cpp */; };
+		0021812E1E970520008204EA /* impl_org_ortc_RTCRtpSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CE21E97051F008204EA /* impl_org_ortc_RTCRtpSender.cpp */; };
+		002181301E970520008204EA /* impl_org_ortc_RTCRtpStreamStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CE41E97051F008204EA /* impl_org_ortc_RTCRtpStreamStats.cpp */; };
+		002181321E970520008204EA /* impl_org_ortc_RTCRtpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CE61E97051F008204EA /* impl_org_ortc_RTCRtpTransport.cpp */; };
+		002181341E970520008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CE81E97051F008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.cpp */; };
+		002181361E970520008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CEA1E97051F008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */; };
+		002181381E970520008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CEC1E97051F008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */; };
+		0021813A1E970520008204EA /* impl_org_ortc_RTCSctpCapabilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CEE1E97051F008204EA /* impl_org_ortc_RTCSctpCapabilities.cpp */; };
+		0021813C1E970520008204EA /* impl_org_ortc_RTCSctpTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CF01E97051F008204EA /* impl_org_ortc_RTCSctpTransport.cpp */; };
+		0021813E1E970520008204EA /* impl_org_ortc_RTCSctpTransportListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CF21E97051F008204EA /* impl_org_ortc_RTCSctpTransportListener.cpp */; };
+		002181401E970520008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CF41E97051F008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.cpp */; };
+		002181421E970520008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CF61E97051F008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp */; };
+		002181441E970520008204EA /* impl_org_ortc_RTCSctpTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CF81E97051F008204EA /* impl_org_ortc_RTCSctpTransportStats.cpp */; };
+		002181461E970520008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CFA1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp */; };
+		002181481E970520008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CFC1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.cpp */; };
+		0021814A1E970520008204EA /* impl_org_ortc_RTCSrtpSdesParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217CFE1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesParameters.cpp */; };
+		0021814C1E970520008204EA /* impl_org_ortc_RTCSrtpSdesTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217D001E97051F008204EA /* impl_org_ortc_RTCSrtpSdesTransport.cpp */; };
+		0021814E1E970520008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217D021E97051F008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */; };
+		002181501E970520008204EA /* impl_org_ortc_RTCSrtpTransportStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217D041E97051F008204EA /* impl_org_ortc_RTCSrtpTransportStats.cpp */; };
+		002181521E970520008204EA /* impl_org_ortc_RTCSsrcConflictEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217D061E97051F008204EA /* impl_org_ortc_RTCSsrcConflictEvent.cpp */; };
+		002181541E970520008204EA /* impl_org_ortc_RTCStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217D081E97051F008204EA /* impl_org_ortc_RTCStats.cpp */; };
+		002181561E970520008204EA /* impl_org_ortc_RTCStatsProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217D0A1E97051F008204EA /* impl_org_ortc_RTCStatsProvider.cpp */; };
+		002181581E970520008204EA /* impl_org_ortc_RTCStatsReport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217D0C1E97051F008204EA /* impl_org_ortc_RTCStatsReport.cpp */; };
+		0021815A1E970521008204EA /* impl_org_ortc_RTCStatsTypeSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217D0E1E97051F008204EA /* impl_org_ortc_RTCStatsTypeSet.cpp */; };
+		0021815C1E970521008204EA /* impl_org_ortc_Settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217D101E97051F008204EA /* impl_org_ortc_Settings.cpp */; };
+		0021815E1E970521008204EA /* impl_org_ortc_StringOrStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00217D121E97051F008204EA /* impl_org_ortc_StringOrStringList.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		002178181E9704E2008204EA /* libortclib-wrapper-osx.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libortclib-wrapper-osx.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		00217BD71E97051D008204EA /* impl_org_ortc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc.cpp; sourceTree = "<group>"; };
+		00217BD81E97051D008204EA /* impl_org_ortc_adapter_MediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_MediaStream.cpp; sourceTree = "<group>"; };
+		00217BD91E97051D008204EA /* impl_org_ortc_adapter_MediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_MediaStream.h; sourceTree = "<group>"; };
+		00217BDA1E97051D008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCAnswerOptions.cpp; sourceTree = "<group>"; };
+		00217BDB1E97051D008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCAnswerOptions.h; sourceTree = "<group>"; };
+		00217BDC1E97051D008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCCapabilityOptions.cpp; sourceTree = "<group>"; };
+		00217BDD1E97051D008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCCapabilityOptions.h; sourceTree = "<group>"; };
+		00217BDE1E97051D008204EA /* impl_org_ortc_adapter_RTCConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCConfiguration.cpp; sourceTree = "<group>"; };
+		00217BDF1E97051D008204EA /* impl_org_ortc_adapter_RTCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCConfiguration.h; sourceTree = "<group>"; };
+		00217BE01E97051D008204EA /* impl_org_ortc_adapter_RTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCIceCandidate.cpp; sourceTree = "<group>"; };
+		00217BE11E97051D008204EA /* impl_org_ortc_adapter_RTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCIceCandidate.h; sourceTree = "<group>"; };
+		00217BE21E97051D008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp; sourceTree = "<group>"; };
+		00217BE31E97051D008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h; sourceTree = "<group>"; };
+		00217BE41E97051D008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp; sourceTree = "<group>"; };
+		00217BE51E97051D008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCOfferAnswerOptions.h; sourceTree = "<group>"; };
+		00217BE61E97051D008204EA /* impl_org_ortc_adapter_RTCOfferOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCOfferOptions.cpp; sourceTree = "<group>"; };
+		00217BE71E97051D008204EA /* impl_org_ortc_adapter_RTCOfferOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCOfferOptions.h; sourceTree = "<group>"; };
+		00217BE81E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCPeerConnection.cpp; sourceTree = "<group>"; };
+		00217BE91E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCPeerConnection.h; sourceTree = "<group>"; };
+		00217BEA1E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp; sourceTree = "<group>"; };
+		00217BEB1E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h; sourceTree = "<group>"; };
+		00217BEC1E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp; sourceTree = "<group>"; };
+		00217BED1E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h; sourceTree = "<group>"; };
+		00217BEE1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescription.cpp; sourceTree = "<group>"; };
+		00217BEF1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescription.h; sourceTree = "<group>"; };
+		00217BF01E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp; sourceTree = "<group>"; };
+		00217BF11E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h; sourceTree = "<group>"; };
+		00217BF21E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp; sourceTree = "<group>"; };
+		00217BF31E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h; sourceTree = "<group>"; };
+		00217BF41E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp; sourceTree = "<group>"; };
+		00217BF51E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionDescription.h; sourceTree = "<group>"; };
+		00217BF61E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp; sourceTree = "<group>"; };
+		00217BF71E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h; sourceTree = "<group>"; };
+		00217BF81E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp; sourceTree = "<group>"; };
+		00217BF91E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h; sourceTree = "<group>"; };
+		00217BFA1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp; sourceTree = "<group>"; };
+		00217BFB1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h; sourceTree = "<group>"; };
+		00217BFC1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp; sourceTree = "<group>"; };
+		00217BFD1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h; sourceTree = "<group>"; };
+		00217BFE1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp; sourceTree = "<group>"; };
+		00217BFF1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h; sourceTree = "<group>"; };
+		00217C001E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp; sourceTree = "<group>"; };
+		00217C011E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h; sourceTree = "<group>"; };
+		00217C021E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp; sourceTree = "<group>"; };
+		00217C031E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h; sourceTree = "<group>"; };
+		00217C041E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp; sourceTree = "<group>"; };
+		00217C051E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionTransport.h; sourceTree = "<group>"; };
+		00217C061E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp; sourceTree = "<group>"; };
+		00217C071E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h; sourceTree = "<group>"; };
+		00217C081E97051D008204EA /* impl_org_ortc_adapter_RTCTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_adapter_RTCTrackEvent.cpp; sourceTree = "<group>"; };
+		00217C091E97051D008204EA /* impl_org_ortc_adapter_RTCTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_adapter_RTCTrackEvent.h; sourceTree = "<group>"; };
+		00217C0A1E97051D008204EA /* impl_org_ortc_ConstrainBoolean.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainBoolean.cpp; sourceTree = "<group>"; };
+		00217C0B1E97051D008204EA /* impl_org_ortc_ConstrainBoolean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainBoolean.h; sourceTree = "<group>"; };
+		00217C0C1E97051D008204EA /* impl_org_ortc_ConstrainBooleanParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainBooleanParameters.cpp; sourceTree = "<group>"; };
+		00217C0D1E97051D008204EA /* impl_org_ortc_ConstrainBooleanParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainBooleanParameters.h; sourceTree = "<group>"; };
+		00217C0E1E97051D008204EA /* impl_org_ortc_ConstrainDouble.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainDouble.cpp; sourceTree = "<group>"; };
+		00217C0F1E97051D008204EA /* impl_org_ortc_ConstrainDouble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainDouble.h; sourceTree = "<group>"; };
+		00217C101E97051D008204EA /* impl_org_ortc_ConstrainDoubleRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainDoubleRange.cpp; sourceTree = "<group>"; };
+		00217C111E97051D008204EA /* impl_org_ortc_ConstrainDoubleRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainDoubleRange.h; sourceTree = "<group>"; };
+		00217C121E97051D008204EA /* impl_org_ortc_ConstrainLong.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainLong.cpp; sourceTree = "<group>"; };
+		00217C131E97051D008204EA /* impl_org_ortc_ConstrainLong.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainLong.h; sourceTree = "<group>"; };
+		00217C141E97051D008204EA /* impl_org_ortc_ConstrainLongRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainLongRange.cpp; sourceTree = "<group>"; };
+		00217C151E97051D008204EA /* impl_org_ortc_ConstrainLongRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainLongRange.h; sourceTree = "<group>"; };
+		00217C161E97051D008204EA /* impl_org_ortc_ConstrainString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainString.cpp; sourceTree = "<group>"; };
+		00217C171E97051D008204EA /* impl_org_ortc_ConstrainString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainString.h; sourceTree = "<group>"; };
+		00217C181E97051D008204EA /* impl_org_ortc_ConstrainStringParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ConstrainStringParameters.cpp; sourceTree = "<group>"; };
+		00217C191E97051D008204EA /* impl_org_ortc_ConstrainStringParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ConstrainStringParameters.h; sourceTree = "<group>"; };
+		00217C1A1E97051D008204EA /* impl_org_ortc_Dispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Dispatcher.cpp; sourceTree = "<group>"; };
+		00217C1B1E97051D008204EA /* impl_org_ortc_Dispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Dispatcher.h; sourceTree = "<group>"; };
+		00217C1C1E97051D008204EA /* impl_org_ortc_DoubleRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_DoubleRange.cpp; sourceTree = "<group>"; };
+		00217C1D1E97051D008204EA /* impl_org_ortc_DoubleRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_DoubleRange.h; sourceTree = "<group>"; };
+		00217C1E1E97051D008204EA /* impl_org_ortc_Error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Error.cpp; sourceTree = "<group>"; };
+		00217C1F1E97051D008204EA /* impl_org_ortc_Error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Error.h; sourceTree = "<group>"; };
+		00217C201E97051D008204EA /* impl_org_ortc_ErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_ErrorEvent.cpp; sourceTree = "<group>"; };
+		00217C211E97051D008204EA /* impl_org_ortc_ErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_ErrorEvent.h; sourceTree = "<group>"; };
+		00217C221E97051D008204EA /* impl_org_ortc_Helper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Helper.cpp; sourceTree = "<group>"; };
+		00217C231E97051D008204EA /* impl_org_ortc_Helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Helper.h; sourceTree = "<group>"; };
+		00217C241E97051D008204EA /* impl_org_ortc_Json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Json.cpp; sourceTree = "<group>"; };
+		00217C251E97051D008204EA /* impl_org_ortc_Json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Json.h; sourceTree = "<group>"; };
+		00217C261E97051D008204EA /* impl_org_ortc_Logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Logger.cpp; sourceTree = "<group>"; };
+		00217C271E97051D008204EA /* impl_org_ortc_Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Logger.h; sourceTree = "<group>"; };
+		00217C281E97051D008204EA /* impl_org_ortc_LongRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_LongRange.cpp; sourceTree = "<group>"; };
+		00217C291E97051D008204EA /* impl_org_ortc_LongRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_LongRange.h; sourceTree = "<group>"; };
+		00217C2A1E97051D008204EA /* impl_org_ortc_MediaControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaControl.cpp; sourceTree = "<group>"; };
+		00217C2B1E97051D008204EA /* impl_org_ortc_MediaControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaControl.h; sourceTree = "<group>"; };
+		00217C2C1E97051D008204EA /* impl_org_ortc_MediaDeviceInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaDeviceInfo.cpp; sourceTree = "<group>"; };
+		00217C2D1E97051D008204EA /* impl_org_ortc_MediaDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaDeviceInfo.h; sourceTree = "<group>"; };
+		00217C2E1E97051D008204EA /* impl_org_ortc_MediaDevices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaDevices.cpp; sourceTree = "<group>"; };
+		00217C2F1E97051D008204EA /* impl_org_ortc_MediaDevices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaDevices.h; sourceTree = "<group>"; };
+		00217C301E97051D008204EA /* impl_org_ortc_MediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaSource.cpp; sourceTree = "<group>"; };
+		00217C311E97051D008204EA /* impl_org_ortc_MediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaSource.h; sourceTree = "<group>"; };
+		00217C321E97051D008204EA /* impl_org_ortc_MediaStreamConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaStreamConstraints.cpp; sourceTree = "<group>"; };
+		00217C331E97051D008204EA /* impl_org_ortc_MediaStreamConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaStreamConstraints.h; sourceTree = "<group>"; };
+		00217C341E97051D008204EA /* impl_org_ortc_MediaStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaStreamTrack.cpp; sourceTree = "<group>"; };
+		00217C351E97051D008204EA /* impl_org_ortc_MediaStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaStreamTrack.h; sourceTree = "<group>"; };
+		00217C361E97051D008204EA /* impl_org_ortc_MediaTrackCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaTrackCapabilities.cpp; sourceTree = "<group>"; };
+		00217C371E97051D008204EA /* impl_org_ortc_MediaTrackCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaTrackCapabilities.h; sourceTree = "<group>"; };
+		00217C381E97051D008204EA /* impl_org_ortc_MediaTrackConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaTrackConstraints.cpp; sourceTree = "<group>"; };
+		00217C391E97051D008204EA /* impl_org_ortc_MediaTrackConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaTrackConstraints.h; sourceTree = "<group>"; };
+		00217C3A1E97051D008204EA /* impl_org_ortc_MediaTrackConstraintSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaTrackConstraintSet.cpp; sourceTree = "<group>"; };
+		00217C3B1E97051D008204EA /* impl_org_ortc_MediaTrackConstraintSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaTrackConstraintSet.h; sourceTree = "<group>"; };
+		00217C3C1E97051D008204EA /* impl_org_ortc_MediaTrackSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaTrackSettings.cpp; sourceTree = "<group>"; };
+		00217C3D1E97051D008204EA /* impl_org_ortc_MediaTrackSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaTrackSettings.h; sourceTree = "<group>"; };
+		00217C3E1E97051D008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MediaTrackSupportedConstraints.cpp; sourceTree = "<group>"; };
+		00217C3F1E97051D008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MediaTrackSupportedConstraints.h; sourceTree = "<group>"; };
+		00217C401E97051D008204EA /* impl_org_ortc_MessageQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_MessageQueue.cpp; sourceTree = "<group>"; };
+		00217C411E97051D008204EA /* impl_org_ortc_MessageQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_MessageQueue.h; sourceTree = "<group>"; };
+		00217C421E97051D008204EA /* impl_org_ortc_OrtcLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_OrtcLib.cpp; sourceTree = "<group>"; };
+		00217C431E97051D008204EA /* impl_org_ortc_OrtcLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_OrtcLib.h; sourceTree = "<group>"; };
+		00217C441E97051D008204EA /* impl_org_ortc_OrtcLibWithDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_OrtcLibWithDispatcher.cpp; sourceTree = "<group>"; };
+		00217C451E97051D008204EA /* impl_org_ortc_OrtcLibWithDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_OrtcLibWithDispatcher.h; sourceTree = "<group>"; };
+		00217C461E97051D008204EA /* impl_org_ortc_OverconstrainedError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_OverconstrainedError.cpp; sourceTree = "<group>"; };
+		00217C471E97051D008204EA /* impl_org_ortc_OverconstrainedError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_OverconstrainedError.h; sourceTree = "<group>"; };
+		00217C481E97051D008204EA /* impl_org_ortc_OverconstrainedErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_OverconstrainedErrorEvent.cpp; sourceTree = "<group>"; };
+		00217C491E97051D008204EA /* impl_org_ortc_OverconstrainedErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_OverconstrainedErrorEvent.h; sourceTree = "<group>"; };
+		00217C4A1E97051D008204EA /* impl_org_ortc_RTCCertificate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCCertificate.cpp; sourceTree = "<group>"; };
+		00217C4B1E97051D008204EA /* impl_org_ortc_RTCCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCCertificate.h; sourceTree = "<group>"; };
+		00217C4C1E97051D008204EA /* impl_org_ortc_RTCCertificateStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCCertificateStats.cpp; sourceTree = "<group>"; };
+		00217C4D1E97051D008204EA /* impl_org_ortc_RTCCertificateStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCCertificateStats.h; sourceTree = "<group>"; };
+		00217C4E1E97051D008204EA /* impl_org_ortc_RTCCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCCodec.cpp; sourceTree = "<group>"; };
+		00217C4F1E97051D008204EA /* impl_org_ortc_RTCCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCCodec.h; sourceTree = "<group>"; };
+		00217C501E97051D008204EA /* impl_org_ortc_RTCDataChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataChannel.cpp; sourceTree = "<group>"; };
+		00217C511E97051D008204EA /* impl_org_ortc_RTCDataChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataChannel.h; sourceTree = "<group>"; };
+		00217C521E97051D008204EA /* impl_org_ortc_RTCDataChannelEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataChannelEvent.cpp; sourceTree = "<group>"; };
+		00217C531E97051D008204EA /* impl_org_ortc_RTCDataChannelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataChannelEvent.h; sourceTree = "<group>"; };
+		00217C541E97051D008204EA /* impl_org_ortc_RTCDataChannelParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataChannelParameters.cpp; sourceTree = "<group>"; };
+		00217C551E97051D008204EA /* impl_org_ortc_RTCDataChannelParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataChannelParameters.h; sourceTree = "<group>"; };
+		00217C561E97051E008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataChannelStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00217C571E97051E008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataChannelStateChangeEvent.h; sourceTree = "<group>"; };
+		00217C581E97051E008204EA /* impl_org_ortc_RTCDataChannelStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataChannelStats.cpp; sourceTree = "<group>"; };
+		00217C591E97051E008204EA /* impl_org_ortc_RTCDataChannelStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataChannelStats.h; sourceTree = "<group>"; };
+		00217C5A1E97051E008204EA /* impl_org_ortc_RTCDataTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDataTransport.cpp; sourceTree = "<group>"; };
+		00217C5B1E97051E008204EA /* impl_org_ortc_RTCDataTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDataTransport.h; sourceTree = "<group>"; };
+		00217C5C1E97051E008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsCertificateBinary.cpp; sourceTree = "<group>"; };
+		00217C5D1E97051E008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsCertificateBinary.h; sourceTree = "<group>"; };
+		00217C5E1E97051E008204EA /* impl_org_ortc_RTCDtlsFingerprint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsFingerprint.cpp; sourceTree = "<group>"; };
+		00217C5F1E97051E008204EA /* impl_org_ortc_RTCDtlsFingerprint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsFingerprint.h; sourceTree = "<group>"; };
+		00217C601E97051E008204EA /* impl_org_ortc_RTCDtlsParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsParameters.cpp; sourceTree = "<group>"; };
+		00217C611E97051E008204EA /* impl_org_ortc_RTCDtlsParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsParameters.h; sourceTree = "<group>"; };
+		00217C621E97051E008204EA /* impl_org_ortc_RTCDtlsTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsTransport.cpp; sourceTree = "<group>"; };
+		00217C631E97051E008204EA /* impl_org_ortc_RTCDtlsTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsTransport.h; sourceTree = "<group>"; };
+		00217C641E97051E008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00217C651E97051E008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		00217C661E97051E008204EA /* impl_org_ortc_RTCDtlsTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtlsTransportStats.cpp; sourceTree = "<group>"; };
+		00217C671E97051E008204EA /* impl_org_ortc_RTCDtlsTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtlsTransportStats.h; sourceTree = "<group>"; };
+		00217C681E97051E008204EA /* impl_org_ortc_RTCDtmfSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtmfSender.cpp; sourceTree = "<group>"; };
+		00217C691E97051E008204EA /* impl_org_ortc_RTCDtmfSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtmfSender.h; sourceTree = "<group>"; };
+		00217C6A1E97051E008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCDtmfToneChangeEvent.cpp; sourceTree = "<group>"; };
+		00217C6B1E97051E008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCDtmfToneChangeEvent.h; sourceTree = "<group>"; };
+		00217C6C1E97051E008204EA /* impl_org_ortc_RTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidate.cpp; sourceTree = "<group>"; };
+		00217C6D1E97051E008204EA /* impl_org_ortc_RTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidate.h; sourceTree = "<group>"; };
+		00217C6E1E97051E008204EA /* impl_org_ortc_RTCIceCandidateAttributes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidateAttributes.cpp; sourceTree = "<group>"; };
+		00217C6F1E97051E008204EA /* impl_org_ortc_RTCIceCandidateAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidateAttributes.h; sourceTree = "<group>"; };
+		00217C701E97051E008204EA /* impl_org_ortc_RTCIceCandidateComplete.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidateComplete.cpp; sourceTree = "<group>"; };
+		00217C711E97051E008204EA /* impl_org_ortc_RTCIceCandidateComplete.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidateComplete.h; sourceTree = "<group>"; };
+		00217C721E97051E008204EA /* impl_org_ortc_RTCIceCandidatePair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidatePair.cpp; sourceTree = "<group>"; };
+		00217C731E97051E008204EA /* impl_org_ortc_RTCIceCandidatePair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidatePair.h; sourceTree = "<group>"; };
+		00217C741E97051E008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp; sourceTree = "<group>"; };
+		00217C751E97051E008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidatePairChangeEvent.h; sourceTree = "<group>"; };
+		00217C761E97051E008204EA /* impl_org_ortc_RTCIceCandidatePairStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceCandidatePairStats.cpp; sourceTree = "<group>"; };
+		00217C771E97051E008204EA /* impl_org_ortc_RTCIceCandidatePairStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceCandidatePairStats.h; sourceTree = "<group>"; };
+		00217C781E97051E008204EA /* impl_org_ortc_RTCIceGatherer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGatherer.cpp; sourceTree = "<group>"; };
+		00217C791E97051E008204EA /* impl_org_ortc_RTCIceGatherer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGatherer.h; sourceTree = "<group>"; };
+		00217C7A1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererCandidate.cpp; sourceTree = "<group>"; };
+		00217C7B1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererCandidate.h; sourceTree = "<group>"; };
+		00217C7C1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp; sourceTree = "<group>"; };
+		00217C7D1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h; sourceTree = "<group>"; };
+		00217C7E1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererCandidateEvent.cpp; sourceTree = "<group>"; };
+		00217C7F1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererCandidateEvent.h; sourceTree = "<group>"; };
+		00217C801E97051E008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererIceErrorEvent.cpp; sourceTree = "<group>"; };
+		00217C811E97051E008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererIceErrorEvent.h; sourceTree = "<group>"; };
+		00217C821E97051E008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00217C831E97051E008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererStateChangeEvent.h; sourceTree = "<group>"; };
+		00217C841E97051E008204EA /* impl_org_ortc_RTCIceGathererStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGathererStats.cpp; sourceTree = "<group>"; };
+		00217C851E97051E008204EA /* impl_org_ortc_RTCIceGathererStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGathererStats.h; sourceTree = "<group>"; };
+		00217C861E97051E008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGatherInterfacePolicy.cpp; sourceTree = "<group>"; };
+		00217C871E97051E008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGatherInterfacePolicy.h; sourceTree = "<group>"; };
+		00217C881E97051E008204EA /* impl_org_ortc_RTCIceGatherOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceGatherOptions.cpp; sourceTree = "<group>"; };
+		00217C891E97051E008204EA /* impl_org_ortc_RTCIceGatherOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceGatherOptions.h; sourceTree = "<group>"; };
+		00217C8A1E97051E008204EA /* impl_org_ortc_RTCIceParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceParameters.cpp; sourceTree = "<group>"; };
+		00217C8B1E97051E008204EA /* impl_org_ortc_RTCIceParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceParameters.h; sourceTree = "<group>"; };
+		00217C8C1E97051E008204EA /* impl_org_ortc_RTCIceServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceServer.cpp; sourceTree = "<group>"; };
+		00217C8D1E97051E008204EA /* impl_org_ortc_RTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceServer.h; sourceTree = "<group>"; };
+		00217C8E1E97051E008204EA /* impl_org_ortc_RTCIceTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceTransport.cpp; sourceTree = "<group>"; };
+		00217C8F1E97051E008204EA /* impl_org_ortc_RTCIceTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceTransport.h; sourceTree = "<group>"; };
+		00217C901E97051E008204EA /* impl_org_ortc_RTCIceTransportController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceTransportController.cpp; sourceTree = "<group>"; };
+		00217C911E97051E008204EA /* impl_org_ortc_RTCIceTransportController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceTransportController.h; sourceTree = "<group>"; };
+		00217C921E97051E008204EA /* impl_org_ortc_RTCIceTransportOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceTransportOptions.cpp; sourceTree = "<group>"; };
+		00217C931E97051E008204EA /* impl_org_ortc_RTCIceTransportOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceTransportOptions.h; sourceTree = "<group>"; };
+		00217C941E97051E008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00217C951E97051E008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		00217C961E97051E008204EA /* impl_org_ortc_RTCIceTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIceTransportStats.cpp; sourceTree = "<group>"; };
+		00217C971E97051E008204EA /* impl_org_ortc_RTCIceTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIceTransportStats.h; sourceTree = "<group>"; };
+		00217C981E97051E008204EA /* impl_org_ortc_RTCIdentity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIdentity.cpp; sourceTree = "<group>"; };
+		00217C991E97051E008204EA /* impl_org_ortc_RTCIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIdentity.h; sourceTree = "<group>"; };
+		00217C9A1E97051E008204EA /* impl_org_ortc_RTCIdentityAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIdentityAssertion.cpp; sourceTree = "<group>"; };
+		00217C9B1E97051E008204EA /* impl_org_ortc_RTCIdentityAssertion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIdentityAssertion.h; sourceTree = "<group>"; };
+		00217C9C1E97051E008204EA /* impl_org_ortc_RTCIdentityError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIdentityError.cpp; sourceTree = "<group>"; };
+		00217C9D1E97051E008204EA /* impl_org_ortc_RTCIdentityError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIdentityError.h; sourceTree = "<group>"; };
+		00217C9E1E97051E008204EA /* impl_org_ortc_RTCIdentityResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCIdentityResult.cpp; sourceTree = "<group>"; };
+		00217C9F1E97051E008204EA /* impl_org_ortc_RTCIdentityResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCIdentityResult.h; sourceTree = "<group>"; };
+		00217CA01E97051E008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCInboundRtpStreamStats.cpp; sourceTree = "<group>"; };
+		00217CA11E97051E008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCInboundRtpStreamStats.h; sourceTree = "<group>"; };
+		00217CA21E97051E008204EA /* impl_org_ortc_RTCMediaStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCMediaStreamStats.cpp; sourceTree = "<group>"; };
+		00217CA31E97051E008204EA /* impl_org_ortc_RTCMediaStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCMediaStreamStats.h; sourceTree = "<group>"; };
+		00217CA41E97051E008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCMediaStreamTrackStats.cpp; sourceTree = "<group>"; };
+		00217CA51E97051E008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCMediaStreamTrackStats.h; sourceTree = "<group>"; };
+		00217CA61E97051E008204EA /* impl_org_ortc_RTCMessageEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCMessageEvent.cpp; sourceTree = "<group>"; };
+		00217CA71E97051E008204EA /* impl_org_ortc_RTCMessageEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCMessageEvent.h; sourceTree = "<group>"; };
+		00217CA81E97051E008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCOutboundRtpStreamStats.cpp; sourceTree = "<group>"; };
+		00217CA91E97051E008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCOutboundRtpStreamStats.h; sourceTree = "<group>"; };
+		00217CAA1E97051E008204EA /* impl_org_ortc_RTCRtcpFeedback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtcpFeedback.cpp; sourceTree = "<group>"; };
+		00217CAB1E97051E008204EA /* impl_org_ortc_RTCRtcpFeedback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtcpFeedback.h; sourceTree = "<group>"; };
+		00217CAC1E97051E008204EA /* impl_org_ortc_RTCRtcpParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtcpParameters.cpp; sourceTree = "<group>"; };
+		00217CAD1E97051E008204EA /* impl_org_ortc_RTCRtcpParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtcpParameters.h; sourceTree = "<group>"; };
+		00217CAE1E97051E008204EA /* impl_org_ortc_RTCRtcpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtcpTransport.cpp; sourceTree = "<group>"; };
+		00217CAF1E97051E008204EA /* impl_org_ortc_RTCRtcpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtcpTransport.h; sourceTree = "<group>"; };
+		00217CB01E97051E008204EA /* impl_org_ortc_RTCRtpCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCapabilities.cpp; sourceTree = "<group>"; };
+		00217CB11E97051E008204EA /* impl_org_ortc_RTCRtpCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCapabilities.h; sourceTree = "<group>"; };
+		00217CB21E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapability.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCodecCapability.cpp; sourceTree = "<group>"; };
+		00217CB31E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCodecCapability.h; sourceTree = "<group>"; };
+		00217CB41E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp; sourceTree = "<group>"; };
+		00217CB51E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCodecCapabilityOptions.h; sourceTree = "<group>"; };
+		00217CB61E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00217CB71E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00217CB81E97051E008204EA /* impl_org_ortc_RTCRtpCodecParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCodecParameters.cpp; sourceTree = "<group>"; };
+		00217CB91E97051E008204EA /* impl_org_ortc_RTCRtpCodecParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCodecParameters.h; sourceTree = "<group>"; };
+		00217CBA1E97051E008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00217CBB1E97051E008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpCodecParameterSettings.h; sourceTree = "<group>"; };
+		00217CBC1E97051E008204EA /* impl_org_ortc_RTCRtpContributingSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpContributingSource.cpp; sourceTree = "<group>"; };
+		00217CBD1E97051E008204EA /* impl_org_ortc_RTCRtpContributingSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpContributingSource.h; sourceTree = "<group>"; };
+		00217CBE1E97051E008204EA /* impl_org_ortc_RTCRtpEncodingParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpEncodingParameters.cpp; sourceTree = "<group>"; };
+		00217CBF1E97051E008204EA /* impl_org_ortc_RTCRtpEncodingParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpEncodingParameters.h; sourceTree = "<group>"; };
+		00217CC01E97051E008204EA /* impl_org_ortc_RTCRtpFecParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpFecParameters.cpp; sourceTree = "<group>"; };
+		00217CC11E97051E008204EA /* impl_org_ortc_RTCRtpFecParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpFecParameters.h; sourceTree = "<group>"; };
+		00217CC21E97051E008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00217CC31E97051E008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00217CC41E97051E008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00217CC51E97051E008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h; sourceTree = "<group>"; };
+		00217CC61E97051E008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00217CC71E97051E008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00217CC81E97051E008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00217CC91E97051E008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpH264CodecParameterSettings.h; sourceTree = "<group>"; };
+		00217CCA1E97051E008204EA /* impl_org_ortc_RTCRtpHeaderExtension.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpHeaderExtension.cpp; sourceTree = "<group>"; };
+		00217CCB1E97051E008204EA /* impl_org_ortc_RTCRtpHeaderExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpHeaderExtension.h; sourceTree = "<group>"; };
+		00217CCC1E97051F008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp; sourceTree = "<group>"; };
+		00217CCD1E97051F008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpHeaderExtensionParameters.h; sourceTree = "<group>"; };
+		00217CCE1E97051F008204EA /* impl_org_ortc_RTCRtpListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpListener.cpp; sourceTree = "<group>"; };
+		00217CCF1E97051F008204EA /* impl_org_ortc_RTCRtpListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpListener.h; sourceTree = "<group>"; };
+		00217CD01E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp; sourceTree = "<group>"; };
+		00217CD11E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h; sourceTree = "<group>"; };
+		00217CD21E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00217CD31E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00217CD41E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00217CD51E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpOpusCodecParameterSettings.h; sourceTree = "<group>"; };
+		00217CD61E97051F008204EA /* impl_org_ortc_RTCRtpParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpParameters.cpp; sourceTree = "<group>"; };
+		00217CD71E97051F008204EA /* impl_org_ortc_RTCRtpParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpParameters.h; sourceTree = "<group>"; };
+		00217CD81E97051F008204EA /* impl_org_ortc_RTCRtpReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpReceiver.cpp; sourceTree = "<group>"; };
+		00217CD91E97051F008204EA /* impl_org_ortc_RTCRtpReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpReceiver.h; sourceTree = "<group>"; };
+		00217CDA1E97051F008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00217CDB1E97051F008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpRedCodecParameterSettings.h; sourceTree = "<group>"; };
+		00217CDC1E97051F008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00217CDD1E97051F008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00217CDE1E97051F008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00217CDF1E97051F008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpRtxCodecParameterSettings.h; sourceTree = "<group>"; };
+		00217CE01E97051F008204EA /* impl_org_ortc_RTCRtpRtxParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpRtxParameters.cpp; sourceTree = "<group>"; };
+		00217CE11E97051F008204EA /* impl_org_ortc_RTCRtpRtxParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpRtxParameters.h; sourceTree = "<group>"; };
+		00217CE21E97051F008204EA /* impl_org_ortc_RTCRtpSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpSender.cpp; sourceTree = "<group>"; };
+		00217CE31E97051F008204EA /* impl_org_ortc_RTCRtpSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpSender.h; sourceTree = "<group>"; };
+		00217CE41E97051F008204EA /* impl_org_ortc_RTCRtpStreamStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpStreamStats.cpp; sourceTree = "<group>"; };
+		00217CE51E97051F008204EA /* impl_org_ortc_RTCRtpStreamStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpStreamStats.h; sourceTree = "<group>"; };
+		00217CE61E97051F008204EA /* impl_org_ortc_RTCRtpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpTransport.cpp; sourceTree = "<group>"; };
+		00217CE71E97051F008204EA /* impl_org_ortc_RTCRtpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpTransport.h; sourceTree = "<group>"; };
+		00217CE81E97051F008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpUnhandledEvent.cpp; sourceTree = "<group>"; };
+		00217CE91E97051F008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpUnhandledEvent.h; sourceTree = "<group>"; };
+		00217CEA1E97051F008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp; sourceTree = "<group>"; };
+		00217CEB1E97051F008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h; sourceTree = "<group>"; };
+		00217CEC1E97051F008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp; sourceTree = "<group>"; };
+		00217CED1E97051F008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCRtpVp8CodecParameterSettings.h; sourceTree = "<group>"; };
+		00217CEE1E97051F008204EA /* impl_org_ortc_RTCSctpCapabilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpCapabilities.cpp; sourceTree = "<group>"; };
+		00217CEF1E97051F008204EA /* impl_org_ortc_RTCSctpCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpCapabilities.h; sourceTree = "<group>"; };
+		00217CF01E97051F008204EA /* impl_org_ortc_RTCSctpTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpTransport.cpp; sourceTree = "<group>"; };
+		00217CF11E97051F008204EA /* impl_org_ortc_RTCSctpTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpTransport.h; sourceTree = "<group>"; };
+		00217CF21E97051F008204EA /* impl_org_ortc_RTCSctpTransportListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpTransportListener.cpp; sourceTree = "<group>"; };
+		00217CF31E97051F008204EA /* impl_org_ortc_RTCSctpTransportListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpTransportListener.h; sourceTree = "<group>"; };
+		00217CF41E97051F008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpTransportListenerEvent.cpp; sourceTree = "<group>"; };
+		00217CF51E97051F008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpTransportListenerEvent.h; sourceTree = "<group>"; };
+		00217CF61E97051F008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp; sourceTree = "<group>"; };
+		00217CF71E97051F008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpTransportStateChangeEvent.h; sourceTree = "<group>"; };
+		00217CF81E97051F008204EA /* impl_org_ortc_RTCSctpTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSctpTransportStats.cpp; sourceTree = "<group>"; };
+		00217CF91E97051F008204EA /* impl_org_ortc_RTCSctpTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSctpTransportStats.h; sourceTree = "<group>"; };
+		00217CFA1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp; sourceTree = "<group>"; };
+		00217CFB1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpSdesCryptoParameters.h; sourceTree = "<group>"; };
+		00217CFC1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpSdesKeyParameters.cpp; sourceTree = "<group>"; };
+		00217CFD1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpSdesKeyParameters.h; sourceTree = "<group>"; };
+		00217CFE1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpSdesParameters.cpp; sourceTree = "<group>"; };
+		00217CFF1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpSdesParameters.h; sourceTree = "<group>"; };
+		00217D001E97051F008204EA /* impl_org_ortc_RTCSrtpSdesTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpSdesTransport.cpp; sourceTree = "<group>"; };
+		00217D011E97051F008204EA /* impl_org_ortc_RTCSrtpSdesTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpSdesTransport.h; sourceTree = "<group>"; };
+		00217D021E97051F008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp; sourceTree = "<group>"; };
+		00217D031E97051F008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h; sourceTree = "<group>"; };
+		00217D041E97051F008204EA /* impl_org_ortc_RTCSrtpTransportStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSrtpTransportStats.cpp; sourceTree = "<group>"; };
+		00217D051E97051F008204EA /* impl_org_ortc_RTCSrtpTransportStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSrtpTransportStats.h; sourceTree = "<group>"; };
+		00217D061E97051F008204EA /* impl_org_ortc_RTCSsrcConflictEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCSsrcConflictEvent.cpp; sourceTree = "<group>"; };
+		00217D071E97051F008204EA /* impl_org_ortc_RTCSsrcConflictEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCSsrcConflictEvent.h; sourceTree = "<group>"; };
+		00217D081E97051F008204EA /* impl_org_ortc_RTCStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCStats.cpp; sourceTree = "<group>"; };
+		00217D091E97051F008204EA /* impl_org_ortc_RTCStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCStats.h; sourceTree = "<group>"; };
+		00217D0A1E97051F008204EA /* impl_org_ortc_RTCStatsProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCStatsProvider.cpp; sourceTree = "<group>"; };
+		00217D0B1E97051F008204EA /* impl_org_ortc_RTCStatsProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCStatsProvider.h; sourceTree = "<group>"; };
+		00217D0C1E97051F008204EA /* impl_org_ortc_RTCStatsReport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCStatsReport.cpp; sourceTree = "<group>"; };
+		00217D0D1E97051F008204EA /* impl_org_ortc_RTCStatsReport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCStatsReport.h; sourceTree = "<group>"; };
+		00217D0E1E97051F008204EA /* impl_org_ortc_RTCStatsTypeSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_RTCStatsTypeSet.cpp; sourceTree = "<group>"; };
+		00217D0F1E97051F008204EA /* impl_org_ortc_RTCStatsTypeSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_RTCStatsTypeSet.h; sourceTree = "<group>"; };
+		00217D101E97051F008204EA /* impl_org_ortc_Settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_Settings.cpp; sourceTree = "<group>"; };
+		00217D111E97051F008204EA /* impl_org_ortc_Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_Settings.h; sourceTree = "<group>"; };
+		00217D121E97051F008204EA /* impl_org_ortc_StringOrStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = impl_org_ortc_StringOrStringList.cpp; sourceTree = "<group>"; };
+		00217D131E97051F008204EA /* impl_org_ortc_StringOrStringList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = impl_org_ortc_StringOrStringList.h; sourceTree = "<group>"; };
+		00217D141E97051F008204EA /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		002178151E9704E2008204EA /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		0021780F1E9704E2008204EA = {
+			isa = PBXGroup;
+			children = (
+				002178261E97051A008204EA /* wrapper */,
+				002178191E9704E2008204EA /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		002178191E9704E2008204EA /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				002178181E9704E2008204EA /* libortclib-wrapper-osx.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		002178261E97051A008204EA /* wrapper */ = {
+			isa = PBXGroup;
+			children = (
+				00217BD71E97051D008204EA /* impl_org_ortc.cpp */,
+				00217BD81E97051D008204EA /* impl_org_ortc_adapter_MediaStream.cpp */,
+				00217BD91E97051D008204EA /* impl_org_ortc_adapter_MediaStream.h */,
+				00217BDA1E97051D008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.cpp */,
+				00217BDB1E97051D008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.h */,
+				00217BDC1E97051D008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.cpp */,
+				00217BDD1E97051D008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.h */,
+				00217BDE1E97051D008204EA /* impl_org_ortc_adapter_RTCConfiguration.cpp */,
+				00217BDF1E97051D008204EA /* impl_org_ortc_adapter_RTCConfiguration.h */,
+				00217BE01E97051D008204EA /* impl_org_ortc_adapter_RTCIceCandidate.cpp */,
+				00217BE11E97051D008204EA /* impl_org_ortc_adapter_RTCIceCandidate.h */,
+				00217BE21E97051D008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp */,
+				00217BE31E97051D008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.h */,
+				00217BE41E97051D008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp */,
+				00217BE51E97051D008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.h */,
+				00217BE61E97051D008204EA /* impl_org_ortc_adapter_RTCOfferOptions.cpp */,
+				00217BE71E97051D008204EA /* impl_org_ortc_adapter_RTCOfferOptions.h */,
+				00217BE81E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnection.cpp */,
+				00217BE91E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnection.h */,
+				00217BEA1E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp */,
+				00217BEB1E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.h */,
+				00217BEC1E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp */,
+				00217BED1E97051D008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.h */,
+				00217BEE1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescription.cpp */,
+				00217BEF1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescription.h */,
+				00217BF01E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp */,
+				00217BF11E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.h */,
+				00217BF21E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp */,
+				00217BF31E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.h */,
+				00217BF41E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp */,
+				00217BF51E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.h */,
+				00217BF61E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp */,
+				00217BF71E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.h */,
+				00217BF81E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp */,
+				00217BF91E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.h */,
+				00217BFA1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp */,
+				00217BFB1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.h */,
+				00217BFC1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp */,
+				00217BFD1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.h */,
+				00217BFE1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp */,
+				00217BFF1E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.h */,
+				00217C001E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp */,
+				00217C011E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.h */,
+				00217C021E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp */,
+				00217C031E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.h */,
+				00217C041E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp */,
+				00217C051E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.h */,
+				00217C061E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp */,
+				00217C071E97051D008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.h */,
+				00217C081E97051D008204EA /* impl_org_ortc_adapter_RTCTrackEvent.cpp */,
+				00217C091E97051D008204EA /* impl_org_ortc_adapter_RTCTrackEvent.h */,
+				00217C0A1E97051D008204EA /* impl_org_ortc_ConstrainBoolean.cpp */,
+				00217C0B1E97051D008204EA /* impl_org_ortc_ConstrainBoolean.h */,
+				00217C0C1E97051D008204EA /* impl_org_ortc_ConstrainBooleanParameters.cpp */,
+				00217C0D1E97051D008204EA /* impl_org_ortc_ConstrainBooleanParameters.h */,
+				00217C0E1E97051D008204EA /* impl_org_ortc_ConstrainDouble.cpp */,
+				00217C0F1E97051D008204EA /* impl_org_ortc_ConstrainDouble.h */,
+				00217C101E97051D008204EA /* impl_org_ortc_ConstrainDoubleRange.cpp */,
+				00217C111E97051D008204EA /* impl_org_ortc_ConstrainDoubleRange.h */,
+				00217C121E97051D008204EA /* impl_org_ortc_ConstrainLong.cpp */,
+				00217C131E97051D008204EA /* impl_org_ortc_ConstrainLong.h */,
+				00217C141E97051D008204EA /* impl_org_ortc_ConstrainLongRange.cpp */,
+				00217C151E97051D008204EA /* impl_org_ortc_ConstrainLongRange.h */,
+				00217C161E97051D008204EA /* impl_org_ortc_ConstrainString.cpp */,
+				00217C171E97051D008204EA /* impl_org_ortc_ConstrainString.h */,
+				00217C181E97051D008204EA /* impl_org_ortc_ConstrainStringParameters.cpp */,
+				00217C191E97051D008204EA /* impl_org_ortc_ConstrainStringParameters.h */,
+				00217C1A1E97051D008204EA /* impl_org_ortc_Dispatcher.cpp */,
+				00217C1B1E97051D008204EA /* impl_org_ortc_Dispatcher.h */,
+				00217C1C1E97051D008204EA /* impl_org_ortc_DoubleRange.cpp */,
+				00217C1D1E97051D008204EA /* impl_org_ortc_DoubleRange.h */,
+				00217C1E1E97051D008204EA /* impl_org_ortc_Error.cpp */,
+				00217C1F1E97051D008204EA /* impl_org_ortc_Error.h */,
+				00217C201E97051D008204EA /* impl_org_ortc_ErrorEvent.cpp */,
+				00217C211E97051D008204EA /* impl_org_ortc_ErrorEvent.h */,
+				00217C221E97051D008204EA /* impl_org_ortc_Helper.cpp */,
+				00217C231E97051D008204EA /* impl_org_ortc_Helper.h */,
+				00217C241E97051D008204EA /* impl_org_ortc_Json.cpp */,
+				00217C251E97051D008204EA /* impl_org_ortc_Json.h */,
+				00217C261E97051D008204EA /* impl_org_ortc_Logger.cpp */,
+				00217C271E97051D008204EA /* impl_org_ortc_Logger.h */,
+				00217C281E97051D008204EA /* impl_org_ortc_LongRange.cpp */,
+				00217C291E97051D008204EA /* impl_org_ortc_LongRange.h */,
+				00217C2A1E97051D008204EA /* impl_org_ortc_MediaControl.cpp */,
+				00217C2B1E97051D008204EA /* impl_org_ortc_MediaControl.h */,
+				00217C2C1E97051D008204EA /* impl_org_ortc_MediaDeviceInfo.cpp */,
+				00217C2D1E97051D008204EA /* impl_org_ortc_MediaDeviceInfo.h */,
+				00217C2E1E97051D008204EA /* impl_org_ortc_MediaDevices.cpp */,
+				00217C2F1E97051D008204EA /* impl_org_ortc_MediaDevices.h */,
+				00217C301E97051D008204EA /* impl_org_ortc_MediaSource.cpp */,
+				00217C311E97051D008204EA /* impl_org_ortc_MediaSource.h */,
+				00217C321E97051D008204EA /* impl_org_ortc_MediaStreamConstraints.cpp */,
+				00217C331E97051D008204EA /* impl_org_ortc_MediaStreamConstraints.h */,
+				00217C341E97051D008204EA /* impl_org_ortc_MediaStreamTrack.cpp */,
+				00217C351E97051D008204EA /* impl_org_ortc_MediaStreamTrack.h */,
+				00217C361E97051D008204EA /* impl_org_ortc_MediaTrackCapabilities.cpp */,
+				00217C371E97051D008204EA /* impl_org_ortc_MediaTrackCapabilities.h */,
+				00217C381E97051D008204EA /* impl_org_ortc_MediaTrackConstraints.cpp */,
+				00217C391E97051D008204EA /* impl_org_ortc_MediaTrackConstraints.h */,
+				00217C3A1E97051D008204EA /* impl_org_ortc_MediaTrackConstraintSet.cpp */,
+				00217C3B1E97051D008204EA /* impl_org_ortc_MediaTrackConstraintSet.h */,
+				00217C3C1E97051D008204EA /* impl_org_ortc_MediaTrackSettings.cpp */,
+				00217C3D1E97051D008204EA /* impl_org_ortc_MediaTrackSettings.h */,
+				00217C3E1E97051D008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.cpp */,
+				00217C3F1E97051D008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.h */,
+				00217C401E97051D008204EA /* impl_org_ortc_MessageQueue.cpp */,
+				00217C411E97051D008204EA /* impl_org_ortc_MessageQueue.h */,
+				00217C421E97051D008204EA /* impl_org_ortc_OrtcLib.cpp */,
+				00217C431E97051D008204EA /* impl_org_ortc_OrtcLib.h */,
+				00217C441E97051D008204EA /* impl_org_ortc_OrtcLibWithDispatcher.cpp */,
+				00217C451E97051D008204EA /* impl_org_ortc_OrtcLibWithDispatcher.h */,
+				00217C461E97051D008204EA /* impl_org_ortc_OverconstrainedError.cpp */,
+				00217C471E97051D008204EA /* impl_org_ortc_OverconstrainedError.h */,
+				00217C481E97051D008204EA /* impl_org_ortc_OverconstrainedErrorEvent.cpp */,
+				00217C491E97051D008204EA /* impl_org_ortc_OverconstrainedErrorEvent.h */,
+				00217C4A1E97051D008204EA /* impl_org_ortc_RTCCertificate.cpp */,
+				00217C4B1E97051D008204EA /* impl_org_ortc_RTCCertificate.h */,
+				00217C4C1E97051D008204EA /* impl_org_ortc_RTCCertificateStats.cpp */,
+				00217C4D1E97051D008204EA /* impl_org_ortc_RTCCertificateStats.h */,
+				00217C4E1E97051D008204EA /* impl_org_ortc_RTCCodec.cpp */,
+				00217C4F1E97051D008204EA /* impl_org_ortc_RTCCodec.h */,
+				00217C501E97051D008204EA /* impl_org_ortc_RTCDataChannel.cpp */,
+				00217C511E97051D008204EA /* impl_org_ortc_RTCDataChannel.h */,
+				00217C521E97051D008204EA /* impl_org_ortc_RTCDataChannelEvent.cpp */,
+				00217C531E97051D008204EA /* impl_org_ortc_RTCDataChannelEvent.h */,
+				00217C541E97051D008204EA /* impl_org_ortc_RTCDataChannelParameters.cpp */,
+				00217C551E97051D008204EA /* impl_org_ortc_RTCDataChannelParameters.h */,
+				00217C561E97051E008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.cpp */,
+				00217C571E97051E008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.h */,
+				00217C581E97051E008204EA /* impl_org_ortc_RTCDataChannelStats.cpp */,
+				00217C591E97051E008204EA /* impl_org_ortc_RTCDataChannelStats.h */,
+				00217C5A1E97051E008204EA /* impl_org_ortc_RTCDataTransport.cpp */,
+				00217C5B1E97051E008204EA /* impl_org_ortc_RTCDataTransport.h */,
+				00217C5C1E97051E008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.cpp */,
+				00217C5D1E97051E008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.h */,
+				00217C5E1E97051E008204EA /* impl_org_ortc_RTCDtlsFingerprint.cpp */,
+				00217C5F1E97051E008204EA /* impl_org_ortc_RTCDtlsFingerprint.h */,
+				00217C601E97051E008204EA /* impl_org_ortc_RTCDtlsParameters.cpp */,
+				00217C611E97051E008204EA /* impl_org_ortc_RTCDtlsParameters.h */,
+				00217C621E97051E008204EA /* impl_org_ortc_RTCDtlsTransport.cpp */,
+				00217C631E97051E008204EA /* impl_org_ortc_RTCDtlsTransport.h */,
+				00217C641E97051E008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp */,
+				00217C651E97051E008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.h */,
+				00217C661E97051E008204EA /* impl_org_ortc_RTCDtlsTransportStats.cpp */,
+				00217C671E97051E008204EA /* impl_org_ortc_RTCDtlsTransportStats.h */,
+				00217C681E97051E008204EA /* impl_org_ortc_RTCDtmfSender.cpp */,
+				00217C691E97051E008204EA /* impl_org_ortc_RTCDtmfSender.h */,
+				00217C6A1E97051E008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.cpp */,
+				00217C6B1E97051E008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.h */,
+				00217C6C1E97051E008204EA /* impl_org_ortc_RTCIceCandidate.cpp */,
+				00217C6D1E97051E008204EA /* impl_org_ortc_RTCIceCandidate.h */,
+				00217C6E1E97051E008204EA /* impl_org_ortc_RTCIceCandidateAttributes.cpp */,
+				00217C6F1E97051E008204EA /* impl_org_ortc_RTCIceCandidateAttributes.h */,
+				00217C701E97051E008204EA /* impl_org_ortc_RTCIceCandidateComplete.cpp */,
+				00217C711E97051E008204EA /* impl_org_ortc_RTCIceCandidateComplete.h */,
+				00217C721E97051E008204EA /* impl_org_ortc_RTCIceCandidatePair.cpp */,
+				00217C731E97051E008204EA /* impl_org_ortc_RTCIceCandidatePair.h */,
+				00217C741E97051E008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp */,
+				00217C751E97051E008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.h */,
+				00217C761E97051E008204EA /* impl_org_ortc_RTCIceCandidatePairStats.cpp */,
+				00217C771E97051E008204EA /* impl_org_ortc_RTCIceCandidatePairStats.h */,
+				00217C781E97051E008204EA /* impl_org_ortc_RTCIceGatherer.cpp */,
+				00217C791E97051E008204EA /* impl_org_ortc_RTCIceGatherer.h */,
+				00217C7A1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidate.cpp */,
+				00217C7B1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidate.h */,
+				00217C7C1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp */,
+				00217C7D1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.h */,
+				00217C7E1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.cpp */,
+				00217C7F1E97051E008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.h */,
+				00217C801E97051E008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.cpp */,
+				00217C811E97051E008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.h */,
+				00217C821E97051E008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.cpp */,
+				00217C831E97051E008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.h */,
+				00217C841E97051E008204EA /* impl_org_ortc_RTCIceGathererStats.cpp */,
+				00217C851E97051E008204EA /* impl_org_ortc_RTCIceGathererStats.h */,
+				00217C861E97051E008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.cpp */,
+				00217C871E97051E008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.h */,
+				00217C881E97051E008204EA /* impl_org_ortc_RTCIceGatherOptions.cpp */,
+				00217C891E97051E008204EA /* impl_org_ortc_RTCIceGatherOptions.h */,
+				00217C8A1E97051E008204EA /* impl_org_ortc_RTCIceParameters.cpp */,
+				00217C8B1E97051E008204EA /* impl_org_ortc_RTCIceParameters.h */,
+				00217C8C1E97051E008204EA /* impl_org_ortc_RTCIceServer.cpp */,
+				00217C8D1E97051E008204EA /* impl_org_ortc_RTCIceServer.h */,
+				00217C8E1E97051E008204EA /* impl_org_ortc_RTCIceTransport.cpp */,
+				00217C8F1E97051E008204EA /* impl_org_ortc_RTCIceTransport.h */,
+				00217C901E97051E008204EA /* impl_org_ortc_RTCIceTransportController.cpp */,
+				00217C911E97051E008204EA /* impl_org_ortc_RTCIceTransportController.h */,
+				00217C921E97051E008204EA /* impl_org_ortc_RTCIceTransportOptions.cpp */,
+				00217C931E97051E008204EA /* impl_org_ortc_RTCIceTransportOptions.h */,
+				00217C941E97051E008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.cpp */,
+				00217C951E97051E008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.h */,
+				00217C961E97051E008204EA /* impl_org_ortc_RTCIceTransportStats.cpp */,
+				00217C971E97051E008204EA /* impl_org_ortc_RTCIceTransportStats.h */,
+				00217C981E97051E008204EA /* impl_org_ortc_RTCIdentity.cpp */,
+				00217C991E97051E008204EA /* impl_org_ortc_RTCIdentity.h */,
+				00217C9A1E97051E008204EA /* impl_org_ortc_RTCIdentityAssertion.cpp */,
+				00217C9B1E97051E008204EA /* impl_org_ortc_RTCIdentityAssertion.h */,
+				00217C9C1E97051E008204EA /* impl_org_ortc_RTCIdentityError.cpp */,
+				00217C9D1E97051E008204EA /* impl_org_ortc_RTCIdentityError.h */,
+				00217C9E1E97051E008204EA /* impl_org_ortc_RTCIdentityResult.cpp */,
+				00217C9F1E97051E008204EA /* impl_org_ortc_RTCIdentityResult.h */,
+				00217CA01E97051E008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.cpp */,
+				00217CA11E97051E008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.h */,
+				00217CA21E97051E008204EA /* impl_org_ortc_RTCMediaStreamStats.cpp */,
+				00217CA31E97051E008204EA /* impl_org_ortc_RTCMediaStreamStats.h */,
+				00217CA41E97051E008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.cpp */,
+				00217CA51E97051E008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.h */,
+				00217CA61E97051E008204EA /* impl_org_ortc_RTCMessageEvent.cpp */,
+				00217CA71E97051E008204EA /* impl_org_ortc_RTCMessageEvent.h */,
+				00217CA81E97051E008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.cpp */,
+				00217CA91E97051E008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.h */,
+				00217CAA1E97051E008204EA /* impl_org_ortc_RTCRtcpFeedback.cpp */,
+				00217CAB1E97051E008204EA /* impl_org_ortc_RTCRtcpFeedback.h */,
+				00217CAC1E97051E008204EA /* impl_org_ortc_RTCRtcpParameters.cpp */,
+				00217CAD1E97051E008204EA /* impl_org_ortc_RTCRtcpParameters.h */,
+				00217CAE1E97051E008204EA /* impl_org_ortc_RTCRtcpTransport.cpp */,
+				00217CAF1E97051E008204EA /* impl_org_ortc_RTCRtcpTransport.h */,
+				00217CB01E97051E008204EA /* impl_org_ortc_RTCRtpCapabilities.cpp */,
+				00217CB11E97051E008204EA /* impl_org_ortc_RTCRtpCapabilities.h */,
+				00217CB21E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapability.cpp */,
+				00217CB31E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapability.h */,
+				00217CB41E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp */,
+				00217CB51E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.h */,
+				00217CB61E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp */,
+				00217CB71E97051E008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.h */,
+				00217CB81E97051E008204EA /* impl_org_ortc_RTCRtpCodecParameters.cpp */,
+				00217CB91E97051E008204EA /* impl_org_ortc_RTCRtpCodecParameters.h */,
+				00217CBA1E97051E008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.cpp */,
+				00217CBB1E97051E008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.h */,
+				00217CBC1E97051E008204EA /* impl_org_ortc_RTCRtpContributingSource.cpp */,
+				00217CBD1E97051E008204EA /* impl_org_ortc_RTCRtpContributingSource.h */,
+				00217CBE1E97051E008204EA /* impl_org_ortc_RTCRtpEncodingParameters.cpp */,
+				00217CBF1E97051E008204EA /* impl_org_ortc_RTCRtpEncodingParameters.h */,
+				00217CC01E97051E008204EA /* impl_org_ortc_RTCRtpFecParameters.cpp */,
+				00217CC11E97051E008204EA /* impl_org_ortc_RTCRtpFecParameters.h */,
+				00217CC21E97051E008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp */,
+				00217CC31E97051E008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.h */,
+				00217CC41E97051E008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp */,
+				00217CC51E97051E008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.h */,
+				00217CC61E97051E008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp */,
+				00217CC71E97051E008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.h */,
+				00217CC81E97051E008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp */,
+				00217CC91E97051E008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.h */,
+				00217CCA1E97051E008204EA /* impl_org_ortc_RTCRtpHeaderExtension.cpp */,
+				00217CCB1E97051E008204EA /* impl_org_ortc_RTCRtpHeaderExtension.h */,
+				00217CCC1E97051F008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp */,
+				00217CCD1E97051F008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.h */,
+				00217CCE1E97051F008204EA /* impl_org_ortc_RTCRtpListener.cpp */,
+				00217CCF1E97051F008204EA /* impl_org_ortc_RTCRtpListener.h */,
+				00217CD01E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp */,
+				00217CD11E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.h */,
+				00217CD21E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp */,
+				00217CD31E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.h */,
+				00217CD41E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp */,
+				00217CD51E97051F008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.h */,
+				00217CD61E97051F008204EA /* impl_org_ortc_RTCRtpParameters.cpp */,
+				00217CD71E97051F008204EA /* impl_org_ortc_RTCRtpParameters.h */,
+				00217CD81E97051F008204EA /* impl_org_ortc_RTCRtpReceiver.cpp */,
+				00217CD91E97051F008204EA /* impl_org_ortc_RTCRtpReceiver.h */,
+				00217CDA1E97051F008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp */,
+				00217CDB1E97051F008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.h */,
+				00217CDC1E97051F008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp */,
+				00217CDD1E97051F008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.h */,
+				00217CDE1E97051F008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp */,
+				00217CDF1E97051F008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.h */,
+				00217CE01E97051F008204EA /* impl_org_ortc_RTCRtpRtxParameters.cpp */,
+				00217CE11E97051F008204EA /* impl_org_ortc_RTCRtpRtxParameters.h */,
+				00217CE21E97051F008204EA /* impl_org_ortc_RTCRtpSender.cpp */,
+				00217CE31E97051F008204EA /* impl_org_ortc_RTCRtpSender.h */,
+				00217CE41E97051F008204EA /* impl_org_ortc_RTCRtpStreamStats.cpp */,
+				00217CE51E97051F008204EA /* impl_org_ortc_RTCRtpStreamStats.h */,
+				00217CE61E97051F008204EA /* impl_org_ortc_RTCRtpTransport.cpp */,
+				00217CE71E97051F008204EA /* impl_org_ortc_RTCRtpTransport.h */,
+				00217CE81E97051F008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.cpp */,
+				00217CE91E97051F008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.h */,
+				00217CEA1E97051F008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp */,
+				00217CEB1E97051F008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.h */,
+				00217CEC1E97051F008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp */,
+				00217CED1E97051F008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.h */,
+				00217CEE1E97051F008204EA /* impl_org_ortc_RTCSctpCapabilities.cpp */,
+				00217CEF1E97051F008204EA /* impl_org_ortc_RTCSctpCapabilities.h */,
+				00217CF01E97051F008204EA /* impl_org_ortc_RTCSctpTransport.cpp */,
+				00217CF11E97051F008204EA /* impl_org_ortc_RTCSctpTransport.h */,
+				00217CF21E97051F008204EA /* impl_org_ortc_RTCSctpTransportListener.cpp */,
+				00217CF31E97051F008204EA /* impl_org_ortc_RTCSctpTransportListener.h */,
+				00217CF41E97051F008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.cpp */,
+				00217CF51E97051F008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.h */,
+				00217CF61E97051F008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp */,
+				00217CF71E97051F008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.h */,
+				00217CF81E97051F008204EA /* impl_org_ortc_RTCSctpTransportStats.cpp */,
+				00217CF91E97051F008204EA /* impl_org_ortc_RTCSctpTransportStats.h */,
+				00217CFA1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp */,
+				00217CFB1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.h */,
+				00217CFC1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.cpp */,
+				00217CFD1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.h */,
+				00217CFE1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesParameters.cpp */,
+				00217CFF1E97051F008204EA /* impl_org_ortc_RTCSrtpSdesParameters.h */,
+				00217D001E97051F008204EA /* impl_org_ortc_RTCSrtpSdesTransport.cpp */,
+				00217D011E97051F008204EA /* impl_org_ortc_RTCSrtpSdesTransport.h */,
+				00217D021E97051F008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp */,
+				00217D031E97051F008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.h */,
+				00217D041E97051F008204EA /* impl_org_ortc_RTCSrtpTransportStats.cpp */,
+				00217D051E97051F008204EA /* impl_org_ortc_RTCSrtpTransportStats.h */,
+				00217D061E97051F008204EA /* impl_org_ortc_RTCSsrcConflictEvent.cpp */,
+				00217D071E97051F008204EA /* impl_org_ortc_RTCSsrcConflictEvent.h */,
+				00217D081E97051F008204EA /* impl_org_ortc_RTCStats.cpp */,
+				00217D091E97051F008204EA /* impl_org_ortc_RTCStats.h */,
+				00217D0A1E97051F008204EA /* impl_org_ortc_RTCStatsProvider.cpp */,
+				00217D0B1E97051F008204EA /* impl_org_ortc_RTCStatsProvider.h */,
+				00217D0C1E97051F008204EA /* impl_org_ortc_RTCStatsReport.cpp */,
+				00217D0D1E97051F008204EA /* impl_org_ortc_RTCStatsReport.h */,
+				00217D0E1E97051F008204EA /* impl_org_ortc_RTCStatsTypeSet.cpp */,
+				00217D0F1E97051F008204EA /* impl_org_ortc_RTCStatsTypeSet.h */,
+				00217D101E97051F008204EA /* impl_org_ortc_Settings.cpp */,
+				00217D111E97051F008204EA /* impl_org_ortc_Settings.h */,
+				00217D121E97051F008204EA /* impl_org_ortc_StringOrStringList.cpp */,
+				00217D131E97051F008204EA /* impl_org_ortc_StringOrStringList.h */,
+				00217D141E97051F008204EA /* types.h */,
+			);
+			name = wrapper;
+			path = ../../../ortc/idl/wrapper;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		002178161E9704E2008204EA /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		002178171E9704E2008204EA /* ortclib-wrapper-osx */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 002178231E9704E2008204EA /* Build configuration list for PBXNativeTarget "ortclib-wrapper-osx" */;
+			buildPhases = (
+				002178141E9704E2008204EA /* Sources */,
+				002178151E9704E2008204EA /* Frameworks */,
+				002178161E9704E2008204EA /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "ortclib-wrapper-osx";
+			productName = "ortclib-wrapper-osx";
+			productReference = 002178181E9704E2008204EA /* libortclib-wrapper-osx.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		002178101E9704E2008204EA /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0830;
+				ORGANIZATIONNAME = "Open Peer Foundation";
+				TargetAttributes = {
+					002178171E9704E2008204EA = {
+						CreatedOnToolsVersion = 8.3;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 002178131E9704E2008204EA /* Build configuration list for PBXProject "ortclib-wrapper-osx" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 0021780F1E9704E2008204EA;
+			productRefGroup = 002178191E9704E2008204EA /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				002178171E9704E2008204EA /* ortclib-wrapper-osx */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		002178141E9704E2008204EA /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0021809E1E970520008204EA /* impl_org_ortc_RTCDataChannelEvent.cpp in Sources */,
+				0021803E1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionDataDetails.cpp in Sources */,
+				002180F41E970520008204EA /* impl_org_ortc_RTCOutboundRtpStreamStats.cpp in Sources */,
+				002180EE1E970520008204EA /* impl_org_ortc_RTCMediaStreamStats.cpp in Sources */,
+				002180B81E970520008204EA /* impl_org_ortc_RTCIceCandidate.cpp in Sources */,
+				0021802A1E970520008204EA /* impl_org_ortc_adapter_RTCConfiguration.cpp in Sources */,
+				002180801E970520008204EA /* impl_org_ortc_MediaStreamTrack.cpp in Sources */,
+				002181241E970520008204EA /* impl_org_ortc_RTCRtpReceiver.cpp in Sources */,
+				0021813E1E970520008204EA /* impl_org_ortc_RTCSctpTransportListener.cpp in Sources */,
+				002181581E970520008204EA /* impl_org_ortc_RTCStatsReport.cpp in Sources */,
+				002180341E970520008204EA /* impl_org_ortc_adapter_RTCPeerConnection.cpp in Sources */,
+				002181401E970520008204EA /* impl_org_ortc_RTCSctpTransportListenerEvent.cpp in Sources */,
+				0021815C1E970521008204EA /* impl_org_ortc_Settings.cpp in Sources */,
+				002180601E970520008204EA /* impl_org_ortc_ConstrainLongRange.cpp in Sources */,
+				002180DE1E970520008204EA /* impl_org_ortc_RTCIceTransportOptions.cpp in Sources */,
+				002180E61E970520008204EA /* impl_org_ortc_RTCIdentityAssertion.cpp in Sources */,
+				002180481E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpMediaLine.cpp in Sources */,
+				0021805A1E970520008204EA /* impl_org_ortc_ConstrainDouble.cpp in Sources */,
+				002180CA1E970520008204EA /* impl_org_ortc_RTCIceGathererCandidateEvent.cpp in Sources */,
+				002180921E970520008204EA /* impl_org_ortc_OverconstrainedError.cpp in Sources */,
+				002180BC1E970520008204EA /* impl_org_ortc_RTCIceCandidateComplete.cpp in Sources */,
+				002180D01E970520008204EA /* impl_org_ortc_RTCIceGathererStats.cpp in Sources */,
+				0021814C1E970520008204EA /* impl_org_ortc_RTCSrtpSdesTransport.cpp in Sources */,
+				0021807C1E970520008204EA /* impl_org_ortc_MediaSource.cpp in Sources */,
+				002180231E970520008204EA /* impl_org_ortc.cpp in Sources */,
+				0021811A1E970520008204EA /* impl_org_ortc_RTCRtpListener.cpp in Sources */,
+				002181561E970520008204EA /* impl_org_ortc_RTCStatsProvider.cpp in Sources */,
+				0021809A1E970520008204EA /* impl_org_ortc_RTCCodec.cpp in Sources */,
+				0021813C1E970520008204EA /* impl_org_ortc_RTCSctpTransport.cpp in Sources */,
+				0021804A1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSender.cpp in Sources */,
+				0021805E1E970520008204EA /* impl_org_ortc_ConstrainLong.cpp in Sources */,
+				0021806A1E970520008204EA /* impl_org_ortc_Error.cpp in Sources */,
+				0021806C1E970520008204EA /* impl_org_ortc_ErrorEvent.cpp in Sources */,
+				002180561E970520008204EA /* impl_org_ortc_ConstrainBoolean.cpp in Sources */,
+				002180521E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransportParameters.cpp in Sources */,
+				002180361E970520008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceErrorEvent.cpp in Sources */,
+				0021814A1E970520008204EA /* impl_org_ortc_RTCSrtpSdesParameters.cpp in Sources */,
+				002180841E970520008204EA /* impl_org_ortc_MediaTrackConstraints.cpp in Sources */,
+				0021814E1E970520008204EA /* impl_org_ortc_RTCSrtpSdesTransportLifetimeRemainingEvent.cpp in Sources */,
+				002180FE1E970520008204EA /* impl_org_ortc_RTCRtpCodecCapability.cpp in Sources */,
+				002180F61E970520008204EA /* impl_org_ortc_RTCRtcpFeedback.cpp in Sources */,
+				002180DC1E970520008204EA /* impl_org_ortc_RTCIceTransportController.cpp in Sources */,
+				002181281E970520008204EA /* impl_org_ortc_RTCRtpRtxCodecCapabilityParameters.cpp in Sources */,
+				002180BA1E970520008204EA /* impl_org_ortc_RTCIceCandidateAttributes.cpp in Sources */,
+				002181321E970520008204EA /* impl_org_ortc_RTCRtpTransport.cpp in Sources */,
+				0021810C1E970520008204EA /* impl_org_ortc_RTCRtpFecParameters.cpp in Sources */,
+				0021813A1E970520008204EA /* impl_org_ortc_RTCSctpCapabilities.cpp in Sources */,
+				002181501E970520008204EA /* impl_org_ortc_RTCSrtpTransportStats.cpp in Sources */,
+				0021804E1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionSctpMediaLine.cpp in Sources */,
+				002180441E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLine.cpp in Sources */,
+				0021807E1E970520008204EA /* impl_org_ortc_MediaStreamConstraints.cpp in Sources */,
+				002180501E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionTransport.cpp in Sources */,
+				002180D21E970520008204EA /* impl_org_ortc_RTCIceGatherInterfacePolicy.cpp in Sources */,
+				002180CC1E970520008204EA /* impl_org_ortc_RTCIceGathererIceErrorEvent.cpp in Sources */,
+				002181421E970520008204EA /* impl_org_ortc_RTCSctpTransportStateChangeEvent.cpp in Sources */,
+				002181521E970520008204EA /* impl_org_ortc_RTCSsrcConflictEvent.cpp in Sources */,
+				002181201E970520008204EA /* impl_org_ortc_RTCRtpOpusCodecParameterSettings.cpp in Sources */,
+				002181081E970520008204EA /* impl_org_ortc_RTCRtpContributingSource.cpp in Sources */,
+				002180881E970520008204EA /* impl_org_ortc_MediaTrackSettings.cpp in Sources */,
+				002180741E970520008204EA /* impl_org_ortc_LongRange.cpp in Sources */,
+				002180C41E970520008204EA /* impl_org_ortc_RTCIceGatherer.cpp in Sources */,
+				002180621E970520008204EA /* impl_org_ortc_ConstrainString.cpp in Sources */,
+				0021804C1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionRtpSenderDetails.cpp in Sources */,
+				0021812E1E970520008204EA /* impl_org_ortc_RTCRtpSender.cpp in Sources */,
+				002180981E970520008204EA /* impl_org_ortc_RTCCertificateStats.cpp in Sources */,
+				0021812C1E970520008204EA /* impl_org_ortc_RTCRtpRtxParameters.cpp in Sources */,
+				002180EC1E970520008204EA /* impl_org_ortc_RTCInboundRtpStreamStats.cpp in Sources */,
+				002181101E970520008204EA /* impl_org_ortc_RTCRtpFlexFecCodecParameterSettings.cpp in Sources */,
+				002180961E970520008204EA /* impl_org_ortc_RTCCertificate.cpp in Sources */,
+				002180D61E970520008204EA /* impl_org_ortc_RTCIceParameters.cpp in Sources */,
+				002180C21E970520008204EA /* impl_org_ortc_RTCIceCandidatePairStats.cpp in Sources */,
+				002181041E970520008204EA /* impl_org_ortc_RTCRtpCodecParameters.cpp in Sources */,
+				0021808A1E970520008204EA /* impl_org_ortc_MediaTrackSupportedConstraints.cpp in Sources */,
+				0021803C1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionConnectionData.cpp in Sources */,
+				0021803A1E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescription.cpp in Sources */,
+				002180261E970520008204EA /* impl_org_ortc_adapter_RTCAnswerOptions.cpp in Sources */,
+				002180D41E970520008204EA /* impl_org_ortc_RTCIceGatherOptions.cpp in Sources */,
+				002181061E970520008204EA /* impl_org_ortc_RTCRtpCodecParameterSettings.cpp in Sources */,
+				0021802C1E970520008204EA /* impl_org_ortc_adapter_RTCIceCandidate.cpp in Sources */,
+				002181481E970520008204EA /* impl_org_ortc_RTCSrtpSdesKeyParameters.cpp in Sources */,
+				002180FA1E970520008204EA /* impl_org_ortc_RTCRtcpTransport.cpp in Sources */,
+				002181381E970520008204EA /* impl_org_ortc_RTCRtpVp8CodecParameterSettings.cpp in Sources */,
+				002180301E970520008204EA /* impl_org_ortc_adapter_RTCOfferAnswerOptions.cpp in Sources */,
+				0021810E1E970520008204EA /* impl_org_ortc_RTCRtpFlexFecCodecCapabilityParameters.cpp in Sources */,
+				002180B21E970520008204EA /* impl_org_ortc_RTCDtlsTransportStats.cpp in Sources */,
+				002181301E970520008204EA /* impl_org_ortc_RTCRtpStreamStats.cpp in Sources */,
+				002180401E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescription.cpp in Sources */,
+				002180D81E970520008204EA /* impl_org_ortc_RTCIceServer.cpp in Sources */,
+				002180281E970520008204EA /* impl_org_ortc_adapter_RTCCapabilityOptions.cpp in Sources */,
+				0021805C1E970520008204EA /* impl_org_ortc_ConstrainDoubleRange.cpp in Sources */,
+				0021806E1E970520008204EA /* impl_org_ortc_Helper.cpp in Sources */,
+				002180B01E970520008204EA /* impl_org_ortc_RTCDtlsTransportStateChangeEvent.cpp in Sources */,
+				002180AC1E970520008204EA /* impl_org_ortc_RTCDtlsParameters.cpp in Sources */,
+				002180E41E970520008204EA /* impl_org_ortc_RTCIdentity.cpp in Sources */,
+				002180641E970520008204EA /* impl_org_ortc_ConstrainStringParameters.cpp in Sources */,
+				002180C01E970520008204EA /* impl_org_ortc_RTCIceCandidatePairChangeEvent.cpp in Sources */,
+				002180CE1E970520008204EA /* impl_org_ortc_RTCIceGathererStateChangeEvent.cpp in Sources */,
+				002180C61E970520008204EA /* impl_org_ortc_RTCIceGathererCandidate.cpp in Sources */,
+				002180FC1E970520008204EA /* impl_org_ortc_RTCRtpCapabilities.cpp in Sources */,
+				002180A01E970520008204EA /* impl_org_ortc_RTCDataChannelParameters.cpp in Sources */,
+				002180AA1E970520008204EA /* impl_org_ortc_RTCDtlsFingerprint.cpp in Sources */,
+				002180861E970520008204EA /* impl_org_ortc_MediaTrackConstraintSet.cpp in Sources */,
+				002180DA1E970520008204EA /* impl_org_ortc_RTCIceTransport.cpp in Sources */,
+				002181121E970520008204EA /* impl_org_ortc_RTCRtpH264CodecCapabilityParameters.cpp in Sources */,
+				002180EA1E970520008204EA /* impl_org_ortc_RTCIdentityResult.cpp in Sources */,
+				002181021E970520008204EA /* impl_org_ortc_RTCRtpCodecCapabilityParameters.cpp in Sources */,
+				002180BE1E970520008204EA /* impl_org_ortc_RTCIceCandidatePair.cpp in Sources */,
+				002180AE1E970520008204EA /* impl_org_ortc_RTCDtlsTransport.cpp in Sources */,
+				002180B41E970520008204EA /* impl_org_ortc_RTCDtmfSender.cpp in Sources */,
+				002180941E970520008204EA /* impl_org_ortc_OverconstrainedErrorEvent.cpp in Sources */,
+				0021811E1E970520008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityParameters.cpp in Sources */,
+				002180A81E970520008204EA /* impl_org_ortc_RTCDtlsCertificateBinary.cpp in Sources */,
+				002180B61E970520008204EA /* impl_org_ortc_RTCDtmfToneChangeEvent.cpp in Sources */,
+				002180F21E970520008204EA /* impl_org_ortc_RTCMessageEvent.cpp in Sources */,
+				0021808C1E970520008204EA /* impl_org_ortc_MessageQueue.cpp in Sources */,
+				002181341E970520008204EA /* impl_org_ortc_RTCRtpUnhandledEvent.cpp in Sources */,
+				002180461E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionMediaLineDetails.cpp in Sources */,
+				002180681E970520008204EA /* impl_org_ortc_DoubleRange.cpp in Sources */,
+				002181261E970520008204EA /* impl_org_ortc_RTCRtpRedCodecParameterSettings.cpp in Sources */,
+				002180381E970520008204EA /* impl_org_ortc_adapter_RTCPeerConnectionIceEvent.cpp in Sources */,
+				002181441E970520008204EA /* impl_org_ortc_RTCSctpTransportStats.cpp in Sources */,
+				0021809C1E970520008204EA /* impl_org_ortc_RTCDataChannel.cpp in Sources */,
+				002180E01E970520008204EA /* impl_org_ortc_RTCIceTransportStateChangeEvent.cpp in Sources */,
+				002180241E970520008204EA /* impl_org_ortc_adapter_MediaStream.cpp in Sources */,
+				0021802E1E970520008204EA /* impl_org_ortc_adapter_RTCMediaStreamTrackConfiguration.cpp in Sources */,
+				002181221E970520008204EA /* impl_org_ortc_RTCRtpParameters.cpp in Sources */,
+				002180A21E970520008204EA /* impl_org_ortc_RTCDataChannelStateChangeEvent.cpp in Sources */,
+				002180721E970520008204EA /* impl_org_ortc_Logger.cpp in Sources */,
+				002180E81E970520008204EA /* impl_org_ortc_RTCIdentityError.cpp in Sources */,
+				002180761E970520008204EA /* impl_org_ortc_MediaControl.cpp in Sources */,
+				002181361E970520008204EA /* impl_org_ortc_RTCRtpVp8CodecCapabilityParameters.cpp in Sources */,
+				0021811C1E970520008204EA /* impl_org_ortc_RTCRtpOpusCodecCapabilityOptions.cpp in Sources */,
+				002180581E970520008204EA /* impl_org_ortc_ConstrainBooleanParameters.cpp in Sources */,
+				002180541E970520008204EA /* impl_org_ortc_adapter_RTCTrackEvent.cpp in Sources */,
+				002180E21E970520008204EA /* impl_org_ortc_RTCIceTransportStats.cpp in Sources */,
+				002180421E970520008204EA /* impl_org_ortc_adapter_RTCSessionDescriptionDescriptionDetails.cpp in Sources */,
+				0021812A1E970520008204EA /* impl_org_ortc_RTCRtpRtxCodecParameterSettings.cpp in Sources */,
+				002180F01E970520008204EA /* impl_org_ortc_RTCMediaStreamTrackStats.cpp in Sources */,
+				002180A61E970520008204EA /* impl_org_ortc_RTCDataTransport.cpp in Sources */,
+				002180821E970520008204EA /* impl_org_ortc_MediaTrackCapabilities.cpp in Sources */,
+				002181181E970520008204EA /* impl_org_ortc_RTCRtpHeaderExtensionParameters.cpp in Sources */,
+				002181161E970520008204EA /* impl_org_ortc_RTCRtpHeaderExtension.cpp in Sources */,
+				0021808E1E970520008204EA /* impl_org_ortc_OrtcLib.cpp in Sources */,
+				002181001E970520008204EA /* impl_org_ortc_RTCRtpCodecCapabilityOptions.cpp in Sources */,
+				002181141E970520008204EA /* impl_org_ortc_RTCRtpH264CodecParameterSettings.cpp in Sources */,
+				0021810A1E970520008204EA /* impl_org_ortc_RTCRtpEncodingParameters.cpp in Sources */,
+				002180701E970520008204EA /* impl_org_ortc_Json.cpp in Sources */,
+				002180C81E970520008204EA /* impl_org_ortc_RTCIceGathererCandidateCompleteEvent.cpp in Sources */,
+				002180A41E970520008204EA /* impl_org_ortc_RTCDataChannelStats.cpp in Sources */,
+				0021807A1E970520008204EA /* impl_org_ortc_MediaDevices.cpp in Sources */,
+				002180781E970520008204EA /* impl_org_ortc_MediaDeviceInfo.cpp in Sources */,
+				002181461E970520008204EA /* impl_org_ortc_RTCSrtpSdesCryptoParameters.cpp in Sources */,
+				002180321E970520008204EA /* impl_org_ortc_adapter_RTCOfferOptions.cpp in Sources */,
+				0021815E1E970521008204EA /* impl_org_ortc_StringOrStringList.cpp in Sources */,
+				002181541E970520008204EA /* impl_org_ortc_RTCStats.cpp in Sources */,
+				002180F81E970520008204EA /* impl_org_ortc_RTCRtcpParameters.cpp in Sources */,
+				0021815A1E970521008204EA /* impl_org_ortc_RTCStatsTypeSet.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		002178211E9704E2008204EA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../../../ortclib-cpp",
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					"../../../../zsLib-eventing",
+					../../../..,
+					../../../../../../webrtc/xplatform/webrtc,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		002178221E9704E2008204EA /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../../../ortclib-cpp",
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					"../../../../zsLib-eventing",
+					../../../..,
+					../../../../../../webrtc/xplatform/webrtc,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		002178241E9704E2008204EA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
+				GCC_ENABLE_CPP_RTTI = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		002178251E9704E2008204EA /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
+				GCC_ENABLE_CPP_RTTI = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		002178131E9704E2008204EA /* Build configuration list for PBXProject "ortclib-wrapper-osx" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				002178211E9704E2008204EA /* Debug */,
+				002178221E9704E2008204EA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		002178231E9704E2008204EA /* Build configuration list for PBXNativeTarget "ortclib-wrapper-osx" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				002178241E9704E2008204EA /* Debug */,
+				002178251E9704E2008204EA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 002178101E9704E2008204EA /* Project object */;
+}
diff --git a/projects/xcode/ortclib.Test-ios/ortclib.Test-ios.xcodeproj/project.pbxproj b/projects/xcode/ortclib.Test-ios/ortclib.Test-ios.xcodeproj/project.pbxproj
index 79fa105c..e75dc63b 100644
--- a/projects/xcode/ortclib.Test-ios/ortclib.Test-ios.xcodeproj/project.pbxproj
+++ b/projects/xcode/ortclib.Test-ios/ortclib.Test-ios.xcodeproj/project.pbxproj
@@ -15,27 +15,6 @@
 		009D19A11DE52DEA00D139FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 009D199F1DE52DEA00D139FF /* LaunchScreen.storyboard */; };
 		009D19AC1DE52DEA00D139FF /* ortclib_Test_iosTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 009D19AB1DE52DEA00D139FF /* ortclib_Test_iosTests.m */; };
 		009D19B71DE52DEA00D139FF /* ortclib_Test_iosUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 009D19B61DE52DEA00D139FF /* ortclib_Test_iosUITests.m */; };
-		009D1A681DE52F7400D139FF /* libcryptopp-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19DB1DE52E8200D139FF /* libcryptopp-ios.a */; };
-		009D1A691DE52F7400D139FF /* libidnkit-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19DE1DE52E8200D139FF /* libidnkit-ios.a */; };
-		009D1A6A1DE52F7400D139FF /* libortclib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19E11DE52E8200D139FF /* libortclib-ios.a */; };
-		009D1A6B1DE52F7400D139FF /* libortclib.services-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19E41DE52E8200D139FF /* libortclib.services-ios.a */; };
-		009D1A6C1DE52F7400D139FF /* libudns-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19E71DE52E8200D139FF /* libudns-ios.a */; };
-		009D1A6D1DE52F7400D139FF /* libzsLib-eventing-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19EA1DE52E8200D139FF /* libzsLib-eventing-ios.a */; };
-		009D1A6E1DE52F7400D139FF /* libzsLib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19ED1DE52E8200D139FF /* libzsLib-ios.a */; };
-		009D1A6F1DE52F9200D139FF /* libcryptopp-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19DB1DE52E8200D139FF /* libcryptopp-ios.a */; };
-		009D1A701DE52F9200D139FF /* libidnkit-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19DE1DE52E8200D139FF /* libidnkit-ios.a */; };
-		009D1A711DE52F9200D139FF /* libortclib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19E11DE52E8200D139FF /* libortclib-ios.a */; };
-		009D1A721DE52F9200D139FF /* libortclib.services-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19E41DE52E8200D139FF /* libortclib.services-ios.a */; };
-		009D1A731DE52F9200D139FF /* libudns-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19E71DE52E8200D139FF /* libudns-ios.a */; };
-		009D1A741DE52F9200D139FF /* libzsLib-eventing-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19EA1DE52E8200D139FF /* libzsLib-eventing-ios.a */; };
-		009D1A751DE52F9200D139FF /* libzsLib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19ED1DE52E8200D139FF /* libzsLib-ios.a */; };
-		009D1A761DE52FA000D139FF /* libcryptopp-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19DB1DE52E8200D139FF /* libcryptopp-ios.a */; };
-		009D1A771DE52FA000D139FF /* libidnkit-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19DE1DE52E8200D139FF /* libidnkit-ios.a */; };
-		009D1A781DE52FA000D139FF /* libortclib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19E11DE52E8200D139FF /* libortclib-ios.a */; };
-		009D1A791DE52FA000D139FF /* libortclib.services-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19E41DE52E8200D139FF /* libortclib.services-ios.a */; };
-		009D1A7A1DE52FA000D139FF /* libudns-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19E71DE52E8200D139FF /* libudns-ios.a */; };
-		009D1A7B1DE52FA000D139FF /* libzsLib-eventing-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19EA1DE52E8200D139FF /* libzsLib-eventing-ios.a */; };
-		009D1A7C1DE52FA000D139FF /* libzsLib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 009D19ED1DE52E8200D139FF /* libzsLib-ios.a */; };
 		009D1A9C1DE52FBF00D139FF /* TestDTLS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D1A801DE52FBF00D139FF /* TestDTLS.cpp */; };
 		009D1A9D1DE52FBF00D139FF /* TestDTLS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D1A801DE52FBF00D139FF /* TestDTLS.cpp */; };
 		009D1A9E1DE52FBF00D139FF /* TestDTLS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D1A801DE52FBF00D139FF /* TestDTLS.cpp */; };
@@ -84,6 +63,21 @@
 		009D1AC91DE52FC000D139FF /* TestSRTP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D1A981DE52FBF00D139FF /* TestSRTP.cpp */; };
 		009D1ACA1DE52FC000D139FF /* TestSRTP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D1A981DE52FBF00D139FF /* TestSRTP.cpp */; };
 		009D1ACB1DE52FC000D139FF /* TestSRTP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009D1A981DE52FBF00D139FF /* TestSRTP.cpp */; };
+		52AD843F1E5DF2DD00DCD81D /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52AD843E1E5DF2DD00DCD81D /* libcurl.a */; };
+		52BA73931E647BAD00CAF5AE /* webrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73921E647BAD00CAF5AE /* webrtc.a */; };
+		52BA73951E647BB600CAF5AE /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73941E647BB600CAF5AE /* CoreMedia.framework */; };
+		52BA73971E647C1400CAF5AE /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73961E647C1400CAF5AE /* AVFoundation.framework */; };
+		52BA73991E647C9C00CAF5AE /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73981E647C9C00CAF5AE /* VideoToolbox.framework */; };
+		52BA739B1E647CCC00CAF5AE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA739A1E647CCC00CAF5AE /* AudioToolbox.framework */; };
+		52BA73C41E64DD1900CAF5AE /* libcryptopp-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73BD1E64DD1900CAF5AE /* libcryptopp-ios.a */; };
+		52BA73C51E64DD1900CAF5AE /* libidnkit-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73BE1E64DD1900CAF5AE /* libidnkit-ios.a */; };
+		52BA73C71E64DD1900CAF5AE /* libortclib.services-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73C01E64DD1900CAF5AE /* libortclib.services-ios.a */; };
+		52BA73C81E64DD1900CAF5AE /* libudns-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73C11E64DD1900CAF5AE /* libudns-ios.a */; };
+		52BA73CD1E64DECB00CAF5AE /* libortclib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73CB1E64DECB00CAF5AE /* libortclib-ios.a */; };
+		52BA73CE1E64DECB00CAF5AE /* libzsLib-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73CC1E64DECB00CAF5AE /* libzsLib-ios.a */; };
+		52BA73FC1E64E28D00CAF5AE /* libzsLib-eventing-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73FB1E64E28D00CAF5AE /* libzsLib-eventing-ios.a */; };
+		52BA73FE1E64E2C200CAF5AE /* libresolv.9.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73FD1E64E2C200CAF5AE /* libresolv.9.tbd */; };
+		52BA74001E64E2E700CAF5AE /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 52BA73FF1E64E2E700CAF5AE /* libz.tbd */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -101,103 +95,68 @@
 			remoteGlobalIDString = 009D198D1DE52DEA00D139FF;
 			remoteInfo = "ortclib.Test-ios";
 		};
-		009D19DA1DE52E8200D139FF /* PBXContainerItemProxy */ = {
+		5285F3361E65B1D70005D02E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 009D19D31DE52E8200D139FF /* cryptopp-ios.xcodeproj */;
+			containerPortal = 52BA739C1E64DB4200CAF5AE /* zsLib-ios.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 009BBA0A1D974F4400B6B633;
-			remoteInfo = "cryptopp-ios";
+			remoteGlobalIDString = 0067EE151D9C5B4E003BE1AC;
+			remoteInfo = "zsLib-ios";
 		};
-		009D19DD1DE52E8200D139FF /* PBXContainerItemProxy */ = {
+		5285F3401E65B1D70005D02E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 009D19CA1DE52E8200D139FF /* idnkit-ios.xcodeproj */;
+			containerPortal = 52BA73F51E64E28000CAF5AE /* zsLib-eventing-ios.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 008698371DE3F458009D669C;
+			remoteInfo = "zsLib-eventing-ios";
+		};
+		5285F3481E65B1D70005D02E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 52BA73A51E64DC0300CAF5AE /* idnkit-ios.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 0001A45F1DA1DD5F00D807DA;
 			remoteInfo = "idnkit-ios";
 		};
-		009D19E01DE52E8200D139FF /* PBXContainerItemProxy */ = {
+		5285F34D1E65B1D70005D02E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 009D19C41DE52E8200D139FF /* ortclib-ios.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 0064F8031DE51EB900EE8962;
 			remoteInfo = "ortclib-ios";
 		};
-		009D19E31DE52E8200D139FF /* PBXContainerItemProxy */ = {
+		5285F36D1E65B3470005D02E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 009D19C71DE52E8200D139FF /* ortclib.services-ios.xcodeproj */;
+			containerPortal = 52BA73B71E64DC2C00CAF5AE /* ortclib.services-ios.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 008A13851DA1A13600D1664A;
 			remoteInfo = "ortclib.services-ios";
 		};
-		009D19E61DE52E8200D139FF /* PBXContainerItemProxy */ = {
+		5285F3741E65B3470005D02E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 009D19CD1DE52E8200D139FF /* udns-ios.xcodeproj */;
+			containerPortal = 52BA73AB1E64DC1000CAF5AE /* udns-ios.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 0022EA3D1D989A1F002FCECF;
 			remoteInfo = "udns-ios";
 		};
-		009D19E91DE52E8200D139FF /* PBXContainerItemProxy */ = {
+		5285F3791E65B3470005D02E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 009D19D01DE52E8200D139FF /* zsLib-eventing-ios.xcodeproj */;
+			containerPortal = 52BA73B11E64DC1B00CAF5AE /* cryptopp-ios.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 008698371DE3F458009D669C;
-			remoteInfo = "zsLib-eventing-ios";
+			remoteGlobalIDString = 009BBA0A1D974F4400B6B633;
+			remoteInfo = "cryptopp-ios";
 		};
-		009D19EC1DE52E8200D139FF /* PBXContainerItemProxy */ = {
+		5285F37E1E65B3470005D02E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 009D19D61DE52E8200D139FF /* zsLib-ios.xcodeproj */;
+			containerPortal = 526A20B31E6093A800BA0F07 /* webrtcWrapper_ios.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 0067EE151D9C5B4E003BE1AC;
-			remoteInfo = "zsLib-ios";
-		};
-		009D1A5A1DE52F5900D139FF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 009D19C41DE52E8200D139FF /* ortclib-ios.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 0064F8021DE51EB900EE8962;
-			remoteInfo = "ortclib-ios";
-		};
-		009D1A5C1DE52F5900D139FF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 009D19C71DE52E8200D139FF /* ortclib.services-ios.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 008A13841DA1A13600D1664A;
-			remoteInfo = "ortclib.services-ios";
+			remoteGlobalIDString = 9451F25C1BC54F57008CB8D7;
+			remoteInfo = webrtcWrapper_ios;
 		};
-		009D1A5E1DE52F5900D139FF /* PBXContainerItemProxy */ = {
+		5285F3801E65CAE40005D02E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 009D19CA1DE52E8200D139FF /* idnkit-ios.xcodeproj */;
+			containerPortal = 526A20B31E6093A800BA0F07 /* webrtcWrapper_ios.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = 0001A45E1DA1DD5F00D807DA;
-			remoteInfo = "idnkit-ios";
-		};
-		009D1A601DE52F5900D139FF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 009D19CD1DE52E8200D139FF /* udns-ios.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 0022EA3C1D989A1F002FCECF;
-			remoteInfo = "udns-ios";
-		};
-		009D1A621DE52F5900D139FF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 009D19D01DE52E8200D139FF /* zsLib-eventing-ios.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 008698361DE3F458009D669C;
-			remoteInfo = "zsLib-eventing-ios";
-		};
-		009D1A641DE52F5900D139FF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 009D19D31DE52E8200D139FF /* cryptopp-ios.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 009BBA091D974F4400B6B633;
-			remoteInfo = "cryptopp-ios";
-		};
-		009D1A661DE52F5900D139FF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 009D19D61DE52E8200D139FF /* zsLib-ios.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 0067EE141D9C5B4E003BE1AC;
-			remoteInfo = "zsLib-ios";
+			remoteGlobalIDString = 9451F25B1BC54F57008CB8D7;
+			remoteInfo = webrtcWrapper_ios;
 		};
 /* End PBXContainerItemProxy section */
 
@@ -218,13 +177,7 @@
 		009D19B21DE52DEA00D139FF /* ortclib.Test-iosUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ortclib.Test-iosUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		009D19B61DE52DEA00D139FF /* ortclib_Test_iosUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ortclib_Test_iosUITests.m; sourceTree = "<group>"; };
 		009D19B81DE52DEA00D139FF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		009D19C41DE52E8200D139FF /* ortclib-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "ortclib-ios.xcodeproj"; path = "../ortclib-ios/ortclib-ios.xcodeproj"; sourceTree = "<group>"; };
-		009D19C71DE52E8200D139FF /* ortclib.services-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "ortclib.services-ios.xcodeproj"; path = "/Users/robin/Repos/ortclib/ortclib-sdk/ortc/xplatform/ortclib-cpp/projects/xcode/../../../ortclib-services-cpp/projects/xcode/ortclib.services-ios/ortclib.services-ios.xcodeproj"; sourceTree = "<absolute>"; };
-		009D19CA1DE52E8200D139FF /* idnkit-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "idnkit-ios.xcodeproj"; path = "/Users/robin/Repos/ortclib/ortclib-sdk/ortc/xplatform/ortclib-cpp/projects/xcode/../../../idnkit/projects/xcode/idnkit-ios/idnkit-ios.xcodeproj"; sourceTree = "<absolute>"; };
-		009D19CD1DE52E8200D139FF /* udns-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "udns-ios.xcodeproj"; path = "/Users/robin/Repos/ortclib/ortclib-sdk/ortc/xplatform/ortclib-cpp/projects/xcode/../../../udns/projects/xcode/udns-ios/udns-ios.xcodeproj"; sourceTree = "<absolute>"; };
-		009D19D01DE52E8200D139FF /* zsLib-eventing-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "zsLib-eventing-ios.xcodeproj"; path = "/Users/robin/Repos/ortclib/ortclib-sdk/ortc/xplatform/ortclib-cpp/projects/xcode/../../../zsLib-eventing/projects/xcode/zsLib-eventing-ios/zsLib-eventing-ios.xcodeproj"; sourceTree = "<absolute>"; };
-		009D19D31DE52E8200D139FF /* cryptopp-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "cryptopp-ios.xcodeproj"; path = "/Users/robin/Repos/ortclib/ortclib-sdk/ortc/xplatform/ortclib-cpp/projects/xcode/../../../cryptopp/projects/xcode/cryptopp-ios/cryptopp-ios.xcodeproj"; sourceTree = "<absolute>"; };
-		009D19D61DE52E8200D139FF /* zsLib-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "zsLib-ios.xcodeproj"; path = "/Users/robin/Repos/ortclib/ortclib-sdk/ortc/xplatform/ortclib-cpp/projects/xcode/../../../zsLib/projects/xcode/zsLib-ios/zsLib-ios.xcodeproj"; sourceTree = "<absolute>"; };
+		009D19C41DE52E8200D139FF /* ortclib-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "ortclib-ios.xcodeproj"; path = "../ortclib-ios/ortclib-ios.xcodeproj"; sourceTree = SOURCE_ROOT; };
 		009D1A7E1DE52FBF00D139FF /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
 		009D1A7F1DE52FBF00D139FF /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
 		009D1A801DE52FBF00D139FF /* TestDTLS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestDTLS.cpp; sourceTree = "<group>"; };
@@ -252,6 +205,89 @@
 		009D1A961DE52FBF00D139FF /* TestSCTP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestSCTP.h; sourceTree = "<group>"; };
 		009D1A971DE52FBF00D139FF /* TestSetup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestSetup.cpp; sourceTree = "<group>"; };
 		009D1A981DE52FBF00D139FF /* TestSRTP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestSRTP.cpp; sourceTree = "<group>"; };
+		52656CBC1E5F02A1009DAE87 /* libaudio_decoder_factory_interface.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaudio_decoder_factory_interface.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios64/Debug-iphoneos/libaudio_decoder_factory_interface.a"; sourceTree = "<group>"; };
+		52656CBE1E5F040E009DAE87 /* libaudio_processing_neon.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaudio_processing_neon.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios64/Debug-iphoneos/libaudio_processing_neon.a"; sourceTree = "<group>"; };
+		526A20B31E6093A800BA0F07 /* webrtcWrapper_ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = webrtcWrapper_ios.xcodeproj; path = ../../../../../apple/projects/xcode/webrtcWrappers/webrtcWrapper_ios/webrtcWrapper_ios.xcodeproj; sourceTree = SOURCE_ROOT; };
+		52AD84301E5DE9C200DCD81D /* libzsLib-eventing-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libzsLib-eventing-ios.a"; path = "../../../../zsLib-eventing/projects/xcode/zsLib-eventing-ios/build/Debug-iphoneos/libzsLib-eventing-ios.a"; sourceTree = "<group>"; };
+		52AD84321E5DE9D500DCD81D /* libwebrtcWrapper_ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtcWrapper_ios.a; path = "../../../../../apple/projects/xcode/webrtcWrappers/webrtcWrapper_ios/build/Debug-iphoneos/libwebrtcWrapper_ios.a"; sourceTree = "<group>"; };
+		52AD843E1E5DF2DD00DCD81D /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../../../curl/curl/ios-appstore/lib/libcurl.a"; sourceTree = "<group>"; };
+		52AD84401E5DF35B00DCD81D /* libwebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libwebrtc.a"; sourceTree = "<group>"; };
+		52AD84421E5DF48B00DCD81D /* librtp_rtcp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librtp_rtcp.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/librtp_rtcp.a"; sourceTree = "<group>"; };
+		52AD84431E5DF48B00DCD81D /* libaudio_processing.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaudio_processing.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libaudio_processing.a"; sourceTree = "<group>"; };
+		52AD84441E5DF48B00DCD81D /* libvoice_engine.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvoice_engine.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libvoice_engine.a"; sourceTree = "<group>"; };
+		52AD84451E5DF48B00DCD81D /* libneteq.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libneteq.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libneteq.a"; sourceTree = "<group>"; };
+		52AD84461E5DF48B00DCD81D /* libwebrtc_video_coding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc_video_coding.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libwebrtc_video_coding.a"; sourceTree = "<group>"; };
+		52AD84471E5DF48B00DCD81D /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libvpx.a"; sourceTree = "<group>"; };
+		52AD84481E5DF48B00DCD81D /* libboringssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboringssl.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libboringssl.a"; sourceTree = "<group>"; };
+		52AD84491E5DF48B00DCD81D /* librtc_base_approved.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librtc_base_approved.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/librtc_base_approved.a"; sourceTree = "<group>"; };
+		52AD844A1E5DF48B00DCD81D /* libaudio_device.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaudio_device.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libaudio_device.a"; sourceTree = "<group>"; };
+		52AD844B1E5DF48B00DCD81D /* libremote_bitrate_estimator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libremote_bitrate_estimator.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libremote_bitrate_estimator.a"; sourceTree = "<group>"; };
+		52AD844C1E5DF48B00DCD81D /* libcommon_audio.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcommon_audio.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libcommon_audio.a"; sourceTree = "<group>"; };
+		52AD844D1E5DF48B00DCD81D /* libsystem_wrappers.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsystem_wrappers.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libsystem_wrappers.a"; sourceTree = "<group>"; };
+		52AD844E1E5DF48B00DCD81D /* libusrsctplib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libusrsctplib.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libusrsctplib.a"; sourceTree = "<group>"; };
+		52AD844F1E5DF48B00DCD81D /* libcommon_video.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcommon_video.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libcommon_video.a"; sourceTree = "<group>"; };
+		52AD84501E5DF48B00DCD81D /* libaudio_coding_module.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaudio_coding_module.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libaudio_coding_module.a"; sourceTree = "<group>"; };
+		52AD84511E5DF48B00DCD81D /* libwebrtc_utility.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc_utility.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libwebrtc_utility.a"; sourceTree = "<group>"; };
+		52AD84521E5DF48B00DCD81D /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopus.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libopus.a"; sourceTree = "<group>"; };
+		52AD84531E5DF48B00DCD81D /* libwebrtc_vp8.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc_vp8.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libwebrtc_vp8.a"; sourceTree = "<group>"; };
+		52AD84541E5DF48B00DCD81D /* libpaced_sender.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpaced_sender.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libpaced_sender.a"; sourceTree = "<group>"; };
+		52AD84551E5DF48B00DCD81D /* librtc_event_log.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librtc_event_log.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/librtc_event_log.a"; sourceTree = "<group>"; };
+		52AD84561E5DF48B00DCD81D /* libbitrate_controller.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbitrate_controller.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libbitrate_controller.a"; sourceTree = "<group>"; };
+		52AD84571E5DF48B00DCD81D /* librtc_event_log_proto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librtc_event_log_proto.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/librtc_event_log_proto.a"; sourceTree = "<group>"; };
+		52AD84581E5DF48B00DCD81D /* libisac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libisac.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libisac.a"; sourceTree = "<group>"; };
+		52AD84591E5DF48B00DCD81D /* libisac_fix.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libisac_fix.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libisac_fix.a"; sourceTree = "<group>"; };
+		52AD845A1E5DF48B00DCD81D /* libwebrtc_h264_video_toolbox.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc_h264_video_toolbox.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libwebrtc_h264_video_toolbox.a"; sourceTree = "<group>"; };
+		52AD845B1E5DF48B00DCD81D /* libwebrtc_vp9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc_vp9.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libwebrtc_vp9.a"; sourceTree = "<group>"; };
+		52AD845C1E5DF48B00DCD81D /* libaudio_conference_mixer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaudio_conference_mixer.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libaudio_conference_mixer.a"; sourceTree = "<group>"; };
+		52AD845D1E5DF48B00DCD81D /* libvideo_coding_utility.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvideo_coding_utility.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libvideo_coding_utility.a"; sourceTree = "<group>"; };
+		52AD845E1E5DF48B00DCD81D /* librent_a_codec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librent_a_codec.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/librent_a_codec.a"; sourceTree = "<group>"; };
+		52AD845F1E5DF48B00DCD81D /* libyuv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libyuv.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libyuv.a"; sourceTree = "<group>"; };
+		52AD84601E5DF48B00DCD81D /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libilbc.a"; sourceTree = "<group>"; };
+		52AD84611E5DF48B00DCD81D /* libmetrics_default.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmetrics_default.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libmetrics_default.a"; sourceTree = "<group>"; };
+		52AD84621E5DF48B00DCD81D /* libvideo_processing.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvideo_processing.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libvideo_processing.a"; sourceTree = "<group>"; };
+		52AD84631E5DF48B00DCD81D /* libvideo_capture_module_internal_impl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvideo_capture_module_internal_impl.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libvideo_capture_module_internal_impl.a"; sourceTree = "<group>"; };
+		52AD84641E5DF48B00DCD81D /* libcng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcng.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libcng.a"; sourceTree = "<group>"; };
+		52AD84651E5DF48B00DCD81D /* libaudioproc_debug_proto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaudioproc_debug_proto.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libaudioproc_debug_proto.a"; sourceTree = "<group>"; };
+		52AD84661E5DF48B00DCD81D /* libwebrtc_opus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc_opus.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libwebrtc_opus.a"; sourceTree = "<group>"; };
+		52AD84671E5DF48B00DCD81D /* libg711.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libg711.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libg711.a"; sourceTree = "<group>"; };
+		52AD84681E5DF48B00DCD81D /* libg722.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libg722.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libg722.a"; sourceTree = "<group>"; };
+		52AD84691E5DF48B00DCD81D /* libwebrtc_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc_common.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libwebrtc_common.a"; sourceTree = "<group>"; };
+		52AD846A1E5DF48B00DCD81D /* libvideo_capture_module.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvideo_capture_module.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libvideo_capture_module.a"; sourceTree = "<group>"; };
+		52AD846B1E5DF48B00DCD81D /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libsrtp.a"; sourceTree = "<group>"; };
+		52AD846C1E5DF48B00DCD81D /* libred.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libred.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libred.a"; sourceTree = "<group>"; };
+		52AD846D1E5DF48B00DCD81D /* libpcm16b.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpcm16b.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libpcm16b.a"; sourceTree = "<group>"; };
+		52AD846E1E5DF48B00DCD81D /* libaudio_encoder_interface.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaudio_encoder_interface.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libaudio_encoder_interface.a"; sourceTree = "<group>"; };
+		52AD846F1E5DF48B00DCD81D /* libaudio_decoder_interface.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaudio_decoder_interface.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libaudio_decoder_interface.a"; sourceTree = "<group>"; };
+		52AD84701E5DF48B00DCD81D /* libmedia_file.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmedia_file.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libmedia_file.a"; sourceTree = "<group>"; };
+		52AD84711E5DF48B00DCD81D /* libwebrtc_h264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc_h264.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libwebrtc_h264.a"; sourceTree = "<group>"; };
+		52AD84721E5DF48B00DCD81D /* libcommon_audio_neon.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcommon_audio_neon.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libcommon_audio_neon.a"; sourceTree = "<group>"; };
+		52AD84731E5DF48B00DCD81D /* libisac_neon.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libisac_neon.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libisac_neon.a"; sourceTree = "<group>"; };
+		52AD84741E5DF48B00DCD81D /* libfield_trial_default.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfield_trial_default.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libfield_trial_default.a"; sourceTree = "<group>"; };
+		52AD84751E5DF48B00DCD81D /* libwebrtc_i420.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc_i420.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libwebrtc_i420.a"; sourceTree = "<group>"; };
+		52AD84761E5DF48B00DCD81D /* libisac_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libisac_common.a; path = "../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos/libisac_common.a"; sourceTree = "<group>"; };
+		52BA73921E647BAD00CAF5AE /* webrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = webrtc.a; path = ../../../../../../webrtc/xplatform/webrtc/out_ios/webrtc.a; sourceTree = "<group>"; };
+		52BA73941E647BB600CAF5AE /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
+		52BA73961E647C1400CAF5AE /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		52BA73981E647C9C00CAF5AE /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
+		52BA739A1E647CCC00CAF5AE /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		52BA739C1E64DB4200CAF5AE /* zsLib-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "zsLib-ios.xcodeproj"; path = "../../../../zsLib/projects/xcode/zsLib-ios/zsLib-ios.xcodeproj"; sourceTree = SOURCE_ROOT; };
+		52BA73A51E64DC0300CAF5AE /* idnkit-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "idnkit-ios.xcodeproj"; path = "../../../../idnkit/projects/xcode/idnkit-ios/idnkit-ios.xcodeproj"; sourceTree = SOURCE_ROOT; };
+		52BA73AB1E64DC1000CAF5AE /* udns-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "udns-ios.xcodeproj"; path = "../../../../udns/projects/xcode/udns-ios/udns-ios.xcodeproj"; sourceTree = SOURCE_ROOT; };
+		52BA73B11E64DC1B00CAF5AE /* cryptopp-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "cryptopp-ios.xcodeproj"; path = "../../../../cryptopp/projects/xcode/cryptopp-ios/cryptopp-ios.xcodeproj"; sourceTree = SOURCE_ROOT; };
+		52BA73B71E64DC2C00CAF5AE /* ortclib.services-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "ortclib.services-ios.xcodeproj"; path = "../../../../ortclib-services-cpp/projects/xcode/ortclib.services-ios/ortclib.services-ios.xcodeproj"; sourceTree = SOURCE_ROOT; };
+		52BA73BD1E64DD1900CAF5AE /* libcryptopp-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libcryptopp-ios.a"; path = "../../../../../../../../../../../Library/Developer/Xcode/DerivedData/ortc-lib-sdk-dohryvixdwyhymduswwkpidonjup/Build/Products/Debug-iphoneos/libcryptopp-ios.a"; sourceTree = "<group>"; };
+		52BA73BE1E64DD1900CAF5AE /* libidnkit-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libidnkit-ios.a"; path = "../../../../../../../../../../../Library/Developer/Xcode/DerivedData/ortc-lib-sdk-dohryvixdwyhymduswwkpidonjup/Build/Products/Debug-iphoneos/libidnkit-ios.a"; sourceTree = "<group>"; };
+		52BA73BF1E64DD1900CAF5AE /* libortclib-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libortclib-ios.a"; path = "../ortclib-ios/build/Release-iphoneos/libortclib-ios.a"; sourceTree = "<group>"; };
+		52BA73C01E64DD1900CAF5AE /* libortclib.services-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libortclib.services-ios.a"; path = "../../../../../../../../../../../Library/Developer/Xcode/DerivedData/ortc-lib-sdk-dohryvixdwyhymduswwkpidonjup/Build/Products/Debug-iphoneos/libortclib.services-ios.a"; sourceTree = "<group>"; };
+		52BA73C11E64DD1900CAF5AE /* libudns-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libudns-ios.a"; path = "../../../../../../../../../../../Library/Developer/Xcode/DerivedData/ortc-lib-sdk-dohryvixdwyhymduswwkpidonjup/Build/Products/Debug-iphoneos/libudns-ios.a"; sourceTree = "<group>"; };
+		52BA73C21E64DD1900CAF5AE /* libwebrtcWrapper_ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtcWrapper_ios.a; path = "../../../../../apple/projects/xcode/webrtcWrappers/webrtcWrapper_ios/build/Debug-iphoneos/libwebrtcWrapper_ios.a"; sourceTree = "<group>"; };
+		52BA73C31E64DD1900CAF5AE /* libzsLib-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libzsLib-ios.a"; path = "../../../../zsLib/projects/xcode/zsLib-ios/build/Release-iphoneos/libzsLib-ios.a"; sourceTree = "<group>"; };
+		52BA73CB1E64DECB00CAF5AE /* libortclib-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libortclib-ios.a"; path = "../../../../../../../../../../../Library/Developer/Xcode/DerivedData/ortc-lib-sdk-dohryvixdwyhymduswwkpidonjup/Build/Products/Debug-iphoneos/libortclib-ios.a"; sourceTree = "<group>"; };
+		52BA73CC1E64DECB00CAF5AE /* libzsLib-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libzsLib-ios.a"; path = "../../../../../../../../../../../Library/Developer/Xcode/DerivedData/ortc-lib-sdk-dohryvixdwyhymduswwkpidonjup/Build/Products/Debug-iphoneos/libzsLib-ios.a"; sourceTree = "<group>"; };
+		52BA73F51E64E28000CAF5AE /* zsLib-eventing-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "zsLib-eventing-ios.xcodeproj"; path = "../../../../zsLib-eventing/projects/xcode/zsLib-eventing-ios/zsLib-eventing-ios.xcodeproj"; sourceTree = SOURCE_ROOT; };
+		52BA73FB1E64E28D00CAF5AE /* libzsLib-eventing-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libzsLib-eventing-ios.a"; path = "../../../../../../../../../../../Library/Developer/Xcode/DerivedData/ortc-lib-sdk-dohryvixdwyhymduswwkpidonjup/Build/Products/Debug-iphoneos/libzsLib-eventing-ios.a"; sourceTree = "<group>"; };
+		52BA73FD1E64E2C200CAF5AE /* libresolv.9.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.9.tbd; path = usr/lib/libresolv.9.tbd; sourceTree = SDKROOT; };
+		52BA73FF1E64E2E700CAF5AE /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -259,13 +295,21 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				009D1A681DE52F7400D139FF /* libcryptopp-ios.a in Frameworks */,
-				009D1A691DE52F7400D139FF /* libidnkit-ios.a in Frameworks */,
-				009D1A6A1DE52F7400D139FF /* libortclib-ios.a in Frameworks */,
-				009D1A6B1DE52F7400D139FF /* libortclib.services-ios.a in Frameworks */,
-				009D1A6C1DE52F7400D139FF /* libudns-ios.a in Frameworks */,
-				009D1A6D1DE52F7400D139FF /* libzsLib-eventing-ios.a in Frameworks */,
-				009D1A6E1DE52F7400D139FF /* libzsLib-ios.a in Frameworks */,
+				52BA74001E64E2E700CAF5AE /* libz.tbd in Frameworks */,
+				52BA73FE1E64E2C200CAF5AE /* libresolv.9.tbd in Frameworks */,
+				52BA73FC1E64E28D00CAF5AE /* libzsLib-eventing-ios.a in Frameworks */,
+				52BA73C41E64DD1900CAF5AE /* libcryptopp-ios.a in Frameworks */,
+				52BA73C51E64DD1900CAF5AE /* libidnkit-ios.a in Frameworks */,
+				52BA73CD1E64DECB00CAF5AE /* libortclib-ios.a in Frameworks */,
+				52BA73CE1E64DECB00CAF5AE /* libzsLib-ios.a in Frameworks */,
+				52BA73C71E64DD1900CAF5AE /* libortclib.services-ios.a in Frameworks */,
+				52BA73C81E64DD1900CAF5AE /* libudns-ios.a in Frameworks */,
+				52BA739B1E647CCC00CAF5AE /* AudioToolbox.framework in Frameworks */,
+				52BA73991E647C9C00CAF5AE /* VideoToolbox.framework in Frameworks */,
+				52BA73971E647C1400CAF5AE /* AVFoundation.framework in Frameworks */,
+				52BA73951E647BB600CAF5AE /* CoreMedia.framework in Frameworks */,
+				52BA73931E647BAD00CAF5AE /* webrtc.a in Frameworks */,
+				52AD843F1E5DF2DD00DCD81D /* libcurl.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -273,13 +317,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				009D1A6F1DE52F9200D139FF /* libcryptopp-ios.a in Frameworks */,
-				009D1A701DE52F9200D139FF /* libidnkit-ios.a in Frameworks */,
-				009D1A711DE52F9200D139FF /* libortclib-ios.a in Frameworks */,
-				009D1A721DE52F9200D139FF /* libortclib.services-ios.a in Frameworks */,
-				009D1A731DE52F9200D139FF /* libudns-ios.a in Frameworks */,
-				009D1A741DE52F9200D139FF /* libzsLib-eventing-ios.a in Frameworks */,
-				009D1A751DE52F9200D139FF /* libzsLib-ios.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -287,13 +324,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				009D1A761DE52FA000D139FF /* libcryptopp-ios.a in Frameworks */,
-				009D1A771DE52FA000D139FF /* libidnkit-ios.a in Frameworks */,
-				009D1A781DE52FA000D139FF /* libortclib-ios.a in Frameworks */,
-				009D1A791DE52FA000D139FF /* libortclib.services-ios.a in Frameworks */,
-				009D1A7A1DE52FA000D139FF /* libudns-ios.a in Frameworks */,
-				009D1A7B1DE52FA000D139FF /* libzsLib-eventing-ios.a in Frameworks */,
-				009D1A7C1DE52FA000D139FF /* libzsLib-ios.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -303,18 +333,20 @@
 		009D19851DE52DEA00D139FF = {
 			isa = PBXGroup;
 			children = (
+				52BA73F51E64E28000CAF5AE /* zsLib-eventing-ios.xcodeproj */,
+				52BA73B71E64DC2C00CAF5AE /* ortclib.services-ios.xcodeproj */,
+				52BA73B11E64DC1B00CAF5AE /* cryptopp-ios.xcodeproj */,
+				52BA73AB1E64DC1000CAF5AE /* udns-ios.xcodeproj */,
+				52BA73A51E64DC0300CAF5AE /* idnkit-ios.xcodeproj */,
+				52BA739C1E64DB4200CAF5AE /* zsLib-ios.xcodeproj */,
+				526A20B31E6093A800BA0F07 /* webrtcWrapper_ios.xcodeproj */,
 				009D19C41DE52E8200D139FF /* ortclib-ios.xcodeproj */,
-				009D19C71DE52E8200D139FF /* ortclib.services-ios.xcodeproj */,
-				009D19CA1DE52E8200D139FF /* idnkit-ios.xcodeproj */,
-				009D19CD1DE52E8200D139FF /* udns-ios.xcodeproj */,
-				009D19D01DE52E8200D139FF /* zsLib-eventing-ios.xcodeproj */,
-				009D19D31DE52E8200D139FF /* cryptopp-ios.xcodeproj */,
-				009D19D61DE52E8200D139FF /* zsLib-ios.xcodeproj */,
 				009D1A7D1DE52FBF00D139FF /* test */,
 				009D19901DE52DEA00D139FF /* ortclib.Test-ios */,
 				009D19AA1DE52DEA00D139FF /* ortclib.Test-iosTests */,
 				009D19B51DE52DEA00D139FF /* ortclib.Test-iosUITests */,
 				009D198F1DE52DEA00D139FF /* Products */,
+				52AD842F1E5DE9C200DCD81D /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -370,95 +402,186 @@
 			path = "ortclib.Test-iosUITests";
 			sourceTree = "<group>";
 		};
-		009D19C51DE52E8200D139FF /* Products */ = {
+		009D1A7D1DE52FBF00D139FF /* test */ = {
 			isa = PBXGroup;
 			children = (
-				009D19E11DE52E8200D139FF /* libortclib-ios.a */,
+				009D1A7E1DE52FBF00D139FF /* config.h */,
+				009D1A7F1DE52FBF00D139FF /* main.cpp */,
+				009D1A801DE52FBF00D139FF /* TestDTLS.cpp */,
+				009D1A811DE52FBF00D139FF /* TestICEGatherer.cpp */,
+				009D1A821DE52FBF00D139FF /* TestICETransport.cpp */,
+				009D1A831DE52FBF00D139FF /* testing.cpp */,
+				009D1A841DE52FBF00D139FF /* testing.h */,
+				009D1A851DE52FBF00D139FF /* TestMediaStreamTrack.cpp */,
+				009D1A861DE52FBF00D139FF /* TestMediaStreamTrack.h */,
+				009D1A871DE52FBF00D139FF /* TestRTCPPacket.cpp */,
+				009D1A881DE52FBF00D139FF /* TestRTPChannel.cpp */,
+				009D1A891DE52FBF00D139FF /* TestRTPChannel.h */,
+				009D1A8A1DE52FBF00D139FF /* TestRTPChannelAudio.cpp */,
+				009D1A8B1DE52FBF00D139FF /* TestRTPChannelAudio.h */,
+				009D1A8C1DE52FBF00D139FF /* TestRTPChannelVideo.cpp */,
+				009D1A8D1DE52FBF00D139FF /* TestRTPChannelVideo.h */,
+				009D1A8E1DE52FBF00D139FF /* TestRTPListener.cpp */,
+				009D1A8F1DE52FBF00D139FF /* TestRTPListener.h */,
+				009D1A901DE52FBF00D139FF /* TestRTPPacket.cpp */,
+				009D1A911DE52FBF00D139FF /* TestRTPReceiver.cpp */,
+				009D1A921DE52FBF00D139FF /* TestRTPReceiver.h */,
+				009D1A931DE52FBF00D139FF /* TestRTPSender.cpp */,
+				009D1A941DE52FBF00D139FF /* TestRTPSender.h */,
+				009D1A951DE52FBF00D139FF /* TestSCTP.cpp */,
+				009D1A961DE52FBF00D139FF /* TestSCTP.h */,
+				009D1A971DE52FBF00D139FF /* TestSetup.cpp */,
+				009D1A981DE52FBF00D139FF /* TestSRTP.cpp */,
+			);
+			name = test;
+			path = ../../../ortc/test;
+			sourceTree = "<group>";
+		};
+		5285F3311E65B1D70005D02E /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				5285F3371E65B1D70005D02E /* libzsLib-ios.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		009D19C81DE52E8200D139FF /* Products */ = {
+		5285F33B1E65B1D70005D02E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				009D19E41DE52E8200D139FF /* libortclib.services-ios.a */,
+				5285F3411E65B1D70005D02E /* libzsLib-eventing-ios.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		009D19CB1DE52E8200D139FF /* Products */ = {
+		5285F3451E65B1D70005D02E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				009D19DE1DE52E8200D139FF /* libidnkit-ios.a */,
+				5285F3491E65B1D70005D02E /* libidnkit-ios.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		009D19CE1DE52E8200D139FF /* Products */ = {
+		5285F34A1E65B1D70005D02E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				009D19E71DE52E8200D139FF /* libudns-ios.a */,
+				5285F34E1E65B1D70005D02E /* libortclib-ios.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		009D19D11DE52E8200D139FF /* Products */ = {
+		5285F3681E65B3470005D02E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				009D19EA1DE52E8200D139FF /* libzsLib-eventing-ios.a */,
+				5285F36E1E65B3470005D02E /* libortclib.services-ios.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		009D19D41DE52E8200D139FF /* Products */ = {
+		5285F3711E65B3470005D02E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				009D19DB1DE52E8200D139FF /* libcryptopp-ios.a */,
+				5285F3751E65B3470005D02E /* libudns-ios.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		009D19D71DE52E8200D139FF /* Products */ = {
+		5285F3761E65B3470005D02E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				009D19ED1DE52E8200D139FF /* libzsLib-ios.a */,
+				5285F37A1E65B3470005D02E /* libcryptopp-ios.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		009D1A7D1DE52FBF00D139FF /* test */ = {
+		5285F37B1E65B3470005D02E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				009D1A7E1DE52FBF00D139FF /* config.h */,
-				009D1A7F1DE52FBF00D139FF /* main.cpp */,
-				009D1A801DE52FBF00D139FF /* TestDTLS.cpp */,
-				009D1A811DE52FBF00D139FF /* TestICEGatherer.cpp */,
-				009D1A821DE52FBF00D139FF /* TestICETransport.cpp */,
-				009D1A831DE52FBF00D139FF /* testing.cpp */,
-				009D1A841DE52FBF00D139FF /* testing.h */,
-				009D1A851DE52FBF00D139FF /* TestMediaStreamTrack.cpp */,
-				009D1A861DE52FBF00D139FF /* TestMediaStreamTrack.h */,
-				009D1A871DE52FBF00D139FF /* TestRTCPPacket.cpp */,
-				009D1A881DE52FBF00D139FF /* TestRTPChannel.cpp */,
-				009D1A891DE52FBF00D139FF /* TestRTPChannel.h */,
-				009D1A8A1DE52FBF00D139FF /* TestRTPChannelAudio.cpp */,
-				009D1A8B1DE52FBF00D139FF /* TestRTPChannelAudio.h */,
-				009D1A8C1DE52FBF00D139FF /* TestRTPChannelVideo.cpp */,
-				009D1A8D1DE52FBF00D139FF /* TestRTPChannelVideo.h */,
-				009D1A8E1DE52FBF00D139FF /* TestRTPListener.cpp */,
-				009D1A8F1DE52FBF00D139FF /* TestRTPListener.h */,
-				009D1A901DE52FBF00D139FF /* TestRTPPacket.cpp */,
-				009D1A911DE52FBF00D139FF /* TestRTPReceiver.cpp */,
-				009D1A921DE52FBF00D139FF /* TestRTPReceiver.h */,
-				009D1A931DE52FBF00D139FF /* TestRTPSender.cpp */,
-				009D1A941DE52FBF00D139FF /* TestRTPSender.h */,
-				009D1A951DE52FBF00D139FF /* TestSCTP.cpp */,
-				009D1A961DE52FBF00D139FF /* TestSCTP.h */,
-				009D1A971DE52FBF00D139FF /* TestSetup.cpp */,
-				009D1A981DE52FBF00D139FF /* TestSRTP.cpp */,
+				5285F37F1E65B3470005D02E /* libwebrtcWrapper_ios.a */,
 			);
-			name = test;
-			path = ../../../ortc/test;
+			name = Products;
+			sourceTree = "<group>";
+		};
+		52AD842F1E5DE9C200DCD81D /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				52BA73FF1E64E2E700CAF5AE /* libz.tbd */,
+				52BA73FD1E64E2C200CAF5AE /* libresolv.9.tbd */,
+				52BA73FB1E64E28D00CAF5AE /* libzsLib-eventing-ios.a */,
+				52BA73CB1E64DECB00CAF5AE /* libortclib-ios.a */,
+				52BA73CC1E64DECB00CAF5AE /* libzsLib-ios.a */,
+				52BA73BD1E64DD1900CAF5AE /* libcryptopp-ios.a */,
+				52BA73BE1E64DD1900CAF5AE /* libidnkit-ios.a */,
+				52BA73BF1E64DD1900CAF5AE /* libortclib-ios.a */,
+				52BA73C01E64DD1900CAF5AE /* libortclib.services-ios.a */,
+				52BA73C11E64DD1900CAF5AE /* libudns-ios.a */,
+				52BA73C21E64DD1900CAF5AE /* libwebrtcWrapper_ios.a */,
+				52BA73C31E64DD1900CAF5AE /* libzsLib-ios.a */,
+				52BA739A1E647CCC00CAF5AE /* AudioToolbox.framework */,
+				52BA73981E647C9C00CAF5AE /* VideoToolbox.framework */,
+				52BA73961E647C1400CAF5AE /* AVFoundation.framework */,
+				52BA73941E647BB600CAF5AE /* CoreMedia.framework */,
+				52BA73921E647BAD00CAF5AE /* webrtc.a */,
+				52656CBE1E5F040E009DAE87 /* libaudio_processing_neon.a */,
+				52656CBC1E5F02A1009DAE87 /* libaudio_decoder_factory_interface.a */,
+				52AD84421E5DF48B00DCD81D /* librtp_rtcp.a */,
+				52AD84431E5DF48B00DCD81D /* libaudio_processing.a */,
+				52AD84441E5DF48B00DCD81D /* libvoice_engine.a */,
+				52AD84451E5DF48B00DCD81D /* libneteq.a */,
+				52AD84461E5DF48B00DCD81D /* libwebrtc_video_coding.a */,
+				52AD84471E5DF48B00DCD81D /* libvpx.a */,
+				52AD84481E5DF48B00DCD81D /* libboringssl.a */,
+				52AD84491E5DF48B00DCD81D /* librtc_base_approved.a */,
+				52AD844A1E5DF48B00DCD81D /* libaudio_device.a */,
+				52AD844B1E5DF48B00DCD81D /* libremote_bitrate_estimator.a */,
+				52AD844C1E5DF48B00DCD81D /* libcommon_audio.a */,
+				52AD844D1E5DF48B00DCD81D /* libsystem_wrappers.a */,
+				52AD844E1E5DF48B00DCD81D /* libusrsctplib.a */,
+				52AD844F1E5DF48B00DCD81D /* libcommon_video.a */,
+				52AD84501E5DF48B00DCD81D /* libaudio_coding_module.a */,
+				52AD84511E5DF48B00DCD81D /* libwebrtc_utility.a */,
+				52AD84521E5DF48B00DCD81D /* libopus.a */,
+				52AD84531E5DF48B00DCD81D /* libwebrtc_vp8.a */,
+				52AD84541E5DF48B00DCD81D /* libpaced_sender.a */,
+				52AD84551E5DF48B00DCD81D /* librtc_event_log.a */,
+				52AD84561E5DF48B00DCD81D /* libbitrate_controller.a */,
+				52AD84571E5DF48B00DCD81D /* librtc_event_log_proto.a */,
+				52AD84581E5DF48B00DCD81D /* libisac.a */,
+				52AD84591E5DF48B00DCD81D /* libisac_fix.a */,
+				52AD845A1E5DF48B00DCD81D /* libwebrtc_h264_video_toolbox.a */,
+				52AD845B1E5DF48B00DCD81D /* libwebrtc_vp9.a */,
+				52AD845C1E5DF48B00DCD81D /* libaudio_conference_mixer.a */,
+				52AD845D1E5DF48B00DCD81D /* libvideo_coding_utility.a */,
+				52AD845E1E5DF48B00DCD81D /* librent_a_codec.a */,
+				52AD845F1E5DF48B00DCD81D /* libyuv.a */,
+				52AD84601E5DF48B00DCD81D /* libilbc.a */,
+				52AD84611E5DF48B00DCD81D /* libmetrics_default.a */,
+				52AD84621E5DF48B00DCD81D /* libvideo_processing.a */,
+				52AD84631E5DF48B00DCD81D /* libvideo_capture_module_internal_impl.a */,
+				52AD84641E5DF48B00DCD81D /* libcng.a */,
+				52AD84651E5DF48B00DCD81D /* libaudioproc_debug_proto.a */,
+				52AD84661E5DF48B00DCD81D /* libwebrtc_opus.a */,
+				52AD84671E5DF48B00DCD81D /* libg711.a */,
+				52AD84681E5DF48B00DCD81D /* libg722.a */,
+				52AD84691E5DF48B00DCD81D /* libwebrtc_common.a */,
+				52AD846A1E5DF48B00DCD81D /* libvideo_capture_module.a */,
+				52AD846B1E5DF48B00DCD81D /* libsrtp.a */,
+				52AD846C1E5DF48B00DCD81D /* libred.a */,
+				52AD846D1E5DF48B00DCD81D /* libpcm16b.a */,
+				52AD846E1E5DF48B00DCD81D /* libaudio_encoder_interface.a */,
+				52AD846F1E5DF48B00DCD81D /* libaudio_decoder_interface.a */,
+				52AD84701E5DF48B00DCD81D /* libmedia_file.a */,
+				52AD84711E5DF48B00DCD81D /* libwebrtc_h264.a */,
+				52AD84721E5DF48B00DCD81D /* libcommon_audio_neon.a */,
+				52AD84731E5DF48B00DCD81D /* libisac_neon.a */,
+				52AD84741E5DF48B00DCD81D /* libfield_trial_default.a */,
+				52AD84751E5DF48B00DCD81D /* libwebrtc_i420.a */,
+				52AD84761E5DF48B00DCD81D /* libisac_common.a */,
+				52AD84401E5DF35B00DCD81D /* libwebrtc.a */,
+				52AD843E1E5DF2DD00DCD81D /* libcurl.a */,
+				52AD84321E5DE9D500DCD81D /* libwebrtcWrapper_ios.a */,
+				52AD84301E5DE9C200DCD81D /* libzsLib-eventing-ios.a */,
+			);
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -475,13 +598,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				009D1A5B1DE52F5900D139FF /* PBXTargetDependency */,
-				009D1A5D1DE52F5900D139FF /* PBXTargetDependency */,
-				009D1A5F1DE52F5900D139FF /* PBXTargetDependency */,
-				009D1A611DE52F5900D139FF /* PBXTargetDependency */,
-				009D1A631DE52F5900D139FF /* PBXTargetDependency */,
-				009D1A651DE52F5900D139FF /* PBXTargetDependency */,
-				009D1A671DE52F5900D139FF /* PBXTargetDependency */,
+				5285F3811E65CAE40005D02E /* PBXTargetDependency */,
 			);
 			name = "ortclib.Test-ios";
 			productName = "ortclib.Test-ios";
@@ -535,6 +652,7 @@
 				TargetAttributes = {
 					009D198D1DE52DEA00D139FF = {
 						CreatedOnToolsVersion = 8.1;
+						DevelopmentTeam = QE9E5R8GUP;
 						ProvisioningStyle = Automatic;
 					};
 					009D19A61DE52DEA00D139FF = {
@@ -562,32 +680,36 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = 009D19D41DE52E8200D139FF /* Products */;
-					ProjectRef = 009D19D31DE52E8200D139FF /* cryptopp-ios.xcodeproj */;
+					ProductGroup = 5285F3761E65B3470005D02E /* Products */;
+					ProjectRef = 52BA73B11E64DC1B00CAF5AE /* cryptopp-ios.xcodeproj */;
 				},
 				{
-					ProductGroup = 009D19CB1DE52E8200D139FF /* Products */;
-					ProjectRef = 009D19CA1DE52E8200D139FF /* idnkit-ios.xcodeproj */;
+					ProductGroup = 5285F3451E65B1D70005D02E /* Products */;
+					ProjectRef = 52BA73A51E64DC0300CAF5AE /* idnkit-ios.xcodeproj */;
 				},
 				{
-					ProductGroup = 009D19C51DE52E8200D139FF /* Products */;
+					ProductGroup = 5285F34A1E65B1D70005D02E /* Products */;
 					ProjectRef = 009D19C41DE52E8200D139FF /* ortclib-ios.xcodeproj */;
 				},
 				{
-					ProductGroup = 009D19C81DE52E8200D139FF /* Products */;
-					ProjectRef = 009D19C71DE52E8200D139FF /* ortclib.services-ios.xcodeproj */;
+					ProductGroup = 5285F3681E65B3470005D02E /* Products */;
+					ProjectRef = 52BA73B71E64DC2C00CAF5AE /* ortclib.services-ios.xcodeproj */;
 				},
 				{
-					ProductGroup = 009D19CE1DE52E8200D139FF /* Products */;
-					ProjectRef = 009D19CD1DE52E8200D139FF /* udns-ios.xcodeproj */;
+					ProductGroup = 5285F3711E65B3470005D02E /* Products */;
+					ProjectRef = 52BA73AB1E64DC1000CAF5AE /* udns-ios.xcodeproj */;
 				},
 				{
-					ProductGroup = 009D19D11DE52E8200D139FF /* Products */;
-					ProjectRef = 009D19D01DE52E8200D139FF /* zsLib-eventing-ios.xcodeproj */;
+					ProductGroup = 5285F37B1E65B3470005D02E /* Products */;
+					ProjectRef = 526A20B31E6093A800BA0F07 /* webrtcWrapper_ios.xcodeproj */;
 				},
 				{
-					ProductGroup = 009D19D71DE52E8200D139FF /* Products */;
-					ProjectRef = 009D19D61DE52E8200D139FF /* zsLib-ios.xcodeproj */;
+					ProductGroup = 5285F33B1E65B1D70005D02E /* Products */;
+					ProjectRef = 52BA73F51E64E28000CAF5AE /* zsLib-eventing-ios.xcodeproj */;
+				},
+				{
+					ProductGroup = 5285F3311E65B1D70005D02E /* Products */;
+					ProjectRef = 52BA739C1E64DB4200CAF5AE /* zsLib-ios.xcodeproj */;
 				},
 			);
 			projectRoot = "";
@@ -600,53 +722,60 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		009D19DB1DE52E8200D139FF /* libcryptopp-ios.a */ = {
+		5285F3371E65B1D70005D02E /* libzsLib-ios.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libcryptopp-ios.a";
-			remoteRef = 009D19DA1DE52E8200D139FF /* PBXContainerItemProxy */;
+			path = "libzsLib-ios.a";
+			remoteRef = 5285F3361E65B1D70005D02E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		5285F3411E65B1D70005D02E /* libzsLib-eventing-ios.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libzsLib-eventing-ios.a";
+			remoteRef = 5285F3401E65B1D70005D02E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		009D19DE1DE52E8200D139FF /* libidnkit-ios.a */ = {
+		5285F3491E65B1D70005D02E /* libidnkit-ios.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = "libidnkit-ios.a";
-			remoteRef = 009D19DD1DE52E8200D139FF /* PBXContainerItemProxy */;
+			remoteRef = 5285F3481E65B1D70005D02E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		009D19E11DE52E8200D139FF /* libortclib-ios.a */ = {
+		5285F34E1E65B1D70005D02E /* libortclib-ios.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = "libortclib-ios.a";
-			remoteRef = 009D19E01DE52E8200D139FF /* PBXContainerItemProxy */;
+			remoteRef = 5285F34D1E65B1D70005D02E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		009D19E41DE52E8200D139FF /* libortclib.services-ios.a */ = {
+		5285F36E1E65B3470005D02E /* libortclib.services-ios.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = "libortclib.services-ios.a";
-			remoteRef = 009D19E31DE52E8200D139FF /* PBXContainerItemProxy */;
+			remoteRef = 5285F36D1E65B3470005D02E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		009D19E71DE52E8200D139FF /* libudns-ios.a */ = {
+		5285F3751E65B3470005D02E /* libudns-ios.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = "libudns-ios.a";
-			remoteRef = 009D19E61DE52E8200D139FF /* PBXContainerItemProxy */;
+			remoteRef = 5285F3741E65B3470005D02E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		009D19EA1DE52E8200D139FF /* libzsLib-eventing-ios.a */ = {
+		5285F37A1E65B3470005D02E /* libcryptopp-ios.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libzsLib-eventing-ios.a";
-			remoteRef = 009D19E91DE52E8200D139FF /* PBXContainerItemProxy */;
+			path = "libcryptopp-ios.a";
+			remoteRef = 5285F3791E65B3470005D02E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		009D19ED1DE52E8200D139FF /* libzsLib-ios.a */ = {
+		5285F37F1E65B3470005D02E /* libwebrtcWrapper_ios.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libzsLib-ios.a";
-			remoteRef = 009D19EC1DE52E8200D139FF /* PBXContainerItemProxy */;
+			path = libwebrtcWrapper_ios.a;
+			remoteRef = 5285F37E1E65B3470005D02E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -766,40 +895,10 @@
 			target = 009D198D1DE52DEA00D139FF /* ortclib.Test-ios */;
 			targetProxy = 009D19B31DE52DEA00D139FF /* PBXContainerItemProxy */;
 		};
-		009D1A5B1DE52F5900D139FF /* PBXTargetDependency */ = {
+		5285F3811E65CAE40005D02E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			name = "ortclib-ios";
-			targetProxy = 009D1A5A1DE52F5900D139FF /* PBXContainerItemProxy */;
-		};
-		009D1A5D1DE52F5900D139FF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "ortclib.services-ios";
-			targetProxy = 009D1A5C1DE52F5900D139FF /* PBXContainerItemProxy */;
-		};
-		009D1A5F1DE52F5900D139FF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "idnkit-ios";
-			targetProxy = 009D1A5E1DE52F5900D139FF /* PBXContainerItemProxy */;
-		};
-		009D1A611DE52F5900D139FF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "udns-ios";
-			targetProxy = 009D1A601DE52F5900D139FF /* PBXContainerItemProxy */;
-		};
-		009D1A631DE52F5900D139FF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "zsLib-eventing-ios";
-			targetProxy = 009D1A621DE52F5900D139FF /* PBXContainerItemProxy */;
-		};
-		009D1A651DE52F5900D139FF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "cryptopp-ios";
-			targetProxy = 009D1A641DE52F5900D139FF /* PBXContainerItemProxy */;
-		};
-		009D1A671DE52F5900D139FF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "zsLib-ios";
-			targetProxy = 009D1A661DE52F5900D139FF /* PBXContainerItemProxy */;
+			name = webrtcWrapper_ios;
+			targetProxy = 5285F3801E65CAE40005D02E /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -921,12 +1020,38 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = QE9E5R8GUP;
+				ENABLE_BITCODE = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE,
+					WEBRTC_BUILD_LIBEVENT,
+					WEBRTC_POSIX,
+					"$(inherited)",
+				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../..,
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					../../../../../../webrtc/xplatform/boringssl/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/crypto/include,
+					../../../../../../webrtc/xplatform/libsrtp/config,
+					../../../../../../webrtc/xplatform/webrtc,
+					../../../../../../webrtc/xplatform/usrsctp/usrsctplib,
+					"../../../../zsLib-eventing",
+				);
 				INFOPLIST_FILE = "ortclib.Test-ios/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"../../../../curl/curl/ios-dev/lib",
+					"../../../../../../webrtc/xplatform/webrtc/out_ios/Debug-iphoneos",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.ortc.ortclib-Test-ios";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				VALID_ARCHS = "arm64 armv7s";
 			};
 			name = Debug;
 		};
@@ -934,12 +1059,38 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = QE9E5R8GUP;
+				ENABLE_BITCODE = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE,
+					WEBRTC_BUILD_LIBEVENT,
+					WEBRTC_POSIX,
+					"$(inherited)",
+				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../..,
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					../../../../../../webrtc/xplatform/boringssl/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/crypto/include,
+					../../../../../../webrtc/xplatform/libsrtp/config,
+					../../../../../../webrtc/xplatform/webrtc,
+					../../../../../../webrtc/xplatform/usrsctp/usrsctplib,
+					"../../../../zsLib-eventing",
+				);
 				INFOPLIST_FILE = "ortclib.Test-ios/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"../../../../curl/curl/ios-appstore/lib",
+					"../../../../../../webrtc/xplatform/webrtc/out_ios/Release-iphoneos",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.ortc.ortclib-Test-ios";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				VALID_ARCHS = "arm64 armv7s";
 			};
 			name = Release;
 		};
@@ -948,6 +1099,25 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE,
+					WEBRTC_BUILD_LIBEVENT,
+					WEBRTC_POSIX,
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../..,
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					../../../../../../webrtc/xplatform/boringssl/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/crypto/include,
+					../../../../../../webrtc/xplatform/libsrtp/config,
+					../../../../../../webrtc/xplatform/webrtc,
+					../../../../../../webrtc/xplatform/usrsctp/usrsctplib,
+				);
 				INFOPLIST_FILE = "ortclib.Test-iosTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.ortc.ortclib-Test-iosTests";
@@ -961,6 +1131,25 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE,
+					WEBRTC_BUILD_LIBEVENT,
+					WEBRTC_POSIX,
+					"NDEBUG=1",
+					"$(inherited)",
+				);
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../..,
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					../../../../../../webrtc/xplatform/boringssl/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/crypto/include,
+					../../../../../../webrtc/xplatform/libsrtp/config,
+					../../../../../../webrtc/xplatform/webrtc,
+					../../../../../../webrtc/xplatform/usrsctp/usrsctplib,
+				);
 				INFOPLIST_FILE = "ortclib.Test-iosTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.ortc.ortclib-Test-iosTests";
@@ -973,6 +1162,25 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE,
+					WEBRTC_BUILD_LIBEVENT,
+					WEBRTC_POSIX,
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../..,
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					../../../../../../webrtc/xplatform/boringssl/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/crypto/include,
+					../../../../../../webrtc/xplatform/libsrtp/config,
+					../../../../../../webrtc/xplatform/webrtc,
+					../../../../../../webrtc/xplatform/usrsctp/usrsctplib,
+				);
 				INFOPLIST_FILE = "ortclib.Test-iosUITests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.ortc.ortclib-Test-iosUITests";
@@ -985,6 +1193,25 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE,
+					WEBRTC_BUILD_LIBEVENT,
+					WEBRTC_POSIX,
+					"NDEBUG=1",
+					"$(inherited)",
+				);
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../..,
+					"../../../../ortclib-services-cpp",
+					../../../../zsLib,
+					../../../../../../webrtc/xplatform/boringssl/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/include,
+					../../../../../../webrtc/xplatform/libsrtp/srtp/crypto/include,
+					../../../../../../webrtc/xplatform/libsrtp/config,
+					../../../../../../webrtc/xplatform/webrtc,
+					../../../../../../webrtc/xplatform/usrsctp/usrsctplib,
+				);
 				INFOPLIST_FILE = "ortclib.Test-iosUITests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.ortc.ortclib-Test-iosUITests";
diff --git a/projects/xcode/ortclib.Test-osx/ortclib.Test-osx.xcodeproj/project.pbxproj b/projects/xcode/ortclib.Test-osx/ortclib.Test-osx.xcodeproj/project.pbxproj
index 6625858a..9c013e3c 100644
--- a/projects/xcode/ortclib.Test-osx/ortclib.Test-osx.xcodeproj/project.pbxproj
+++ b/projects/xcode/ortclib.Test-osx/ortclib.Test-osx.xcodeproj/project.pbxproj
@@ -563,6 +563,15 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../../zsLib,
+					"../../../../ortclib-services-cpp",
+					"../../../../zsLib-eventing",
+					../../../..,
+					../../../../../../webrtc/xplatform/webrtc,
+					../../../../../../webrtc/xplatform/boringssl/include,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -604,6 +613,15 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../../../../zsLib,
+					"../../../../ortclib-services-cpp",
+					"../../../../zsLib-eventing",
+					../../../..,
+					../../../../../../webrtc/xplatform/webrtc,
+					../../../../../../webrtc/xplatform/boringssl/include,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;